update

ArnavBalyan · ArnavBalyan · commit b94eb719580d · 2025-03-08T12:27:36.000Z
diff --git a/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala b/gluten-ut/spark32/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
@@ -241,8 +241,8 @@ class ClickHouseTestSettings extends BackendTestSettings {
     .exclude("SPARK-24165: CaseWhen/If - nullability of nested types")
     .exclude("SPARK-27671: Fix analysis exception when casting null in nested field in struct")
     .exclude("summary")
-    .exclude(
-      "SPARK-27439: Explain result should match collected result after view change - re-write")
+    .excludeGlutenTest(
+      "SPARK-27439: Explain result should match collected result after view change")
     .excludeGlutenTest("distributeBy and localSort")
     .excludeGlutenTest("describe")
     .excludeGlutenTest("Allow leading/trailing whitespace in string before casting")
diff --git a/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala b/gluten-ut/spark32/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala
@@ -360,7 +360,7 @@ class GlutenDataFrameSuite extends DataFrameSuite with GlutenSQLTestsTrait {
     checkResult(df, expectedBinaryResult)
   }
 
-  test("SPARK-27439: Explain result should match collected result after view change - re-write") {
+  testGluten("SPARK-27439: Explain result should match collected result after view change") {
     withTempView("test", "test2", "tmp") {
       spark.range(10).createOrReplaceTempView("test")
       spark.range(5).createOrReplaceTempView("test2")
@@ -379,7 +379,7 @@ class GlutenDataFrameSuite extends DataFrameSuite with GlutenSQLTestsTrait {
                                |+- 'UnresolvedRelation [tmp]""".stripMargin))
       assert(output.contains("""== Physical Plan ==
                                |*(1) ColumnarToRow
-                               |+- ColumnarRange 0, 10, 1, 2, 10, [id#0L]""".stripMargin))
+                               |+- ColumnarRange 0, 10, 1, 2, 10""".stripMargin))
     }
   }
 
diff --git a/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala b/gluten-ut/spark33/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
@@ -263,8 +263,8 @@ class ClickHouseTestSettings extends BackendTestSettings {
     .exclude("SPARK-24165: CaseWhen/If - nullability of nested types")
     .exclude("SPARK-27671: Fix analysis exception when casting null in nested field in struct")
     .exclude("summary")
-    .exclude(
-      "SPARK-27439: Explain result should match collected result after view change - re-write")
+    .excludeGlutenTest(
+      "SPARK-27439: Explain result should match collected result after view change")
     .excludeGlutenTest("distributeBy and localSort")
     .excludeGlutenTest("describe")
     .excludeGlutenTest("Allow leading/trailing whitespace in string before casting")
diff --git a/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala b/gluten-ut/spark33/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala
@@ -361,7 +361,7 @@ class GlutenDataFrameSuite extends DataFrameSuite with GlutenSQLTestsTrait {
     checkResult(df, expectedBinaryResult)
   }
 
-  test("SPARK-27439: Explain result should match collected result after view change - re-write") {
+  testGluten("SPARK-27439: Explain result should match collected result after view change") {
     withTempView("test", "test2", "tmp") {
       spark.range(10).createOrReplaceTempView("test")
       spark.range(5).createOrReplaceTempView("test2")
@@ -380,7 +380,7 @@ class GlutenDataFrameSuite extends DataFrameSuite with GlutenSQLTestsTrait {
                                |+- 'UnresolvedRelation [tmp]""".stripMargin))
       assert(output.contains("""== Physical Plan ==
                                |*(1) ColumnarToRow
-                               |+- ColumnarRange 0, 10, 1, 2, 10, [id#0L]""".stripMargin))
+                               |+- ColumnarRange 0, 10, 1, 2, 10""".stripMargin))
     }
   }
 
diff --git a/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala b/gluten-ut/spark34/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
@@ -261,8 +261,8 @@ class ClickHouseTestSettings extends BackendTestSettings {
     .exclude("SPARK-24165: CaseWhen/If - nullability of nested types")
     .exclude("SPARK-27671: Fix analysis exception when casting null in nested field in struct")
     .exclude("summary")
-    .exclude(
-      "SPARK-27439: Explain result should match collected result after view change - re-write")
+    .excludeGlutenTest(
+      "SPARK-27439: Explain result should match collected result after view change")
     .excludeGlutenTest("distributeBy and localSort")
     .excludeGlutenTest("describe")
     .excludeGlutenTest("Allow leading/trailing whitespace in string before casting")
diff --git a/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala b/gluten-ut/spark34/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala
@@ -361,7 +361,7 @@ class GlutenDataFrameSuite extends DataFrameSuite with GlutenSQLTestsTrait {
     checkResult(df, expectedBinaryResult)
   }
 
-  test("SPARK-27439: Explain result should match collected result after view change - re-write") {
+  testGluten("SPARK-27439: Explain result should match collected result after view change") {
     withTempView("test", "test2", "tmp") {
       spark.range(10).createOrReplaceTempView("test")
       spark.range(5).createOrReplaceTempView("test2")
@@ -380,7 +380,7 @@ class GlutenDataFrameSuite extends DataFrameSuite with GlutenSQLTestsTrait {
                                |+- 'UnresolvedRelation [tmp]""".stripMargin))
       assert(output.contains("""== Physical Plan ==
                                |*(1) ColumnarToRow
-                               |+- ColumnarRange 0, 10, 1, 2, 10, [id#0L]""".stripMargin))
+                               |+- ColumnarRange 0, 10, 1, 2, 10""".stripMargin))
     }
   }
 
diff --git a/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala b/gluten-ut/spark35/src/test/scala/org/apache/gluten/utils/clickhouse/ClickHouseTestSettings.scala
@@ -545,8 +545,8 @@ class ClickHouseTestSettings extends BackendTestSettings {
     .excludeCH("SPARK-28067: Aggregate sum should not return wrong results for decimal overflow")
     .excludeCH("SPARK-35955: Aggregate avg should not return wrong results for decimal overflow")
     .excludeCH("summary")
-    .exclude(
-      "SPARK-27439: Explain result should match collected result after view change - re-write")
+    .excludeGlutenTest(
+      "SPARK-27439: Explain result should match collected result after view change")
     .excludeCH(
       "SPARK-8608: call `show` on local DataFrame with random columns should return same value")
     .excludeCH(
diff --git a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/GlutenDataFrameSuite.scala
@@ -372,7 +372,7 @@ class GlutenDataFrameSuite extends DataFrameSuite with GlutenSQLTestsTrait {
     }
   }
 
-  test("SPARK-27439: Explain result should match collected result after view change - re-write") {
+  testGluten("SPARK-27439: Explain result should match collected result after view change") {
     withTempView("test", "test2", "tmp") {
       spark.range(10).createOrReplaceTempView("test")
       spark.range(5).createOrReplaceTempView("test2")
@@ -391,7 +391,7 @@ class GlutenDataFrameSuite extends DataFrameSuite with GlutenSQLTestsTrait {
                                |+- 'UnresolvedRelation [tmp]""".stripMargin))
       assert(output.contains("""== Physical Plan ==
                                |*(1) ColumnarToRow
-                               |+- ColumnarRange 0, 10, 1, 2, 10, [id#0L]""".stripMargin))
+                               |+- ColumnarRange 0, 10, 1, 2, 10""".stripMargin))
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ class GlutenDataFrameSuite extends DataFrameSuite with GlutenSQLTestsTrait {`
`360`	`360`	`checkResult(df, expectedBinaryResult)`
`361`	`361`	`}`
`362`	`362`
`363`		`- test("SPARK-27439: Explain result should match collected result after view change - re-write") {`
	`363`	`+ testGluten("SPARK-27439: Explain result should match collected result after view change") {`
`364`	`364`	`withTempView("test", "test2", "tmp") {`
`365`	`365`	`spark.range(10).createOrReplaceTempView("test")`
`366`	`366`	`spark.range(5).createOrReplaceTempView("test2")`
`@@ -379,7 +379,7 @@ class GlutenDataFrameSuite extends DataFrameSuite with GlutenSQLTestsTrait {`
`379`	`379`	`\|+- 'UnresolvedRelation [tmp]""".stripMargin))`
`380`	`380`	`assert(output.contains("""== Physical Plan ==`
`381`	`381`	`\|*(1) ColumnarToRow`
`382`		`- \|+- ColumnarRange 0, 10, 1, 2, 10, [id#0L]""".stripMargin))`
	`382`	`+ \|+- ColumnarRange 0, 10, 1, 2, 10""".stripMargin))`
`383`	`383`	`}`
`384`	`384`	`}`
`385`	`385`
Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ class GlutenDataFrameSuite extends DataFrameSuite with GlutenSQLTestsTrait {`
`361`	`361`	`checkResult(df, expectedBinaryResult)`
`362`	`362`	`}`
`363`	`363`
`364`		`- test("SPARK-27439: Explain result should match collected result after view change - re-write") {`
	`364`	`+ testGluten("SPARK-27439: Explain result should match collected result after view change") {`
`365`	`365`	`withTempView("test", "test2", "tmp") {`
`366`	`366`	`spark.range(10).createOrReplaceTempView("test")`
`367`	`367`	`spark.range(5).createOrReplaceTempView("test2")`
`@@ -380,7 +380,7 @@ class GlutenDataFrameSuite extends DataFrameSuite with GlutenSQLTestsTrait {`
`380`	`380`	`\|+- 'UnresolvedRelation [tmp]""".stripMargin))`
`381`	`381`	`assert(output.contains("""== Physical Plan ==`
`382`	`382`	`\|*(1) ColumnarToRow`
`383`		`- \|+- ColumnarRange 0, 10, 1, 2, 10, [id#0L]""".stripMargin))`
	`383`	`+ \|+- ColumnarRange 0, 10, 1, 2, 10""".stripMargin))`
`384`	`384`	`}`
`385`	`385`	`}`
`386`	`386`
Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ class GlutenDataFrameSuite extends DataFrameSuite with GlutenSQLTestsTrait {`
`372`	`372`	`}`
`373`	`373`	`}`
`374`	`374`
`375`		`- test("SPARK-27439: Explain result should match collected result after view change - re-write") {`
	`375`	`+ testGluten("SPARK-27439: Explain result should match collected result after view change") {`
`376`	`376`	`withTempView("test", "test2", "tmp") {`
`377`	`377`	`spark.range(10).createOrReplaceTempView("test")`
`378`	`378`	`spark.range(5).createOrReplaceTempView("test2")`
`@@ -391,7 +391,7 @@ class GlutenDataFrameSuite extends DataFrameSuite with GlutenSQLTestsTrait {`
`391`	`391`	`\|+- 'UnresolvedRelation [tmp]""".stripMargin))`
`392`	`392`	`assert(output.contains("""== Physical Plan ==`
`393`	`393`	`\|*(1) ColumnarToRow`
`394`		`- \|+- ColumnarRange 0, 10, 1, 2, 10, [id#0L]""".stripMargin))`
	`394`	`+ \|+- ColumnarRange 0, 10, 1, 2, 10""".stripMargin))`
`395`	`395`	`}`
`396`	`396`	`}`
`397`	`397`