distinct agg

apache · Oct 8, 2024 · 349a25c · 349a25c
1 parent 5e9b050
commit 349a25c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/...lickhouse/src/main/scala/org/apache/gluten/execution/CHHashAggregateExecTransformer.scala b/...lickhouse/src/main/scala/org/apache/gluten/execution/CHHashAggregateExecTransformer.scala
@@ -253,7 +253,8 @@ case class CHHashAggregateExecTransformer(
           CHExpressions.createAggregateFunction(args, aggregateFunc),
           childrenNodeList,
           modeToKeyWord(aggExpr.mode),
-          ConverterUtils.getTypeNode(aggregateFunc.dataType, aggregateFunc.nullable)
+          ConverterUtils.getTypeNode(aggregateFunc.dataType, aggregateFunc.nullable),
+          aggExpr.isDistinct
         )
         aggregateFunctionList.add(aggFunctionNode)
       })

diff --git a/...substrait/src/main/java/org/apache/gluten/substrait/expression/AggregateFunctionNode.java b/...substrait/src/main/java/org/apache/gluten/substrait/expression/AggregateFunctionNode.java
@@ -31,16 +31,19 @@ public class AggregateFunctionNode implements Serializable {
   private final List<ExpressionNode> expressionNodes = new ArrayList<>();
   private final String phase;
   private final TypeNode outputTypeNode;
+  private final boolean isDistinct;
 
   AggregateFunctionNode(
       Long functionId,
       List<ExpressionNode> expressionNodes,
       String phase,
-      TypeNode outputTypeNode) {
+      TypeNode outputTypeNode,
+      boolean isDistinct) {
     this.functionId = functionId;
     this.expressionNodes.addAll(expressionNodes);
     this.phase = phase;
     this.outputTypeNode = outputTypeNode;
+    this.isDistinct = isDistinct;
   }
 
   public AggregateFunction toProtobuf() {
@@ -53,9 +56,11 @@ public AggregateFunction toProtobuf() {
       switch (phase) {
         case "PARTIAL":
           aggBuilder.setPhase(AggregationPhase.AGGREGATION_PHASE_INITIAL_TO_INTERMEDIATE);
+          aggBuilder.setIsDistinct(isDistinct);
           break;
         case "PARTIAL_MERGE":
           aggBuilder.setPhase(AggregationPhase.AGGREGATION_PHASE_INTERMEDIATE_TO_INTERMEDIATE);
+          aggBuilder.setIsDistinct(isDistinct);
           break;
         case "COMPLETE":
           aggBuilder.setPhase(AggregationPhase.AGGREGATION_PHASE_INITIAL_TO_RESULT);

diff --git a/gluten-substrait/src/main/java/org/apache/gluten/substrait/expression/ExpressionBuilder.java b/gluten-substrait/src/main/java/org/apache/gluten/substrait/expression/ExpressionBuilder.java
@@ -258,8 +258,10 @@ public static AggregateFunctionNode makeAggregateFunction(
       Long functionId,
       List<ExpressionNode> expressionNodes,
       String phase,
-      TypeNode outputTypeNode) {
-    return new AggregateFunctionNode(functionId, expressionNodes, phase, outputTypeNode);
+      TypeNode outputTypeNode,
+      boolean isDistinct) {
+    return new AggregateFunctionNode(
+        functionId, expressionNodes, phase, outputTypeNode, isDistinct);
   }
 
   public static CastNode makeCast(