Skip to content

Commit a227143

Browse files
committed
Merge master
1 parent ae11d46 commit a227143

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

sql/core/src/test/resources/sql-tests/results/typeCoercion/native/division.sql.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ SELECT cast(1 as string) / cast('2017-12-11 09:30:00.0' as timestamp) FROM t
798798
struct<>
799799
-- !query 95 output
800800
org.apache.spark.sql.AnalysisException
801-
cannot resolve '(CAST(CAST(1 AS STRING) AS CALENDARINTERVAL) / CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' due to data type mismatch: differing types in '(CAST(CAST(1 AS STRING) AS CALENDARINTERVAL) / CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' (calendarinterval and timestamp).; line 1 pos 7
801+
cannot resolve '(CAST(CAST(1 AS STRING) AS INTERVAL) / CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' due to data type mismatch: differing types in '(CAST(CAST(1 AS STRING) AS INTERVAL) / CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' (interval and timestamp).; line 1 pos 7
802802

803803

804804
-- !query 96
@@ -1095,7 +1095,7 @@ SELECT cast('2017-12-11 09:30:00.0' as timestamp) / cast(1 as string) FROM t
10951095
struct<>
10961096
-- !query 128 output
10971097
org.apache.spark.sql.AnalysisException
1098-
cannot resolve '(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP) / CAST(CAST(1 AS STRING) AS CALENDARINTERVAL))' due to data type mismatch: differing types in '(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP) / CAST(CAST(1 AS STRING) AS CALENDARINTERVAL))' (timestamp and calendarinterval).; line 1 pos 7
1098+
cannot resolve '(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP) / CAST(CAST(1 AS STRING) AS INTERVAL))' due to data type mismatch: differing types in '(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP) / CAST(CAST(1 AS STRING) AS INTERVAL))' (timestamp and interval).; line 1 pos 7
10991099

11001100

11011101
-- !query 129

sql/core/src/test/resources/sql-tests/results/typeCoercion/native/promoteStrings.sql.out

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ cannot resolve '(CAST('1' AS DOUBLE) + CAST(1 AS BOOLEAN))' due to data type mis
9595
-- !query 11
9696
SELECT '1' + cast('2017-12-11 09:30:00.0' as timestamp) FROM t
9797
-- !query 11 schema
98-
struct<CAST(CAST(2017-12-11 09:30:00.0 AS TIMESTAMP) + CAST(1 AS CALENDARINTERVAL) AS TIMESTAMP):timestamp>
98+
struct<CAST(CAST(2017-12-11 09:30:00.0 AS TIMESTAMP) + CAST(1 AS INTERVAL) AS TIMESTAMP):timestamp>
9999
-- !query 11 output
100100
NULL
101101

@@ -197,7 +197,7 @@ SELECT '1' - cast('2017-12-11 09:30:00.0' as timestamp) FROM t
197197
struct<>
198198
-- !query 23 output
199199
org.apache.spark.sql.AnalysisException
200-
cannot resolve '(CAST('1' AS CALENDARINTERVAL) - CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' due to data type mismatch: differing types in '(CAST('1' AS CALENDARINTERVAL) - CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' (calendarinterval and timestamp).; line 1 pos 7
200+
cannot resolve '(CAST('1' AS INTERVAL) - CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' due to data type mismatch: differing types in '(CAST('1' AS INTERVAL) - CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' (interval and timestamp).; line 1 pos 7
201201

202202

203203
-- !query 24
@@ -297,7 +297,7 @@ SELECT '1' * cast('2017-12-11 09:30:00.0' as timestamp) FROM t
297297
struct<>
298298
-- !query 35 output
299299
org.apache.spark.sql.AnalysisException
300-
cannot resolve '(CAST('1' AS CALENDARINTERVAL) * CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' due to data type mismatch: differing types in '(CAST('1' AS CALENDARINTERVAL) * CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' (calendarinterval and timestamp).; line 1 pos 7
300+
cannot resolve '(CAST('1' AS INTERVAL) * CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' due to data type mismatch: differing types in '(CAST('1' AS INTERVAL) * CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' (interval and timestamp).; line 1 pos 7
301301

302302

303303
-- !query 36
@@ -397,7 +397,7 @@ SELECT '1' / cast('2017-12-11 09:30:00.0' as timestamp) FROM t
397397
struct<>
398398
-- !query 47 output
399399
org.apache.spark.sql.AnalysisException
400-
cannot resolve '(CAST('1' AS CALENDARINTERVAL) / CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' due to data type mismatch: differing types in '(CAST('1' AS CALENDARINTERVAL) / CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' (calendarinterval and timestamp).; line 1 pos 7
400+
cannot resolve '(CAST('1' AS INTERVAL) / CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' due to data type mismatch: differing types in '(CAST('1' AS INTERVAL) / CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' (interval and timestamp).; line 1 pos 7
401401

402402

403403
-- !query 48
@@ -497,7 +497,7 @@ SELECT '1' % cast('2017-12-11 09:30:00.0' as timestamp) FROM t
497497
struct<>
498498
-- !query 59 output
499499
org.apache.spark.sql.AnalysisException
500-
cannot resolve '(CAST('1' AS CALENDARINTERVAL) % CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' due to data type mismatch: differing types in '(CAST('1' AS CALENDARINTERVAL) % CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' (calendarinterval and timestamp).; line 1 pos 7
500+
cannot resolve '(CAST('1' AS INTERVAL) % CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' due to data type mismatch: differing types in '(CAST('1' AS INTERVAL) % CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' (interval and timestamp).; line 1 pos 7
501501

