Support collect_set in window

apache · Dec 12, 2024 · 1be2e5b · 1be2e5b
1 parent da37af1
commit 1be2e5b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxWindowExpressionSuite.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxWindowExpressionSuite.scala
@@ -18,7 +18,6 @@ package org.apache.gluten.execution
 
 import org.apache.spark.SparkConf
 import org.apache.spark.sql.Row
-import org.apache.spark.sql.execution.window.WindowExec
 import org.apache.spark.sql.types._
 
 class VeloxWindowExpressionSuite extends WholeStageTransformerSuite {
@@ -134,11 +133,9 @@ class VeloxWindowExpressionSuite extends WholeStageTransformerSuite {
           |FROM
           | t
           |ORDER BY 1, 2;
-          |""".stripMargin,
-        noFallBack = false
+          |""".stripMargin
       ) {
-        // Velox window doesn't support collect_set
-        checkSparkOperatorMatch[WindowExec]
+        checkGlutenOperatorMatch[WindowExecTransformer]
       }
     }
   }

diff --git a/cpp/velox/substrait/SubstraitToVeloxPlanValidator.cc b/cpp/velox/substrait/SubstraitToVeloxPlanValidator.cc
@@ -661,16 +661,6 @@ bool SubstraitToVeloxPlanValidator::validate(const ::substrait::WindowRel& windo
     }
   }
 
-  // Validate supported aggregate functions.
-  static const std::unordered_set<std::string> unsupportedFuncs = {"collect_set"};
-  for (const auto& funcSpec : funcSpecs) {
-    auto funcName = SubstraitParser::getNameBeforeDelimiter(funcSpec);
-    if (unsupportedFuncs.find(funcName) != unsupportedFuncs.end()) {
-      LOG_VALIDATION_MSG(funcName + " was not supported in WindowRel.");
-      return false;
-    }
-  }
-
   // Validate groupby expression
   const auto& groupByExprs = windowRel.partition_expressions();
   std::vector<core::TypedExprPtr> expressions;