Github user joshelser commented on a diff in the pull request:
https://github.com/apache/accumulo/pull/260#discussion_r119897281
--- Diff:
server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java ---
@@ -746,16 +774,29 @@ Batch nextBatch(SortedKeyValueIterator<Key,Value>
iter, Range range, int num, Se
iter.next();
}
- if (iter.hasTop() == false) {
- endOfTabletReached = true;
- }
+ if (yield.hasYielded()) {
+ continueKey = new Key(yield.getPositionAndReset());
+ skipContinueKey = true;
+ if (!range.contains(continueKey)) {
+ throw new IOException("Underlying iterator yielded to a position
outside of its range: " + continueKey + " not in " + range);
+ }
- if (endOfTabletReached) {
- continueKey = null;
- }
+ log.debug("Scan yield detected at position " + continueKey);
+ Metrics scanMetrics = getTabletServer().getScanMetrics();
+ if (scanMetrics.isEnabled())
+ scanMetrics.add(TabletServerScanMetrics.YIELD, 1);
+ } else {
+ if (iter.hasTop() == false) {
+ endOfTabletReached = true;
+ }
- if (endOfTabletReached && results.size() == 0)
- results = null;
+ if (endOfTabletReached) {
+ continueKey = null;
+ }
+
+ if (endOfTabletReached && results.size() == 0)
--- End diff --
Probably of no consequence, but you could nest the conditionals and avoid
checking `endOfTabletReached` two times.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
