Mailing-List: contact dev-help@drill.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@drill.apache.org
From: arina-ielchiieva <git@git.apache.org>
To: dev@drill.apache.org
Reply-To: dev@drill.apache.org
References: <git-pr-574-drill@git.apache.org>
In-Reply-To: <git-pr-574-drill@git.apache.org>
Subject: [GitHub] drill pull request #574: DRILL-4726: Dynamic UDFs support
Content-Type: text/plain
Message-Id: <20160909131640.B3F52E025B@git1-us-west.apache.org>
Date: Fri,  9 Sep 2016 13:16:40 +0000 (UTC)
archived-at: Fri, 09 Sep 2016 13:16:42 -0000

Github user arina-ielchiieva commented on a diff in the pull request:

    https://github.com/apache/drill/pull/574#discussion_r78177586
  
    --- 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);
    --- End diff --
    
    You are right. Actually we don't expect any duplicates in jar, since we are adding jars only after validation.
    I'll remove unnecessary checks.


---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---