Skip to content

Commit 9c637e3

Browse files
author
B Vadlamani
committed
enable_spark_tests_comet_native_writer
1 parent 846ad25 commit 9c637e3

3 files changed

Lines changed: 45 additions & 37 deletions

File tree

dev/diffs/3.4.3.diff

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,17 @@ index db587dd9868..aac7295a53d 100644
133133
case _ => Map[String, String]()
134134
}
135135
new SparkPlanInfo(
136+
diff --git a/sql/core/src/test/resources/sql-tests/inputs/charvarchar.sql b/sql/core/src/test/resources/sql-tests/inputs/charvarchar.sql
137+
index b62cbf64323..8d1f0cb7d20 100644
138+
--- a/sql/core/src/test/resources/sql-tests/inputs/charvarchar.sql
139+
+++ b/sql/core/src/test/resources/sql-tests/inputs/charvarchar.sql
140+
@@ -1,3 +1,6 @@
141+
+-- TODO: support empty table write / CTAS in native parquet writer
142+
+--SET spark.comet.parquet.write.enabled = false
143+
+
144+
create table char_tbl(c char(5), v varchar(6)) using parquet;
145+
desc formatted char_tbl;
146+
desc formatted char_tbl c;
136147
diff --git a/sql/core/src/test/resources/sql-tests/inputs/explain-aqe.sql b/sql/core/src/test/resources/sql-tests/inputs/explain-aqe.sql
137148
index 7aef901da4f..f3d6e18926d 100644
138149
--- a/sql/core/src/test/resources/sql-tests/inputs/explain-aqe.sql

dev/diffs/3.5.8.diff

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,17 @@ index db587dd9868..aac7295a53d 100644
112112
case _ => Map[String, String]()
113113
}
114114
new SparkPlanInfo(
115+
diff --git a/sql/core/src/test/resources/sql-tests/inputs/charvarchar.sql b/sql/core/src/test/resources/sql-tests/inputs/charvarchar.sql
116+
index be038e1083c..58b512a3c17 100644
117+
--- a/sql/core/src/test/resources/sql-tests/inputs/charvarchar.sql
118+
+++ b/sql/core/src/test/resources/sql-tests/inputs/charvarchar.sql
119+
@@ -1,3 +1,6 @@
120+
+-- TODO: support empty table write / CTAS in native parquet writer
121+
+--SET spark.comet.parquet.write.enabled = false
122+
+
123+
create table char_tbl(c char(5), v varchar(6)) using parquet;
124+
desc formatted char_tbl;
125+
desc formatted char_tbl c;
115126
diff --git a/sql/core/src/test/resources/sql-tests/inputs/explain-aqe.sql b/sql/core/src/test/resources/sql-tests/inputs/explain-aqe.sql
116127
index 7aef901da4f..f3d6e18926d 100644
117128
--- a/sql/core/src/test/resources/sql-tests/inputs/explain-aqe.sql

dev/diffs/4.0.1.diff

Lines changed: 23 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -110,20 +110,6 @@ 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))
127113
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
128114
index 7aca17dcb25..8afeb3b4a2f 100644
129115
--- a/sql/core/src/test/resources/sql-tests/analyzer-results/listagg-collations.sql.out
@@ -145,7 +131,7 @@ index 7aca17dcb25..8afeb3b4a2f 100644
145131
WITH t(c1) AS (SELECT replace(listagg(DISTINCT col1 COLLATE unicode_rtrim) COLLATE utf8_binary, ' ', '') FROM (VALUES ('xbc '), ('xbc '), ('a'), ('xbc'))) SELECT len(c1), regexp_count(c1, 'a'), regexp_count(c1, 'xbc') FROM t
146132
-- !query analysis
147133
diff --git a/sql/core/src/test/resources/sql-tests/inputs/charvarchar.sql b/sql/core/src/test/resources/sql-tests/inputs/charvarchar.sql
148-
index be038e1083c..b3de0ee2641 100644
134+
index be038e1083c..58b512a3c17 100644
149135
--- a/sql/core/src/test/resources/sql-tests/inputs/charvarchar.sql
150136
+++ b/sql/core/src/test/resources/sql-tests/inputs/charvarchar.sql
151137
@@ -1,3 +1,6 @@
@@ -155,12 +141,6 @@ index be038e1083c..b3de0ee2641 100644
155141
create table char_tbl(c char(5), v varchar(6)) using parquet;
156142
desc formatted char_tbl;
157143
desc formatted char_tbl c;
158-
@@ -124,3 +127,5 @@ select chr(167), chr(247), chr(215);
159-
SELECT to_varchar(78.12, '$99.99');
160-
SELECT to_varchar(111.11, '99.9');
161-
SELECT to_varchar(12454.8, '99,999.9S');
162-
+
163-
+SET spark.comet.parquet.write.enabled = true;
164144
diff --git a/sql/core/src/test/resources/sql-tests/inputs/collations.sql b/sql/core/src/test/resources/sql-tests/inputs/collations.sql
165145
index 17815ed5dde..baad440b1ce 100644
166146
--- a/sql/core/src/test/resources/sql-tests/inputs/collations.sql
@@ -343,22 +323,6 @@ index 21a3ce1e122..f4762ab98f0 100644
343323
SET spark.sql.ansi.enabled = false;
344324