502502

503503
-- !query 60
@@ -597,7 +597,7 @@ SELECT pmod('1', cast('2017-12-11 09:30:00.0' as timestamp)) FROM t
597597
struct<>
598598
-- !query 71 output
599599
org.apache.spark.sql.AnalysisException
600-
cannot resolve 'pmod(CAST('1' AS CALENDARINTERVAL), CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' due to data type mismatch: differing types in 'pmod(CAST('1' AS CALENDARINTERVAL), CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' (calendarinterval and timestamp).; line 1 pos 7
600+
cannot resolve 'pmod(CAST('1' AS INTERVAL), CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' due to data type mismatch: differing types in 'pmod(CAST('1' AS INTERVAL), CAST('2017-12-11 09:30:00.0' AS TIMESTAMP))' (interval and timestamp).; line 1 pos 7
601601

602602

603603
-- !query 72
@@ -686,7 +686,7 @@ cannot resolve '(CAST(1 AS BOOLEAN) + CAST('1' AS DOUBLE))' due to data type mis
686686
-- !query 82
687687
SELECT cast('2017-12-11 09:30:00.0' as timestamp) + '1' FROM t
688688
-- !query 82 schema
689-
struct<CAST(CAST(2017-12-11 09:30:00.0 AS TIMESTAMP) + CAST(1 AS CALENDARINTERVAL) AS TIMESTAMP):timestamp>
689+
struct<CAST(CAST(2017-12-11 09:30:00.0 AS TIMESTAMP) + CAST(1 AS INTERVAL) AS TIMESTAMP):timestamp>
690690
-- !query 82 output
691691
NULL
692692

@@ -777,7 +777,7 @@ cannot resolve '(CAST(1 AS BOOLEAN) - CAST('1' AS DOUBLE))' due to data type mis
777777
-- !query 93
778778
SELECT cast('2017-12-11 09:30:00.0' as timestamp) - '1' FROM t
779779
-- !query 93 schema
780-
struct<CAST(CAST(2017-12-11 09:30:00.0 AS TIMESTAMP) - CAST(1 AS CALENDARINTERVAL) AS TIMESTAMP):timestamp>
780+
struct<CAST(CAST(2017-12-11 09:30:00.0 AS TIMESTAMP) - CAST(1 AS INTERVAL) AS TIMESTAMP):timestamp>
781781
-- !query 93 output
782782
NULL
783783

@@ -871,7 +871,7 @@ SELECT cast('2017-12-11 09:30:00.0' as timestamp) * '1' FROM t
871871
struct<>
872872
-- !query 104 output
873873
org.apache.spark.sql.AnalysisException
874-
cannot resolve '(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP) * CAST('1' AS CALENDARINTERVAL))' due to data type mismatch: differing types in '(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP) * CAST('1' AS CALENDARINTERVAL))' (timestamp and calendarinterval).; line 1 pos 7
874+
cannot resolve '(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP) * CAST('1' AS INTERVAL))' due to data type mismatch: differing types in '(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP) * CAST('1' AS INTERVAL))' (timestamp and interval).; line 1 pos 7
875875

876876

877877
-- !query 105
@@ -963,7 +963,7 @@ SELECT cast('2017-12-11 09:30:00.0' as timestamp) / '1' FROM t
963963
struct<>
964964
-- !query 115 output
965965
org.apache.spark.sql.AnalysisException
966-
cannot resolve '(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP) / CAST('1' AS CALENDARINTERVAL))' due to data type mismatch: differing types in '(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP) / CAST('1' AS CALENDARINTERVAL))' (timestamp and calendarinterval).; line 1 pos 7
966+
cannot resolve '(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP) / CAST('1' AS INTERVAL))' due to data type mismatch: differing types in '(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP) / CAST('1' AS INTERVAL))' (timestamp and interval).; line 1 pos 7
967967

968968

969969
-- !query 116
@@ -1055,7 +1055,7 @@ SELECT cast('2017-12-11 09:30:00.0' as timestamp) % '1' FROM t
10551055
struct<>
10561056
-- !query 126 output
10571057
org.apache.spark.sql.AnalysisException
1058-
cannot resolve '(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP) % CAST('1' AS CALENDARINTERVAL))' due to data type mismatch: differing types in '(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP) % CAST('1' AS CALENDARINTERVAL))' (timestamp and calendarinterval).; line 1 pos 7
1058+
cannot resolve '(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP) % CAST('1' AS INTERVAL))' due to data type mismatch: differing types in '(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP) % CAST('1' AS INTERVAL))' (timestamp and interval).; line 1 pos 7
10591059

10601060

10611061
-- !query 127
@@ -1147,7 +1147,7 @@ SELECT pmod(cast('2017-12-11 09:30:00.0' as timestamp), '1') FROM t
11471147
struct<>
11481148
-- !query 137 output
11491149
org.apache.spark.sql.AnalysisException
1150-
cannot resolve 'pmod(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP), CAST('1' AS CALENDARINTERVAL))' due to data type mismatch: differing types in 'pmod(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP), CAST('1' AS CALENDARINTERVAL))' (timestamp and calendarinterval).; line 1 pos 7
1150+
cannot resolve 'pmod(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP), CAST('1' AS INTERVAL))' due to data type mismatch: differing types in 'pmod(CAST('2017-12-11 09:30:00.0' AS TIMESTAMP), CAST('1' AS INTERVAL))' (timestamp and interval).; line 1 pos 7
11511151

11521152

11531153
-- !query 138

0 commit comments

Comments
 (0)