This is an automated email from the ASF dual-hosted git repository.
zml1206 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/gluten.git
The following commit(s) were added to refs/heads/main by this push:
new d8ca277bbb [VL] Fix GlutenSimpleSQLViewSuite in Spark 4.x (#12502)
d8ca277bbb is described below
commit d8ca277bbb8cac9cd01b68b599368b7313c900a0
Author: Mingliang Zhu <[email protected]>
AuthorDate: Tue Jul 14 13:47:42 2026 +0800
[VL] Fix GlutenSimpleSQLViewSuite in Spark 4.x (#12502)
---
.../gluten/utils/velox/VeloxTestSettings.scala | 2 +-
.../spark/sql/execution/GlutenSQLViewSuite.scala | 21 ++++++++++++++++++++-
.../gluten/utils/velox/VeloxTestSettings.scala | 2 +-
.../spark/sql/execution/GlutenSQLViewSuite.scala | 21 ++++++++++++++++++++-
4 files changed, 42 insertions(+), 4 deletions(-)
diff --git
a/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
b/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
index a7367ecd7a..1116be62e9 100644
---
a/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
+++
b/gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
@@ -746,7 +746,7 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenSQLFunctionSuite]
enableSuite[GlutenSQLJsonProtocolSuite]
enableSuite[GlutenShufflePartitionsUtilSuite]
- // TODO: 4.x enableSuite[GlutenSimpleSQLViewSuite] // 1 failure
+ enableSuite[GlutenSimpleSQLViewSuite]
enableSuite[GlutenSparkPlanSuite]
.exclude("SPARK-37779: ColumnarToRowExec should be canonicalizable after
being (de)serialized")
enableSuite[GlutenSparkPlannerSuite]
diff --git
a/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLViewSuite.scala
b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLViewSuite.scala
index ed79f3cb3f..7cb2115b9b 100644
---
a/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLViewSuite.scala
+++
b/gluten-ut/spark40/src/test/scala/org/apache/spark/sql/execution/GlutenSQLViewSuite.scala
@@ -16,6 +16,25 @@
*/
package org.apache.spark.sql.execution
+import org.apache.spark.SparkThrowable
import org.apache.spark.sql.GlutenSQLTestsTrait
-class GlutenSimpleSQLViewSuite extends SimpleSQLViewSuite with
GlutenSQLTestsTrait {}
+class GlutenSimpleSQLViewSuite extends SimpleSQLViewSuite with
GlutenSQLTestsTrait {
+
+ // Velox returns a native FILE_NOT_FOUND error instead of Spark's structured
error condition.
+ override def checkErrorMatchPVals(
+ exception: SparkThrowable,
+ condition: String,
+ parameters: Map[String, String]): Unit = {
+ if (condition == "FAILED_READ_FILE.FILE_NOT_EXIST") {
+ val messages = Iterator
+ .iterate[Throwable](exception.asInstanceOf[Throwable])(_.getCause)
+ .takeWhile(_ != null)
+ .flatMap(error => Option(error.getMessage))
+
+ assert(messages.exists(_.contains("FILE_NOT_FOUND")))
+ } else {
+ super.checkErrorMatchPVals(exception, condition, parameters)
+ }
+ }
+}
diff --git
a/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
b/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
index 18fc0e2c22..25e0f36b32 100644
---
a/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
+++
b/gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
@@ -725,7 +725,7 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenSQLFunctionSuite]
enableSuite[GlutenSQLJsonProtocolSuite]
enableSuite[GlutenShufflePartitionsUtilSuite]
- // TODO: 4.x enableSuite[GlutenSimpleSQLViewSuite] // 1 failure remains
after GLUTEN-11917 fix
+ enableSuite[GlutenSimpleSQLViewSuite]
enableSuite[GlutenSparkPlanSuite]
.exclude("SPARK-37779: ColumnarToRowExec should be canonicalizable after
being (de)serialized")
enableSuite[GlutenSparkPlannerSuite]
diff --git
a/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/execution/GlutenSQLViewSuite.scala
b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/execution/GlutenSQLViewSuite.scala
index ed79f3cb3f..7cb2115b9b 100644
---
a/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/execution/GlutenSQLViewSuite.scala
+++
b/gluten-ut/spark41/src/test/scala/org/apache/spark/sql/execution/GlutenSQLViewSuite.scala
@@ -16,6 +16,25 @@
*/
package org.apache.spark.sql.execution
+import org.apache.spark.SparkThrowable
import org.apache.spark.sql.GlutenSQLTestsTrait
-class GlutenSimpleSQLViewSuite extends SimpleSQLViewSuite with
GlutenSQLTestsTrait {}
+class GlutenSimpleSQLViewSuite extends SimpleSQLViewSuite with
GlutenSQLTestsTrait {
+
+ // Velox returns a native FILE_NOT_FOUND error instead of Spark's structured
error condition.
+ override def checkErrorMatchPVals(
+ exception: SparkThrowable,
+ condition: String,
+ parameters: Map[String, String]): Unit = {
+ if (condition == "FAILED_READ_FILE.FILE_NOT_EXIST") {
+ val messages = Iterator
+ .iterate[Throwable](exception.asInstanceOf[Throwable])(_.getCause)
+ .takeWhile(_ != null)
+ .flatMap(error => Option(error.getMessage))
+
+ assert(messages.exists(_.contains("FILE_NOT_FOUND")))
+ } else {
+ super.checkErrorMatchPVals(exception, condition, parameters)
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
