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 06ac8a1c5b [GLUTEN-13175][VL] Re-enable the Spark 4.2 MERGE summary
tests in GlutenDeltaBasedMergeIntoTableUpdateAsDeleteAndInsertSuite (#13318)
06ac8a1c5b is described below
commit 06ac8a1c5b7687a7b327b43d88b94ca3a2cacb7d
Author: Akshay Tayal <[email protected]>
AuthorDate: Tue Oct 20 20:24:47 2026 -0700
[GLUTEN-13175][VL] Re-enable the Spark 4.2 MERGE summary tests in
GlutenDeltaBasedMergeIntoTableUpdateAsDeleteAndInsertSuite (#13318)
---
.../org/apache/gluten/utils/velox/VeloxTestSettings.scala | 6 ------
...nDeltaBasedMergeIntoTableUpdateAsDeleteAndInsertSuite.scala | 10 +++++++++-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git
a/gluten-ut/spark42/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
b/gluten-ut/spark42/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
index 419762076b..43d3bf355d 100644
---
a/gluten-ut/spark42/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
+++
b/gluten-ut/spark42/src/test/scala/org/apache/gluten/utils/velox/VeloxTestSettings.scala
@@ -1391,12 +1391,6 @@ class VeloxTestSettings extends BackendTestSettings {
.excludeByPrefix("merge cardinality check with")
// Velox assert_not_null throws VeloxUserError instead of
SparkRuntimeException
.exclude("merge with NOT NULL checks")
- .exclude(
- "merge with literal false ON condition"
- ) // GLUTEN-12569 Spark 4.2 UT enablement (CI-confirmed)
- .exclude(
- "merge with statically empty source and only MATCHED clauses"
- ) // GLUTEN-12569 Spark 4.2 UT enablement (CI-confirmed)
enableSuite[GlutenDeltaBasedUpdateAsDeleteAndInsertTableSuite]
// Velox assert_not_null throws VeloxUserError instead of
SparkRuntimeException
.exclude("update with NOT NULL checks")
diff --git
a/gluten-ut/spark42/src/test/scala/org/apache/spark/sql/connector/GlutenDeltaBasedMergeIntoTableUpdateAsDeleteAndInsertSuite.scala
b/gluten-ut/spark42/src/test/scala/org/apache/spark/sql/connector/GlutenDeltaBasedMergeIntoTableUpdateAsDeleteAndInsertSuite.scala
index 458ee89ffd..639516c4b9 100644
---
a/gluten-ut/spark42/src/test/scala/org/apache/spark/sql/connector/GlutenDeltaBasedMergeIntoTableUpdateAsDeleteAndInsertSuite.scala
+++
b/gluten-ut/spark42/src/test/scala/org/apache/spark/sql/connector/GlutenDeltaBasedMergeIntoTableUpdateAsDeleteAndInsertSuite.scala
@@ -16,9 +16,17 @@
*/
package org.apache.spark.sql.connector
+import org.apache.spark.SparkConf
import org.apache.spark.sql.GlutenSQLTestsBaseTrait
class GlutenDeltaBasedMergeIntoTableUpdateAsDeleteAndInsertSuite
extends DeltaBasedMergeIntoTableUpdateAsDeleteAndInsertSuite
with GlutenSQLTestsBaseTrait
- with GlutenMergeIntoTableSuiteBase {}
+ with GlutenMergeIntoTableSuiteBase {
+ // Spark's own tests use 5 shuffle partitions. With 1, the write's
clustering by _partition is a
+ // SinglePartition shuffle, so AQE may replace the write's input with an
EmptyRelation when the
+ // MERGE writes no rows. That drops MergeRowsExec, so the commit has no
MERGE summary.
+ override def sparkConf: SparkConf = {
+ super.sparkConf.set("spark.sql.shuffle.partitions", "5")
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
