Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closes #1 - remove use of Accumulo IteratorUtil, replace with IteratorUtils #2

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Closes #1 - remove use of Accumulo IteratorUtil, replace with IteratorUtils #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
This project reuses or contains code derived from the
Apache Accumulo project (Apache 2.0)
https://github.com/apache/accumulo
Copyright 2011-2020 The Apache Software Foundation. All Rights Reserved.
5 changes: 2 additions & 3 deletions src/main/java/datawave/accumulo/inmemory/InMemoryScannerBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.IteratorEnvironment;
import org.apache.accumulo.core.iterators.IteratorUtil;
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
import org.apache.accumulo.core.iterators.system.ColumnFamilySkippingIterator;
Expand Down Expand Up @@ -136,8 +135,8 @@ public SortedKeyValueIterator<Key,Value> createFilter(SortedKeyValueIterator<Key
AccumuloConfiguration conf = new InMemoryConfiguration(table.settings);
InMemoryIteratorEnvironment iterEnv = new InMemoryIteratorEnvironment(auths);
SortedKeyValueIterator<Key,Value> injectedIterators = applyInjectedIterators(wrappedFilter);
SortedKeyValueIterator<Key,Value> result = iterEnv.getTopLevelIterator(IteratorUtil.loadIterators(IteratorScope.scan, injectedIterators, null, conf,
serverSideIteratorList, serverSideIteratorOptions, iterEnv, false));
SortedKeyValueIterator<Key,Value> result = iterEnv.getTopLevelIterator(IteratorUtils.loadIterators(IteratorScope.scan, injectedIterators, null, conf,
serverSideIteratorList, serverSideIteratorOptions, iterEnv));
return result;
}

Expand Down
139 changes: 139 additions & 0 deletions src/main/java/datawave/accumulo/inmemory/IteratorUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
package datawave.accumulo.inmemory;

import static java.util.Objects.requireNonNull;

import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;

import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.impl.KeyExtent;
import org.apache.accumulo.core.data.thrift.IterInfo;
import org.apache.accumulo.core.iterators.IteratorEnvironment;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
import org.apache.accumulo.core.iterators.IteratorUtil.IterInfoComparator;
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
import org.apache.accumulo.core.iterators.system.SynchronizedIterator;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class IteratorUtils {

private static final Logger LOG = LoggerFactory.getLogger(IteratorUtils.class);

/**
* Fetch the correct configuration key prefix for the given scope. Throws an IllegalArgumentException if no property exists for the given scope.
*/
private static Property getProperty(IteratorScope scope) {
requireNonNull(scope);
switch (scope) {
case scan:
return Property.TABLE_ITERATOR_SCAN_PREFIX;
case minc:
return Property.TABLE_ITERATOR_MINC_PREFIX;
case majc:
return Property.TABLE_ITERATOR_MAJC_PREFIX;
default:
throw new IllegalStateException("Could not find configuration property for IteratorScope");
}
}

private static void parseIteratorConfiguration(IteratorScope scope, List<IterInfo> iters, Map<String,Map<String,String>> ssio,
Map<String,Map<String,String>> allOptions, AccumuloConfiguration conf) {
parseIterConf(scope, iters, allOptions, conf);

mergeOptions(ssio, allOptions);
}

private static void mergeOptions(Map<String,Map<String,String>> ssio, Map<String,Map<String,String>> allOptions) {
for (Entry<String,Map<String,String>> entry : ssio.entrySet()) {
if (entry.getValue() == null)
continue;
Map<String,String> options = allOptions.get(entry.getKey());
if (options == null) {
allOptions.put(entry.getKey(), entry.getValue());
} else {
options.putAll(entry.getValue());
}
}
}

private static void parseIterConf(IteratorScope scope, List<IterInfo> iters, Map<String,Map<String,String>> allOptions, AccumuloConfiguration conf) {
final Property scopeProperty = getProperty(scope);
final String scopePropertyKey = scopeProperty.getKey();

for (Entry<String,String> entry : conf.getAllPropertiesWithPrefix(scopeProperty).entrySet()) {
String suffix = entry.getKey().substring(scopePropertyKey.length());
String suffixSplit[] = suffix.split("\\.", 3);

if (suffixSplit.length == 1) {
String sa[] = entry.getValue().split(",");
int prio = Integer.parseInt(sa[0]);
String className = sa[1];
iters.add(new IterInfo(prio, className, suffixSplit[0]));
} else if (suffixSplit.length == 3 && suffixSplit[1].equals("opt")) {
String iterName = suffixSplit[0];
String optName = suffixSplit[2];

Map<String,String> options = allOptions.get(iterName);
if (options == null) {
options = new HashMap<>();
allOptions.put(iterName, options);
}

options.put(optName, entry.getValue());

} else {
throw new IllegalArgumentException("Invalid iterator format: " + entry.getKey());
}
}

Collections.sort(iters, new IterInfoComparator());
}

@SuppressWarnings("unchecked")
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) throws IOException {

List<IterInfo> iters = new ArrayList<>(ssiList);
Map<String,Map<String,String>> allOptions = new HashMap<>();
parseIteratorConfiguration(scope, iters, ssio, allOptions, conf);
// wrap the source in a SynchronizedIterator in case any of the additional configured iterators
// want to use threading
SortedKeyValueIterator<K,V> prev = new SynchronizedIterator<>(source);

try {
for (IterInfo iterInfo : iters) {

Class<? extends SortedKeyValueIterator<K,V>> clazz = (Class<? extends SortedKeyValueIterator<K,V>>) Class.forName(iterInfo.className)
.asSubclass(SortedKeyValueIterator.class);

SortedKeyValueIterator<K,V> skvi = clazz.newInstance();
Map<String,String> options = allOptions.get(iterInfo.iterName);
if (options == null)
options = Collections.emptyMap();
skvi.init(prev, options, env);
prev = skvi;
}
} catch (ClassNotFoundException e) {
LOG.error(e.toString());
throw new RuntimeException(e);
} catch (InstantiationException e) {
LOG.error(e.toString());
throw new RuntimeException(e);
} catch (IllegalAccessException e) {
LOG.error(e.toString());
throw new RuntimeException(e);
}
return prev;
}

}