Link FunctionInfo to provider

soscpd · Oct 18, 2012 · 62196b1 · 62196b1
1 parent a38a9e6
commit 62196b1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/src/main/java/com/facebook/presto/metadata/FunctionInfo.java b/src/main/java/com/facebook/presto/metadata/FunctionInfo.java
@@ -1,16 +1,27 @@
 package com.facebook.presto.metadata;
 
+import com.facebook.presto.aggregation.AggregationFunction;
+
+import javax.inject.Provider;
+
 public class FunctionInfo
 {
-    private boolean isAggregate;
+    private final boolean isAggregate;
+    private final Provider<AggregationFunction> provider;
 
-    public FunctionInfo(boolean aggregate)
+    public FunctionInfo(boolean aggregate, Provider<AggregationFunction> provider)
     {
         isAggregate = aggregate;
+        this.provider = provider;
     }
 
     public boolean isAggregate()
     {
         return isAggregate;
     }
+
+    public Provider<AggregationFunction> getProvider()
+    {
+        return provider;
+    }
 }
diff --git a/src/test/java/com/facebook/presto/sql/compiler/TestSemanticAnalyzer.java b/src/test/java/com/facebook/presto/sql/compiler/TestSemanticAnalyzer.java
@@ -1,6 +1,9 @@
 package com.facebook.presto.sql.compiler;
 
 import com.facebook.presto.TupleInfo;
+import com.facebook.presto.aggregation.AverageAggregation;
+import com.facebook.presto.aggregation.CountAggregation;
+import com.facebook.presto.aggregation.SumAggregation;
 import com.facebook.presto.metadata.ColumnMetadata;
 import com.facebook.presto.metadata.FunctionInfo;
 import com.facebook.presto.metadata.Metadata;
@@ -46,11 +49,9 @@ public void setUp()
                 .build();
 
         Map<String, FunctionInfo> functions = ImmutableMap.<String, FunctionInfo>builder()
-                .put("COUNT", new FunctionInfo(true))
-                .put("SUM", new FunctionInfo(true))
-                .put("AVG", new FunctionInfo(true))
-                .put("MAX", new FunctionInfo(true))
-                .put("MIN", new FunctionInfo(true))
+                .put("COUNT", new FunctionInfo(true, CountAggregation.PROVIDER))
+                .put("SUM", new FunctionInfo(true, SumAggregation.PROVIDER))
+                .put("AVG", new FunctionInfo(true, AverageAggregation.PROVIDER))
                 .build();
 
         metadata = new Metadata(tables, functions);