Github user paul-rogers commented on a diff in the pull request:
https://github.com/apache/drill/pull/574#discussion_r77706157
--- Diff:
exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillFunctionRegistry.java
---
@@ -218,4 +302,141 @@ private void
registerOperatorsWithoutInference(DrillOperatorTable operatorTable)
}
}
}
+
+ /**
+ * Function registry holder. Stores function implementations by jar
name, function name.
+ */
+ private class GenericRegistryHolder<T, U> {
+ private final ReadWriteLock readWriteLock = new
ReentrantReadWriteLock();
+ private final AutoCloseableLock readLock = new
AutoCloseableLock(readWriteLock.readLock());
+ private final AutoCloseableLock writeLock = new
AutoCloseableLock(readWriteLock.writeLock());
+
+ // jar name, Map<function name, List<signature>
+ private final Map<T, Map<T, List<T>>> jars;
+
+ // function name, Map<signature, function holder>
+ private final Map<T, Map<T, U>> functions;
+
+ public GenericRegistryHolder() {
+ this.functions = Maps.newHashMap();
+ this.jars = Maps.newHashMap();
+ }
+
+ public void addJar(T jName, Map<T, Pair<T, U>> sNameMap) {
+ try (AutoCloseableLock lock = writeLock.open()) {
+ Map<T, List<T>> map = jars.get(jName);
+ if (map != null) {
+ removeAllByJar(jName);
+ }
+ map = Maps.newHashMap();
+ jars.put(jName, map);
+
+ for (Entry<T, Pair<T, U>> entry : sNameMap.entrySet()) {
+ T sName = entry.getKey();
+ Pair<T, U> pair = entry.getValue();
+ addFunction(jName, pair.getKey(), sName, pair.getValue());
+ }
+ }
+ }
+
+ public void removeJar(T jName) {
+ try (AutoCloseableLock lock = writeLock.open()) {
+ removeAllByJar(jName);
+ }
+ }
+
+ public List<T> getAllJarNames() {
+ try (AutoCloseableLock lock = readLock.open()) {
+ return Lists.newArrayList(jars.keySet());
+ }
+ }
+
+ public List<T> getAllFunctionNames(T jName) {
+ try (AutoCloseableLock lock = readLock.open()){
+ Map<T, List<T>> map = jars.get(jName);
+ return map == null ? Lists.<T>newArrayList() :
Lists.newArrayList(map.keySet());
+ }
+ }
+
+ public ListMultimap<T, U> getAllFunctionsWithHolders() {
+ try (AutoCloseableLock lock = readLock.open()) {
+ ListMultimap<T, U> multimap = ArrayListMultimap.create();
+ for (Entry<T, Map<T, U>> entry : functions.entrySet()) {
+ multimap.putAll(entry.getKey(),
Lists.newArrayList(entry.getValue().values()));
+ }
+ return multimap;
+ }
+ }
+
+ public ListMultimap<T, T> getAllFunctionsWithSignatures() {
+ try (AutoCloseableLock lock = readLock.open()) {
+ ListMultimap<T, T> multimap = ArrayListMultimap.create();
+ for (Entry<T, Map<T, U>> entry : functions.entrySet()) {
+ multimap.putAll(entry.getKey(),
Lists.newArrayList(entry.getValue().keySet()));
+ }
+ return multimap;
+ }
+ }
+
+ public List<U> getHoldersByFunctionName(T fName) {
+ try (AutoCloseableLock lock = readLock.open()) {
+ Map<T, U> map = functions.get(fName);
+ return map == null ? Lists.<U>newArrayList() :
Lists.newArrayList(map.values());
+ }
+ }
+
+ public boolean containsJar(T jName) {
+ try (AutoCloseableLock lock = readLock.open()) {
+ return jars.containsKey(jName);
+ }
+ }
+
+ public int functionsSize() {
+ try (AutoCloseableLock lock = readLock.open()) {
+ return functions.size();
+ }
+ }
+
+ private void addFunction(T jName, T fName, T sName, U fHolder) {
+ Map<T, List<T>> map = jars.get(jName);
+
+ List<T> list = map.get(fName);
+ if (list == null) {
+ list = Lists.newArrayList();
+ map.put(fName, list);
+ }
+
+ if (!list.contains(sName)) {
+ list.add(sName);
+
+ Map<T, U> sigsMap = functions.get(fName);
+ if (sigsMap == null) {
+ sigsMap = Maps.newHashMap();
+ functions.put(fName, sigsMap);
+ }
+
+ U u = sigsMap.get(sName);
+ if (u == null) {
+ sigsMap.put(sName, fHolder);
+ }
+ }
+ }
+
+ private void removeAllByJar(T jName) {
+ Map<T, List<T>> removeMap = jars.remove(jName);
+ if (removeMap == null) {
+ return;
+ }
+
+ for (Map.Entry<T, List<T>> remEntry : removeMap.entrySet()) {
+ Map<T, U> fNameMap = functions.get(remEntry.getKey());
+ List<T> value = remEntry.getValue();
+ fNameMap.keySet().removeAll(value);
--- End diff --
Does this work? Does removing an entry from the key set reach out and
remove the value from the map? Or, should this be fNameMap.removeAll(value)?
---
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.
---
