From 96e2e2f4b37eeeb5fe9a1f3a4140bd979eb6d690 Mon Sep 17 00:00:00 2001 From: ulysses-you Date: Fri, 5 Jul 2024 09:52:21 +0800 Subject: [PATCH] rebase --- .../gluten/execution/TestOperator.scala | 20 +++++++++---------- .../GlutenSQLWindowFunctionSuite.scala | 2 +- .../GlutenSQLWindowFunctionSuite.scala | 2 +- .../utils/velox/VeloxTestSettings.scala | 1 - .../GlutenSQLWindowFunctionSuite.scala | 2 +- .../utils/velox/VeloxTestSettings.scala | 1 - .../GlutenSQLWindowFunctionSuite.scala | 6 +++--- 7 files changed, 16 insertions(+), 18 deletions(-) diff --git a/backends-velox/src/test/scala/org/apache/gluten/execution/TestOperator.scala b/backends-velox/src/test/scala/org/apache/gluten/execution/TestOperator.scala index d6b5efaf61de..230fc565d9eb 100644 --- a/backends-velox/src/test/scala/org/apache/gluten/execution/TestOperator.scala +++ b/backends-velox/src/test/scala/org/apache/gluten/execution/TestOperator.scala @@ -422,18 +422,18 @@ class TestOperator extends VeloxWholeStageTransformerSuite with AdaptiveSparkPla } // Test same partition/ordering keys. -// runQueryAndCompare( -// "select avg(l_partkey) over" + -// " (partition by l_suppkey order by l_suppkey) from lineitem ") { -// checkGlutenOperatorMatch[WindowExecTransformer] -// } + runQueryAndCompare( + "select avg(l_partkey) over" + + " (partition by l_suppkey order by l_suppkey) from lineitem ") { + checkGlutenOperatorMatch[WindowExecTransformer] + } // Test overlapping partition/ordering keys. -// runQueryAndCompare( -// "select avg(l_partkey) over" + -// " (partition by l_suppkey order by l_suppkey, l_orderkey) from lineitem ") { -// checkGlutenOperatorMatch[WindowExecTransformer] -// } + runQueryAndCompare( + "select avg(l_partkey) over" + + " (partition by l_suppkey order by l_suppkey, l_orderkey) from lineitem ") { + checkGlutenOperatorMatch[WindowExecTransformer] + } } } } diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala index e26c1dc41a9a..6665174207b0 100644 --- a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala +++ b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala @@ -47,7 +47,7 @@ class GlutenSQLWindowFunctionSuite extends SQLWindowFunctionSuite with GlutenSQL Row(95337, 12, decimal(915.61)) ) - ignoreGluten("Literal in window partition by and sort") { + testGluten("Literal in window partition by and sort") { withTable("customer") { val rdd = spark.sparkContext.parallelize(customerData) val customerDF = spark.createDataFrame(rdd, customerSchema) diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala index e26c1dc41a9a..6665174207b0 100644 --- a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala +++ b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala @@ -47,7 +47,7 @@ class GlutenSQLWindowFunctionSuite extends SQLWindowFunctionSuite with GlutenSQL Row(95337, 12, decimal(915.61)) ) - ignoreGluten("Literal in window partition by and sort") { + testGluten("Literal in window partition by and sort") { withTable("customer") { val rdd = spark.sparkContext.parallelize(customerData) val customerDF = spark.createDataFrame(rdd, customerSchema) diff --git a/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala index 941f7b89b2d5..0da19922ffda 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala @@ -1182,7 +1182,6 @@ class VeloxTestSettings extends BackendTestSettings { enableSuite[GlutenDataFrameToSchemaSuite] enableSuite[GlutenDatasetUnpivotSuite] enableSuite[GlutenLateralColumnAliasSuite] - .exclude("Aggregate expressions containing no aggregate or grouping expressions still resolves") enableSuite[GlutenParametersSuite] enableSuite[GlutenResolveDefaultColumnsSuite] enableSuite[GlutenSubqueryHintPropagationSuite] diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala index e26c1dc41a9a..6665174207b0 100644 --- a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala +++ b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala @@ -47,7 +47,7 @@ class GlutenSQLWindowFunctionSuite extends SQLWindowFunctionSuite with GlutenSQL Row(95337, 12, decimal(915.61)) ) - ignoreGluten("Literal in window partition by and sort") { + testGluten("Literal in window partition by and sort") { withTable("customer") { val rdd = spark.sparkContext.parallelize(customerData) val customerDF = spark.createDataFrame(rdd, customerSchema) diff --git a/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala b/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala index f3bd7ff6c752..e54aca34ec75 100644 --- a/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala +++ b/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala @@ -1197,7 +1197,6 @@ class VeloxTestSettings extends BackendTestSettings { enableSuite[GlutenDataFrameToSchemaSuite] enableSuite[GlutenDatasetUnpivotSuite] enableSuite[GlutenLateralColumnAliasSuite] - .exclude("Aggregate expressions containing no aggregate or grouping expressions still resolves") enableSuite[GlutenParametersSuite] enableSuite[GlutenResolveDefaultColumnsSuite] enableSuite[GlutenSubqueryHintPropagationSuite] diff --git a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala index e61c084ab7db..89a4351744ef 100644 --- a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala +++ b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/GlutenSQLWindowFunctionSuite.scala @@ -47,7 +47,7 @@ class GlutenSQLWindowFunctionSuite extends SQLWindowFunctionSuite with GlutenSQL Row(95337, 12, decimal(915.61)) ) - ignoreGluten("Literal in window partition by and sort") { + testGluten("Literal in window partition by and sort") { withTable("customer") { val rdd = spark.sparkContext.parallelize(customerData) val customerDF = spark.createDataFrame(rdd, customerSchema) @@ -93,7 +93,7 @@ class GlutenSQLWindowFunctionSuite extends SQLWindowFunctionSuite with GlutenSQL } } - ignoreGluten("Filter on row number") { + testGluten("Filter on row number") { withTable("customer") { val rdd = spark.sparkContext.parallelize(customerData) val customerDF = spark.createDataFrame(rdd, customerSchema) @@ -137,7 +137,7 @@ class GlutenSQLWindowFunctionSuite extends SQLWindowFunctionSuite with GlutenSQL } } - ignoreGluten("Filter on rank") { + testGluten("Filter on rank") { withTable("customer") { val rdd = spark.sparkContext.parallelize(customerData) val customerDF = spark.createDataFrame(rdd, customerSchema)