Return-Path: 
 <dev-return-20656-apmail-drill-dev-archive=drill.apache.org@drill.apache.org>
X-Original-To: apmail-drill-dev-archive@www.apache.org
Delivered-To: apmail-drill-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 1B437189A0
	for <apmail-drill-dev-archive@www.apache.org>;
 Thu,  3 Mar 2016 21:40:25 +0000 (UTC)
Received: (qmail 54005 invoked by uid 500); 3 Mar 2016 21:40:24 -0000
Delivered-To: apmail-drill-dev-archive@drill.apache.org
Received: (qmail 53951 invoked by uid 500); 3 Mar 2016 21:40:24 -0000
Mailing-List: contact dev-help@drill.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@drill.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@drill.apache.org>
List-Post: <mailto:dev@drill.apache.org>
List-Id: <dev.drill.apache.org>
Reply-To: dev@drill.apache.org
Delivered-To: mailing list dev@drill.apache.org
Received: (qmail 53940 invoked by uid 99); 3 Mar 2016 21:40:24 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Mar 2016 21:40:24 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id 7F205E78EE; Thu,  3 Mar 2016 21:40:24 +0000 (UTC)
From: hsuanyi <git@git.apache.org>
To: dev@drill.apache.org
Reply-To: dev@drill.apache.org
References: <git-pr-397-drill@git.apache.org>
In-Reply-To: <git-pr-397-drill@git.apache.org>
Subject: [GitHub] drill pull request: Drill 4372 review
Content-Type: text/plain
Message-Id: <20160303214024.7F205E78EE@git1-us-west.apache.org>
Date: Thu,  3 Mar 2016 21:40:24 +0000 (UTC)

Github user hsuanyi commented on a diff in the pull request:

    https://github.com/apache/drill/pull/397#discussion_r54952793
  
    --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillFunctionRegistry.java ---
    @@ -92,38 +112,58 @@ public DrillFunctionRegistry(ScanResult classpathScan) {
       }
     
       public int size(){
    -    return methods.size();
    +    return registeredFunctions.size();
       }
     
       /** Returns functions with given name. Function name is case insensitive. */
       public List<DrillFuncHolder> getMethods(String name) {
    -    return this.methods.get(name.toLowerCase());
    +    return this.registeredFunctions.get(name.toLowerCase());
    +  }
    +
    +  public Collection<DrillFuncHolder> getAllMethods() {
    +    return Collections.unmodifiableCollection(registeredFunctions.values());
       }
     
       public void register(DrillOperatorTable operatorTable) {
    -    SqlOperator op;
    -    for (Entry<String, Collection<DrillFuncHolder>> function : methods.asMap().entrySet()) {
    -      Set<Integer> argCounts = Sets.newHashSet();
    -      String name = function.getKey().toUpperCase();
    +    for (Entry<String, Collection<DrillFuncHolder>> function : registeredFunctions.asMap().entrySet()) {
    +      final ArrayListMultimap<Pair<Integer, Integer>, DrillFuncHolder> functions = ArrayListMultimap.create();
    +      final ArrayListMultimap<Integer, DrillFuncHolder> aggregateFunctions = ArrayListMultimap.create();
    +      final String name = function.getKey().toUpperCase();
    +      boolean isDeterministic = true;
           for (DrillFuncHolder func : function.getValue()) {
    -        if (argCounts.add(func.getParamCount())) {
    -          if (func.isAggregating()) {
    -            op = new DrillSqlAggOperator(name, func.getParamCount());
    +        final int paramCount = func.getParamCount();
    +        if(func.isAggregating()) {
    +          aggregateFunctions.put(paramCount, func);
    +        } else {
    +          final Pair<Integer, Integer> argNumerRange;
    --- End diff --
    
    addressed


---
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.
---