Skip to content

Commit 64ccf2d

Browse files
committed
enable_spark_tests_comet_native_writer_fix_spark_4
1 parent 957278c commit 64ccf2d

1 file changed

Lines changed: 45 additions & 2 deletions

File tree

dev/diffs/4.0.1.diff

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,20 @@ index 4410fe50912..43bcce2a038 100644
110110
case _ => Map[String, String]()
111111
}
112112
val childrenInfo = children.flatMap {
113+
diff --git a/sql/core/src/test/resources/sql-tests/analyzer-results/charvarchar.sql.out b/sql/core/src/test/resources/sql-tests/analyzer-results/charvarchar.sql.out
114+
index 524797015a2..09576b169bd 100644
115+
--- a/sql/core/src/test/resources/sql-tests/analyzer-results/charvarchar.sql.out
116+
+++ b/sql/core/src/test/resources/sql-tests/analyzer-results/charvarchar.sql.out
117+
@@ -738,3 +738,9 @@ SELECT to_varchar(12454.8, '99,999.9S')
118+
-- !query analysis
119+
Project [to_char(12454.8, 99,999.9S) AS to_char(12454.8, 99,999.9S)#x]
120+
+- OneRowRelation
121+
+
122+
+
123+
+-- !query
124+
+SET spark.comet.parquet.write.enabled = true
125+
+-- !query analysis
126+
+SetCommand (spark.comet.parquet.write.enabled,Some(true))
113127
diff --git a/sql/core/src/test/resources/sql-tests/analyzer-results/listagg-collations.sql.out b/sql/core/src/test/resources/sql-tests/analyzer-results/listagg-collations.sql.out
114128
index 7aca17dcb25..8afeb3b4a2f 100644
115129
--- a/sql/core/src/test/resources/sql-tests/analyzer-results/listagg-collations.sql.out
@@ -323,6 +337,22 @@ index 21a3ce1e122..f4762ab98f0 100644
323337
SET spark.sql.ansi.enabled = false;
324338

325339
-- In COMPENSATION views get invalidated if the type can't cast
340+
diff --git a/sql/core/src/test/resources/sql-tests/results/charvarchar.sql.out b/sql/core/src/test/resources/sql-tests/results/charvarchar.sql.out
341+
index 3026e463947..bf3f20906f1 100644
342+
--- a/sql/core/src/test/resources/sql-tests/results/charvarchar.sql.out
343+
+++ b/sql/core/src/test/resources/sql-tests/results/charvarchar.sql.out
344+
@@ -1254,3 +1254,11 @@ SELECT to_varchar(12454.8, '99,999.9S')
345+
struct<to_char(12454.8, 99,999.9S):string>
346+
-- !query output
347+
12,454.8+
348+
+
349+
+
350+
+-- !query
351+
+SET spark.comet.parquet.write.enabled = true
352+
+-- !query schema
353+
+struct<key:string,value:string>
354+
+-- !query output
355+
+spark.comet.parquet.write.enabled true
326356
diff --git a/sql/core/src/test/resources/sql-tests/results/listagg-collations.sql.out b/sql/core/src/test/resources/sql-tests/results/listagg-collations.sql.out
327357
index 1f8c5822e7d..b7de4e28813 100644
328358
--- a/sql/core/src/test/resources/sql-tests/results/listagg-collations.sql.out
@@ -1067,6 +1097,19 @@ index ad424b3a7cc..4ece0117a34 100644
10671097

10681098
protected val baseResourcePath = {
10691099
// use the same way as `SQLQueryTestSuite` to get the resource path
1100+
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SQLInsertTestSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SQLInsertTestSuite.scala
1101+
index 818c7ec65b1..0d333807b70 100644
1102+
--- a/sql/core/src/test/scala/org/apache/spark/sql/SQLInsertTestSuite.scala
1103+
+++ b/sql/core/src/test/scala/org/apache/spark/sql/SQLInsertTestSuite.scala
1104+
@@ -524,7 +524,7 @@ trait SQLInsertTestSuite extends QueryTest with SQLTestUtils with AdaptiveSparkP
1105+
}
1106+
}
1107+
1108+
- test("SPARK-48817: test multi inserts") {
1109+
+ test("SPARK-48817: test multi inserts", IgnoreComet("comet parquet native writer bug")) {
1110+
withTable("t1", "t2", "t3") {
1111+
createTable("t1", Seq("i"), Seq("int"))
1112+
createTable("t2", Seq("i"), Seq("int"))
10701113
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
10711114
index b3fce19979e..67edf5eb91c 100644
10721115
--- a/sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala
@@ -1384,7 +1427,7 @@ index 11e9547dfc5..be9ae40ab3d 100644
13841427
val t2 = "T_2"
13851428

13861429
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/collation/DefaultCollationTestSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/collation/DefaultCollationTestSuite.scala
1387-
index 031af8200d7..a56a1223a7d 100644
1430+
index 031af8200d7..bb5acd74ad2 100644
13881431
--- a/sql/core/src/test/scala/org/apache/spark/sql/collation/DefaultCollationTestSuite.scala
13891432
+++ b/sql/core/src/test/scala/org/apache/spark/sql/collation/DefaultCollationTestSuite.scala
13901433
@@ -17,7 +17,7 @@
@@ -1401,7 +1444,7 @@ index 031af8200d7..a56a1223a7d 100644
14011444
}
14021445

14031446
- test("ctas with union") {
1404-
+ test("ctas with union", IgnoreComet("comet native writer does not support CTAS")) {
1447+
+ test("ctas with union", IgnoreComet("comet native writer bug when shuffle / AQE enabled")) {
14051448
withTable(testTable) {
14061449
sql(s"""
14071450
|CREATE TABLE $testTable USING $dataSource AS

0 commit comments

Comments
 (0)