Skip to content

[VL] Fix GlutenGroupBasedUpdateTableSuite in Spark 4.x #12493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zml1206 merged 3 commits into from
Jul 14, 2026
Merged

[VL] Fix GlutenGroupBasedUpdateTableSuite in Spark 4.x #12493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27d13c8
[VL] Enable GlutenGroupBasedUpdateTableSuite in Spark 4.x
zml1206 Jul 10, 2026
69a0c70
[VL] Fix GlutenGroupBasedUpdateTableSuite in Spark 4.x
zml1206 Jul 13, 2026
60b8276
fix format
zml1206 Jul 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion gluten-ut/spark40/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,9 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenDataSourceV2MetricsSuite]
enableSuite[GlutenDataSourceV2OptionSuite]
enableSuite[GlutenDataSourceV2UtilsSuite]
// TODO: 4.x enableSuite[GlutenGroupBasedUpdateTableSuite] // 1 failure
enableSuite[GlutenGroupBasedUpdateTableSuite]
// Velox assert_not_null throws VeloxUserError instead of SparkRuntimeException
.exclude("update with NOT NULL checks")
Comment on lines +265 to +267
enableSuite[GlutenMergeIntoDataFrameSuite]
enableSuite[GlutenProcedureSuite]
enableSuite[GlutenPushablePredicateSuite]
Expand Down
28 changes: 27 additions & 1 deletion ...rk40/src/test/scala/org/apache/spark/sql/connector/GlutenGroupBasedUpdateTableSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,34 @@
*/
package org.apache.spark.sql.connector

import org.apache.spark.SparkException
import org.apache.spark.sql.GlutenSQLTestsTrait

class GlutenGroupBasedUpdateTableSuite
extends GroupBasedUpdateTableSuite
with GlutenSQLTestsTrait {}
with GlutenSQLTestsTrait {

private def assertNotNullViolation(f: => Unit): Unit = {
val exception = intercept[SparkException](f)
val messages = Iterator
.iterate[Throwable](exception)(_.getCause)
.takeWhile(_ != null)
.flatMap(e => Option(e.getMessage))

assert(messages.exists(_.contains("Null value appeared in non-nullable field")))
}

testGluten("update with NOT NULL checks") {
createAndInitTable(
"pk INT NOT NULL, s STRUCT<n_i: INT NOT NULL, n_l: LONG>, dep STRING",
"""{ "pk": 1, "s": { "n_i": 1, "n_l": 11 }, "dep": "hr" }
|{ "pk": 2, "s": { "n_i": 2, "n_l": 22 }, "dep": "software" }
|{ "pk": 3, "s": { "n_i": 3, "n_l": 33 }, "dep": "hr" }
|""".stripMargin
)

assertNotNullViolation {

@philo-he philo-he Jul 13, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we override Spark's checkError in this test suite?

@zml1206 zml1206 Jul 14, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the suggestion. We tried overriding checkError, but this case fails before the helper is invoked: the upstream test uses intercept[SparkRuntimeException], while Velox wraps the native NOT NULL violation in a SparkException.
Therefore, unlike the GlutenSimpleSQLViewSuite case, overriding the error assertion helper cannot handle this difference.

sql(s"UPDATE $tableNameAsString SET s = named_struct('n_i', null, 'n_l', -1L) WHERE pk = 1")
}
}
}
4 changes: 3 additions & 1 deletion gluten-ut/spark41/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,9 @@ class VeloxTestSettings extends BackendTestSettings {
enableSuite[GlutenDataSourceV2MetricsSuite]
enableSuite[GlutenDataSourceV2OptionSuite]
enableSuite[GlutenDataSourceV2UtilsSuite]
// TODO: 4.x enableSuite[GlutenGroupBasedUpdateTableSuite] // 1 failure
enableSuite[GlutenGroupBasedUpdateTableSuite]
// Velox assert_not_null throws VeloxUserError instead of SparkRuntimeException
.exclude("update with NOT NULL checks")
Comment on lines +275 to +277
enableSuite[GlutenMergeIntoDataFrameSuite]
enableSuite[GlutenProcedureSuite]
enableSuite[GlutenPushablePredicateSuite]
Expand Down
28 changes: 27 additions & 1 deletion ...rk41/src/test/scala/org/apache/spark/sql/connector/GlutenGroupBasedUpdateTableSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,34 @@
*/
package org.apache.spark.sql.connector

import org.apache.spark.SparkException
import org.apache.spark.sql.GlutenSQLTestsTrait

class GlutenGroupBasedUpdateTableSuite
extends GroupBasedUpdateTableSuite
with GlutenSQLTestsTrait {}
with GlutenSQLTestsTrait {

private def assertNotNullViolation(f: => Unit): Unit = {
val exception = intercept[SparkException](f)
val messages = Iterator
.iterate[Throwable](exception)(_.getCause)
.takeWhile(_ != null)
.flatMap(e => Option(e.getMessage))

assert(messages.exists(_.contains("Null value appeared in non-nullable field")))
}

testGluten("update with NOT NULL checks") {
createAndInitTable(
"pk INT NOT NULL, s STRUCT<n_i: INT NOT NULL, n_l: LONG>, dep STRING",
"""{ "pk": 1, "s": { "n_i": 1, "n_l": 11 }, "dep": "hr" }
|{ "pk": 2, "s": { "n_i": 2, "n_l": 22 }, "dep": "software" }
|{ "pk": 3, "s": { "n_i": 3, "n_l": 33 }, "dep": "hr" }
|""".stripMargin
)

assertNotNullViolation {
sql(s"UPDATE $tableNameAsString SET s = named_struct('n_i', null, 'n_l', -1L) WHERE pk = 1")
}
}
}
Loading