345325
-- In COMPENSATION views get invalidated if the type can't cast
346-
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
347-
index 3026e463947..bf3f20906f1 100644
348-
--- a/sql/core/src/test/resources/sql-tests/results/charvarchar.sql.out
349-
+++ b/sql/core/src/test/resources/sql-tests/results/charvarchar.sql.out
350-
@@ -1254,3 +1254,11 @@ SELECT to_varchar(12454.8, '99,999.9S')
351-
struct<to_char(12454.8, 99,999.9S):string>
352-
-- !query output
353-
12,454.8+
354-
+
355-
+
356-
+-- !query
357-
+SET spark.comet.parquet.write.enabled = true
358-
+-- !query schema
359-
+struct<key:string,value:string>
360-
+-- !query output
361-
+spark.comet.parquet.write.enabled true
362326
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
363327
index 1f8c5822e7d..b7de4e28813 100644
364328
--- a/sql/core/src/test/resources/sql-tests/results/listagg-collations.sql.out
@@ -1419,6 +1383,28 @@ index 11e9547dfc5..be9ae40ab3d 100644
14191383
val t1 = "T_1"
14201384
val t2 = "T_2"
14211385

1386+
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
1388+
--- a/sql/core/src/test/scala/org/apache/spark/sql/collation/DefaultCollationTestSuite.scala
1389+
+++ b/sql/core/src/test/scala/org/apache/spark/sql/collation/DefaultCollationTestSuite.scala
1390+
@@ -17,7 +17,7 @@
1391+
1392+
package org.apache.spark.sql.collation
1393+
1394+
-import org.apache.spark.sql.{AnalysisException, DataFrame, QueryTest, Row}
1395+
+import org.apache.spark.sql.{AnalysisException, DataFrame, IgnoreComet, QueryTest, Row}
1396+
import org.apache.spark.sql.catalyst.util.CollationFactory
1397+
import org.apache.spark.sql.connector.DatasourceV2SQLBase
1398+
import org.apache.spark.sql.test.SharedSparkSession
1399+
@@ -184,7 +184,7 @@ abstract class DefaultCollationTestSuite extends QueryTest with SharedSparkSessi
1400+
}
1401+
}
1402+
1403+
- test("ctas with union") {
1404+
+ test("ctas with union", IgnoreComet("comet native writer does not support CTAS")) {
1405+
withTable(testTable) {
1406+
sql(s"""
1407+
|CREATE TABLE $testTable USING $dataSource AS
14221408
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2Suite.scala b/sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2Suite.scala
14231409
index 3eeed2e4175..9f21d547c1c 100644
14241410
--- a/sql/core/src/test/scala/org/apache/spark/sql/connector/DataSourceV2Suite.scala

0 commit comments

Comments
 (0)