Github user joshelser commented on a diff in the pull request:
https://github.com/apache/accumulo/pull/196#discussion_r94176449
--- Diff:
core/src/main/java/org/apache/accumulo/core/iterators/IteratorUtil.java ---
@@ -235,18 +235,27 @@ private static void
mergeOptions(Map<String,Map<String,String>> ssio, Map<String
public static <K extends WritableComparable<?>,V extends Writable>
SortedKeyValueIterator<K,V> loadIterators(IteratorScope scope,
SortedKeyValueIterator<K,V> source, KeyExtent extent,
AccumuloConfiguration conf, List<IterInfo> ssiList,
Map<String,Map<String,String>> ssio,
IteratorEnvironment env, boolean useAccumuloClassLoader) throws
IOException {
- List<IterInfo> iters = new ArrayList<>(ssiList);
- Map<String,Map<String,String>> allOptions = new HashMap<>();
- parseIteratorConfiguration(scope, iters, ssio, allOptions, conf);
- return loadIterators(source, iters, allOptions, env,
useAccumuloClassLoader, conf.get(Property.TABLE_CLASSPATH));
+
+ return loadIteratorsHelper(scope, source, extent, conf, ssiList, ssio,
env, useAccumuloClassLoader, null);
}
public static <K extends WritableComparable<?>,V extends Writable>
SortedKeyValueIterator<K,V> loadIterators(IteratorScope scope,
SortedKeyValueIterator<K,V> source, KeyExtent extent,
AccumuloConfiguration conf, List<IterInfo> ssiList,
Map<String,Map<String,String>> ssio,
IteratorEnvironment env, boolean useAccumuloClassLoader, String
classLoaderContext) throws IOException {
+
+ return loadIteratorsHelper(scope, source, extent, conf, ssiList, ssio,
env, useAccumuloClassLoader, classLoaderContext);
+ }
+
+ private static <K extends WritableComparable<?>,V extends Writable>
SortedKeyValueIterator<K,V> loadIteratorsHelper(IteratorScope scope,
+ SortedKeyValueIterator<K,V> source, KeyExtent extent,
AccumuloConfiguration conf, List<IterInfo> ssiList,
Map<String,Map<String,String>> ssio,
+ IteratorEnvironment env, boolean useAccumuloClassLoader, String
classLoaderContext) throws IOException {
+
List<IterInfo> iters = new ArrayList<>(ssiList);
Map<String,Map<String,String>> allOptions = new HashMap<>();
parseIteratorConfiguration(scope, iters, ssio, allOptions, conf);
+ if (classLoaderContext == null) {
--- End diff --
I think this would make sense to leave in the callers. I'm not a fan of
null values having implicit "logic" behind them.
---
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.
---
