Skip to content

Commit 8fe1960

Browse files
committed
improve test queality
1 parent 5f06714 commit 8fe1960

9 files changed

+8
-10
lines changed

sql/hive/src/test/resources/golden/constant null testing-0-dce645ca43d2bf888c4d75c456e42f3

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.0

sql/hive/src/test/resources/golden/timestamp cast #3-0-dce645ca43d2bf888c4d75c456e42f3

Whitespace-only changes.

sql/hive/src/test/resources/golden/timestamp cast #3-1-732ed232ac592c5e7f7c913a88874fd2

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
-1.0

sql/hive/src/test/resources/golden/timestamp cast #4-0-dce645ca43d2bf888c4d75c456e42f3

Whitespace-only changes.

sql/hive/src/test/resources/golden/timestamp cast #4-1-6d2da5cfada03605834e38bc4075bc79

-1
This file was deleted.

sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveQuerySuite.scala

+6-8
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,7 @@ class HiveQuerySuite extends HiveComparisonTest with SQLTestUtils with BeforeAnd
180180
"SELECT CAST(CAST('NaN' AS DOUBLE) AS DECIMAL(1,1)) FROM src LIMIT 1")
181181

182182
createQueryTest("constant null testing",
183-
"""set spark.sql.legacy.allowCastNumericToTimestamp=true;
184-
| SELECT
183+
"""| SELECT
185184
|IF(FALSE, CAST(NULL AS STRING), CAST(1 AS STRING)) AS COL1,
186185
|IF(TRUE, CAST(NULL AS STRING), CAST(1 AS STRING)) AS COL2,
187186
|IF(FALSE, CAST(NULL AS INT), CAST(1 AS INT)) AS COL3,
@@ -202,13 +201,14 @@ class HiveQuerySuite extends HiveComparisonTest with SQLTestUtils with BeforeAnd
202201
|IF(TRUE, CAST(NULL AS BINARY), CAST("1" AS BINARY)) AS COL18,
203202
|IF(FALSE, CAST(NULL AS DATE), CAST("1970-01-01" AS DATE)) AS COL19,
204203
|IF(TRUE, CAST(NULL AS DATE), CAST("1970-01-01" AS DATE)) AS COL20,
205-
|IF(TRUE, CAST(NULL AS TIMESTAMP), CAST(1 AS TIMESTAMP)) AS COL21,
204+
|IF(TRUE, CAST(NULL AS TIMESTAMP), CAST('1969-12-31 16:00:01' AS TIMESTAMP)) AS COL21,
206205
|IF(FALSE, CAST(NULL AS DECIMAL), CAST(1 AS DECIMAL)) AS COL22,
207206
|IF(TRUE, CAST(NULL AS DECIMAL), CAST(1 AS DECIMAL)) AS COL23
208207
|FROM src LIMIT 1""".stripMargin)
209208

210209
test("constant null testing timestamp") {
211-
val r1 = sql("SELECT IF(FALSE, CAST(NULL AS TIMESTAMP), TIMESTAMP_SECONDS(1)) AS COL20")
210+
val r1 = sql("SELECT IF(FALSE, CAST(NULL AS TIMESTAMP)," +
211+
"CAST('1969-12-31 16:00:01' AS TIMESTAMP)) AS COL20")
212212
.collect().head
213213
assert(new Timestamp(1000) == r1.getTimestamp(0))
214214
}
@@ -564,14 +564,12 @@ class HiveQuerySuite extends HiveComparisonTest with SQLTestUtils with BeforeAnd
564564

565565
createQueryTest("timestamp cast #3",
566566
"""
567-
|set spark.sql.legacy.allowCastNumericToTimestamp=true;
568-
|SELECT CAST(CAST(1.2 AS TIMESTAMP) AS DOUBLE) FROM src LIMIT 1
567+
|SELECT CAST(TIMESTAMP_SECONDS(CAST(1.2 AS INT)) AS DOUBLE) FROM src LIMIT 1
569568
""".stripMargin)
570569

571570
createQueryTest("timestamp cast #4",
572571
"""
573-
|set spark.sql.legacy.allowCastNumericToTimestamp=true;
574-
|SELECT CAST(CAST(-1.2 AS TIMESTAMP) AS DOUBLE) FROM src LIMIT 1
572+
|SELECT CAST(TIMESTAMP_SECONDS(CAST(-1.2 AS INT)) AS DOUBLE) FROM src LIMIT 1
575573
""".stripMargin)
576574

577575
test("timestamp cast #5") {

0 commit comments

Comments
 (0)