Github user echeipesh commented on a diff in the pull request:
https://github.com/apache/accumulo/pull/25#discussion_r28607317
--- Diff:
core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
---
@@ -629,32 +676,37 @@ public float getProgress() throws IOException {
}
for (Map.Entry<KeyExtent,List<Range>> extentRanges :
tserverBin.getValue().entrySet()) {
Range ke = extentRanges.getKey().toDataRange();
- for (Range r : extentRanges.getValue()) {
- if (autoAdjust) {
- // divide ranges into smaller ranges, based on the tablets
- RangeInputSplit split = new RangeInputSplit(tableName,
tableId, ke.clip(r), new String[] {location});
-
- split.setOffline(tableConfig.isOfflineScan());
-
split.setIsolatedScan(tableConfig.shouldUseIsolatedScanners());
-
split.setUsesLocalIterators(tableConfig.shouldUseLocalIterators());
- split.setMockInstance(mockInstance);
- split.setFetchedColumns(tableConfig.getFetchedColumns());
- split.setPrincipal(principal);
- split.setToken(token);
- split.setInstanceName(instance.getInstanceName());
- split.setZooKeepers(instance.getZooKeepers());
- split.setAuths(auths);
- split.setIterators(tableConfig.getIterators());
- split.setLogLevel(logLevel);
-
- splits.add(split);
- } else {
- // don't divide ranges
- ArrayList<String> locations = splitsToAdd.get(r);
- if (locations == null)
- locations = new ArrayList<String>(1);
- locations.add(location);
- splitsToAdd.put(r, locations);
+ if (batchScan) {
+ // group ranges by tablet to be read by a BatchScanner
+ ArrayList<Range> clippedRanges = new ArrayList<Range>();
+ for(Range r: extentRanges.getValue())
--- End diff --
Sorry for confusing you guys, it's actually backwards. BatchScan does
essentially the same thing as AutoAdjust in terms of clipping on tablet
boundaries. AutoAdjust is on by default, so there is no issue. Asking for
BatchScan and AutoAdjust off is a nonsensical case.
So I've added mentions in both javadocs as Keith suggested and an exception
on AutoAdjust = false BatchScan = true, since it indicates user specifically
asked for something we can not and know not how to give them.
This is pushed up now.
---
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 [email protected] or file a JIRA ticket
with INFRA.
---
