This is an automated email from the ASF dual-hosted git repository.
biyan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/paimon.git
The following commit(s) were added to refs/heads/master by this push:
new 442b6dfebe [spark] Explicitly disable v2-write for row-level operation
tests (#7131)
442b6dfebe is described below
commit 442b6dfebe999f020270d5c786d672c1cb854c2b
Author: Kerwin Zhang <[email protected]>
AuthorDate: Tue Jan 27 19:06:44 2026 +0800
[spark] Explicitly disable v2-write for row-level operation tests (#7131)
---
.../paimon/spark/sql/DeleteFromTableTest.scala | 6 ++++-
.../paimon/spark/sql/MergeIntoTableTest.scala | 26 ++++++++++++++++++----
.../apache/paimon/spark/sql/UpdateTableTest.scala | 8 ++++++-
.../paimon/spark/sql/DeleteFromTableTest.scala | 6 ++++-
.../paimon/spark/sql/MergeIntoTableTest.scala | 26 ++++++++++++++++++----
.../apache/paimon/spark/sql/UpdateTableTest.scala | 8 ++++++-
6 files changed, 68 insertions(+), 12 deletions(-)
diff --git
a/paimon-spark/paimon-spark-3.5/src/test/scala/org/apache/paimon/spark/sql/DeleteFromTableTest.scala
b/paimon-spark/paimon-spark-3.5/src/test/scala/org/apache/paimon/spark/sql/DeleteFromTableTest.scala
index ab33a40e59..8d620ece82 100644
---
a/paimon-spark/paimon-spark-3.5/src/test/scala/org/apache/paimon/spark/sql/DeleteFromTableTest.scala
+++
b/paimon-spark/paimon-spark-3.5/src/test/scala/org/apache/paimon/spark/sql/DeleteFromTableTest.scala
@@ -20,7 +20,11 @@ package org.apache.paimon.spark.sql
import org.apache.spark.SparkConf
-class DeleteFromTableTest extends DeleteFromTableTestBase {}
+class DeleteFromTableTest extends DeleteFromTableTestBase {
+ override protected def sparkConf: SparkConf = {
+ super.sparkConf.set("spark.paimon.write.use-v2-write", "false")
+ }
+}
class V2DeleteFromTableTest extends DeleteFromTableTestBase {
override protected def sparkConf: SparkConf = {
diff --git
a/paimon-spark/paimon-spark-3.5/src/test/scala/org/apache/paimon/spark/sql/MergeIntoTableTest.scala
b/paimon-spark/paimon-spark-3.5/src/test/scala/org/apache/paimon/spark/sql/MergeIntoTableTest.scala
index b9a85b147e..c83ee54938 100644
---
a/paimon-spark/paimon-spark-3.5/src/test/scala/org/apache/paimon/spark/sql/MergeIntoTableTest.scala
+++
b/paimon-spark/paimon-spark-3.5/src/test/scala/org/apache/paimon/spark/sql/MergeIntoTableTest.scala
@@ -20,26 +20,44 @@ package org.apache.paimon.spark.sql
import org.apache.paimon.spark.{PaimonAppendBucketedTableTest,
PaimonAppendNonBucketTableTest, PaimonPrimaryKeyBucketedTableTest,
PaimonPrimaryKeyNonBucketTableTest}
+import org.apache.spark.SparkConf
+
class MergeIntoPrimaryKeyBucketedTableTest
extends MergeIntoTableTestBase
with MergeIntoPrimaryKeyTableTest
with MergeIntoNotMatchedBySourceTest
- with PaimonPrimaryKeyBucketedTableTest {}
+ with PaimonPrimaryKeyBucketedTableTest {
+ override protected def sparkConf: SparkConf = {
+ super.sparkConf.set("spark.paimon.write.use-v2-write", "false")
+ }
+}
class MergeIntoPrimaryKeyNonBucketTableTest
extends MergeIntoTableTestBase
with MergeIntoPrimaryKeyTableTest
with MergeIntoNotMatchedBySourceTest
- with PaimonPrimaryKeyNonBucketTableTest {}
+ with PaimonPrimaryKeyNonBucketTableTest {
+ override protected def sparkConf: SparkConf = {
+ super.sparkConf.set("spark.paimon.write.use-v2-write", "false")
+ }
+}
class MergeIntoAppendBucketedTableTest
extends MergeIntoTableTestBase
with MergeIntoAppendTableTest
with MergeIntoNotMatchedBySourceTest
- with PaimonAppendBucketedTableTest {}
+ with PaimonAppendBucketedTableTest {
+ override protected def sparkConf: SparkConf = {
+ super.sparkConf.set("spark.paimon.write.use-v2-write", "false")
+ }
+}
class MergeIntoAppendNonBucketedTableTest
extends MergeIntoTableTestBase
with MergeIntoAppendTableTest
with MergeIntoNotMatchedBySourceTest
- with PaimonAppendNonBucketTableTest {}
+ with PaimonAppendNonBucketTableTest {
+ override protected def sparkConf: SparkConf = {
+ super.sparkConf.set("spark.paimon.write.use-v2-write", "false")
+ }
+}
diff --git
a/paimon-spark/paimon-spark-3.5/src/test/scala/org/apache/paimon/spark/sql/UpdateTableTest.scala
b/paimon-spark/paimon-spark-3.5/src/test/scala/org/apache/paimon/spark/sql/UpdateTableTest.scala
index 194aab278c..bcc07bcb93 100644
---
a/paimon-spark/paimon-spark-3.5/src/test/scala/org/apache/paimon/spark/sql/UpdateTableTest.scala
+++
b/paimon-spark/paimon-spark-3.5/src/test/scala/org/apache/paimon/spark/sql/UpdateTableTest.scala
@@ -18,4 +18,10 @@
package org.apache.paimon.spark.sql
-class UpdateTableTest extends UpdateTableTestBase {}
+import org.apache.spark.SparkConf
+
+class UpdateTableTest extends UpdateTableTestBase {
+ override protected def sparkConf: SparkConf = {
+ super.sparkConf.set("spark.paimon.write.use-v2-write", "false")
+ }
+}
diff --git
a/paimon-spark/paimon-spark-4.0/src/test/scala/org/apache/paimon/spark/sql/DeleteFromTableTest.scala
b/paimon-spark/paimon-spark-4.0/src/test/scala/org/apache/paimon/spark/sql/DeleteFromTableTest.scala
index ab33a40e59..8d620ece82 100644
---
a/paimon-spark/paimon-spark-4.0/src/test/scala/org/apache/paimon/spark/sql/DeleteFromTableTest.scala
+++
b/paimon-spark/paimon-spark-4.0/src/test/scala/org/apache/paimon/spark/sql/DeleteFromTableTest.scala
@@ -20,7 +20,11 @@ package org.apache.paimon.spark.sql
import org.apache.spark.SparkConf
-class DeleteFromTableTest extends DeleteFromTableTestBase {}
+class DeleteFromTableTest extends DeleteFromTableTestBase {
+ override protected def sparkConf: SparkConf = {
+ super.sparkConf.set("spark.paimon.write.use-v2-write", "false")
+ }
+}
class V2DeleteFromTableTest extends DeleteFromTableTestBase {
override protected def sparkConf: SparkConf = {
diff --git
a/paimon-spark/paimon-spark-4.0/src/test/scala/org/apache/paimon/spark/sql/MergeIntoTableTest.scala
b/paimon-spark/paimon-spark-4.0/src/test/scala/org/apache/paimon/spark/sql/MergeIntoTableTest.scala
index b9a85b147e..c83ee54938 100644
---
a/paimon-spark/paimon-spark-4.0/src/test/scala/org/apache/paimon/spark/sql/MergeIntoTableTest.scala
+++
b/paimon-spark/paimon-spark-4.0/src/test/scala/org/apache/paimon/spark/sql/MergeIntoTableTest.scala
@@ -20,26 +20,44 @@ package org.apache.paimon.spark.sql
import org.apache.paimon.spark.{PaimonAppendBucketedTableTest,
PaimonAppendNonBucketTableTest, PaimonPrimaryKeyBucketedTableTest,
PaimonPrimaryKeyNonBucketTableTest}
+import org.apache.spark.SparkConf
+
class MergeIntoPrimaryKeyBucketedTableTest
extends MergeIntoTableTestBase
with MergeIntoPrimaryKeyTableTest
with MergeIntoNotMatchedBySourceTest
- with PaimonPrimaryKeyBucketedTableTest {}
+ with PaimonPrimaryKeyBucketedTableTest {
+ override protected def sparkConf: SparkConf = {
+ super.sparkConf.set("spark.paimon.write.use-v2-write", "false")
+ }
+}
class MergeIntoPrimaryKeyNonBucketTableTest
extends MergeIntoTableTestBase
with MergeIntoPrimaryKeyTableTest
with MergeIntoNotMatchedBySourceTest
- with PaimonPrimaryKeyNonBucketTableTest {}
+ with PaimonPrimaryKeyNonBucketTableTest {
+ override protected def sparkConf: SparkConf = {
+ super.sparkConf.set("spark.paimon.write.use-v2-write", "false")
+ }
+}
class MergeIntoAppendBucketedTableTest
extends MergeIntoTableTestBase
with MergeIntoAppendTableTest
with MergeIntoNotMatchedBySourceTest
- with PaimonAppendBucketedTableTest {}
+ with PaimonAppendBucketedTableTest {
+ override protected def sparkConf: SparkConf = {
+ super.sparkConf.set("spark.paimon.write.use-v2-write", "false")
+ }
+}
class MergeIntoAppendNonBucketedTableTest
extends MergeIntoTableTestBase
with MergeIntoAppendTableTest
with MergeIntoNotMatchedBySourceTest
- with PaimonAppendNonBucketTableTest {}
+ with PaimonAppendNonBucketTableTest {
+ override protected def sparkConf: SparkConf = {
+ super.sparkConf.set("spark.paimon.write.use-v2-write", "false")
+ }
+}
diff --git
a/paimon-spark/paimon-spark-4.0/src/test/scala/org/apache/paimon/spark/sql/UpdateTableTest.scala
b/paimon-spark/paimon-spark-4.0/src/test/scala/org/apache/paimon/spark/sql/UpdateTableTest.scala
index 194aab278c..bcc07bcb93 100644
---
a/paimon-spark/paimon-spark-4.0/src/test/scala/org/apache/paimon/spark/sql/UpdateTableTest.scala
+++
b/paimon-spark/paimon-spark-4.0/src/test/scala/org/apache/paimon/spark/sql/UpdateTableTest.scala
@@ -18,4 +18,10 @@
package org.apache.paimon.spark.sql
-class UpdateTableTest extends UpdateTableTestBase {}
+import org.apache.spark.SparkConf
+
+class UpdateTableTest extends UpdateTableTestBase {
+ override protected def sparkConf: SparkConf = {
+ super.sparkConf.set("spark.paimon.write.use-v2-write", "false")
+ }
+}
