This is an automated email from the ASF dual-hosted git repository.
rui-mo 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 8a037eeb0d [GLUTEN-13175][VL] Share the Spark 4.2 MERGE
shuffle-partition setting and re-enable the MERGE summary tests (#13317)
8a037eeb0d is described below
commit 8a037eeb0d53ff9b796a046d67097ed763bbfa29
Author: Akshay Tayal <[email protected]>
AuthorDate: Wed Oct 21 10:17:02 2026 -0700
[GLUTEN-13175][VL] Share the Spark 4.2 MERGE shuffle-partition setting and
re-enable the MERGE summary tests (#13317)
---
.../org/apache/gluten/utils/velox/VeloxTestSettings.scala | 12 ------------
...eltaBasedMergeIntoTableUpdateAsDeleteAndInsertSuite.scala | 10 +---------
.../spark/sql/connector/GlutenMergeIntoTableSuiteBase.scala | 8 ++++++++
3 files changed, 9 insertions(+), 21 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 ee3ee1aee1..c2aabc6e30 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
@@ -1349,12 +1349,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[GlutenDeltaBasedMergeIntoTableUpdateAsDeleteAndInsertSuite]
// Replaced by Gluten versions that handle wrapped exceptions
.excludeByPrefix("merge cardinality check with")
@@ -1377,12 +1371,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[GlutenFileSourceCustomMetadataStructSuite]
enableSuite[GlutenParquetFileMetadataStructRowIndexSuite]
enableSuite[GlutenTableLocationSuite]
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 639516c4b9..458ee89ffd 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,17 +16,9 @@
*/
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 {
- // 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")
- }
-}
+ with GlutenMergeIntoTableSuiteBase {}
diff --git
a/gluten-ut/spark42/src/test/scala/org/apache/spark/sql/connector/GlutenMergeIntoTableSuiteBase.scala
b/gluten-ut/spark42/src/test/scala/org/apache/spark/sql/connector/GlutenMergeIntoTableSuiteBase.scala
index 11d80e20e6..e12a163b5d 100644
---
a/gluten-ut/spark42/src/test/scala/org/apache/spark/sql/connector/GlutenMergeIntoTableSuiteBase.scala
+++
b/gluten-ut/spark42/src/test/scala/org/apache/spark/sql/connector/GlutenMergeIntoTableSuiteBase.scala
@@ -16,6 +16,7 @@
*/
package org.apache.spark.sql.connector
+import org.apache.spark.SparkConf
import org.apache.spark.sql.GlutenSQLTestsTrait
import org.apache.spark.sql.internal.SQLConf
@@ -29,6 +30,13 @@ trait GlutenMergeIntoTableSuiteBase extends
MergeIntoTableSuiteBase with GlutenS
import testImplicits._
+ // 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")
+ }
+
/** Helper method to find if any exception in the chain contains the
expected message. */
private def findInExceptionChain(e: Throwable, expectedMessage: String):
Boolean = {
var current: Throwable = e
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
