Github user sudheeshkatkam commented on a diff in the pull request: https://github.com/apache/drill/pull/397#discussion_r56692104 --- Diff: exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillFunctionRegistry.java --- @@ -92,23 +114,100 @@ 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 void register(DrillOperatorTable operatorTable) { + registerOperatorsWithInference(operatorTable); + registerOperatorsWithoutInference(operatorTable); + } + + private void registerOperatorsWithInference(DrillOperatorTable operatorTable) { + final Map<String, DrillSqlOperator.DrillSqlOperatorBuilder> map = Maps.newHashMap(); + final Map<String, DrillSqlAggOperator.DrillSqlAggOperatorBuilder> mapAgg = Maps.newHashMap(); + 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()) { + final int paramCount = func.getParamCount(); + if(func.isAggregating()) { + aggregateFunctions.put(paramCount, func); + } else { + final Pair<Integer, Integer> argNumberRange; + if(registeredFuncNameToArgRange.containsKey(name)) { + argNumberRange = registeredFuncNameToArgRange.get(name); + } else { + argNumberRange = Pair.of(func.getParamCount(), func.getParamCount()); + } + functions.put(argNumberRange, func); + } + + if(!func.isDeterministic()) { + isDeterministic = false; + } + } + for (Entry<Pair<Integer, Integer>, Collection<DrillFuncHolder>> entry : functions.asMap().entrySet()) { + final Pair<Integer, Integer> range = entry.getKey(); + final int max = range.getRight(); + final int min = range.getLeft(); + if(!map.containsKey(name)) { + map.put(name, new DrillSqlOperator.DrillSqlOperatorBuilder() + .setName(name)); + } + + final DrillSqlOperator.DrillSqlOperatorBuilder drillSqlOperatorBuilder = map.get(name); + drillSqlOperatorBuilder + .addFunctions(entry.getValue()) + .setArgumentCount(min, max) + .setDeterministic(isDeterministic); + } + for (Entry<Integer, Collection<DrillFuncHolder>> entry : aggregateFunctions.asMap().entrySet()) { + if(mapAgg.containsKey(name)) { --- End diff -- simplify this `if..else` as well.
--- 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 infrastruct...@apache.org or file a JIRA ticket with INFRA. ---