Skip to content

Commit 7a7fd4b

Browse files
committed
Review feedback
1 parent 850abfd commit 7a7fd4b

2 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎datafusion/core/tests/sqllogictests/test_files/timestamps.slt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,51 +72,51 @@ drop table foo;
7272
## test date_bin function
7373
###
7474
query T
75-
SELECT DATE_BIN(INTERVAL '15 minutes', TIMESTAMP '2022-08-03 14:38:50Z', TIMESTAMP '1970-01-01T00:00:00Z') AS res
75+
SELECT DATE_BIN(INTERVAL '15 minutes', TIMESTAMP '2022-08-03 14:38:50Z', TIMESTAMP '1970-01-01T00:00:00Z')
7676
----
7777
2022-08-03T14:30:00
7878

7979
# Can coerce string interval arguments
8080
query T
81-
SELECT DATE_BIN('15 minutes', TIMESTAMP '2022-08-03 14:38:50Z', TIMESTAMP '1970-01-01T00:00:00Z') AS res
81+
SELECT DATE_BIN('15 minutes', TIMESTAMP '2022-08-03 14:38:50Z', TIMESTAMP '1970-01-01T00:00:00Z')
8282
----
8383
2022-08-03T14:30:00
8484

8585
# Can coerce all string arguments
8686
query T
87-
SELECT DATE_BIN('15 minutes', '2022-08-03 14:38:50Z', '1970-01-01T00:00:00Z') AS res
87+
SELECT DATE_BIN('15 minutes', '2022-08-03 14:38:50Z', '1970-01-01T00:00:00Z')
8888
----
8989
2022-08-03T14:30:00
9090

9191
# Shift forward by 5 minutes
9292
query T
93-
SELECT DATE_BIN(INTERVAL '15 minutes', TIMESTAMP '2022-08-03 14:38:50Z', TIMESTAMP '1970-01-01T00:05:00Z') AS res
93+
SELECT DATE_BIN(INTERVAL '15 minutes', TIMESTAMP '2022-08-03 14:38:50Z', TIMESTAMP '1970-01-01T00:05:00Z')
9494
----
9595
2022-08-03T14:35:00
9696

9797

9898
# Shift backward by 5 minutes
9999
query T
100-
SELECT DATE_BIN(INTERVAL '15 minutes', TIMESTAMP '2022-08-03 14:38:50Z', TIMESTAMP '1970-01-01T23:55:00Z') AS res
100+
SELECT DATE_BIN(INTERVAL '15 minutes', TIMESTAMP '2022-08-03 14:38:50Z', TIMESTAMP '1970-01-01T23:55:00Z')
101101
----
102102
2022-08-03T14:25:00
103103

104104
# origin after source, timestamp in previous bucket
105105
query T
106-
SELECT DATE_BIN(INTERVAL '15 minutes', TIMESTAMP '2022-08-03 14:38:50Z', TIMESTAMP '2022-08-03 14:40:00Z') AS res
106+
SELECT DATE_BIN(INTERVAL '15 minutes', TIMESTAMP '2022-08-03 14:38:50Z', TIMESTAMP '2022-08-03 14:40:00Z')
107107
----
108108
2022-08-03T14:25:00
109109

110110
# stride by 7 days
111111
query T
112-
SELECT DATE_BIN(INTERVAL '7 days', TIMESTAMP '2022-08-03 14:38:50Z', TIMESTAMP '1970-01-01 00:00:00Z') AS res
112+
SELECT DATE_BIN(INTERVAL '7 days', TIMESTAMP '2022-08-03 14:38:50Z', TIMESTAMP '1970-01-01 00:00:00Z')
113113
----
114114
2022-07-28T00:00:00
115115

116116

117117
# origin shifts bins forward 1 day
118118
query T
119-
SELECT DATE_BIN(INTERVAL '7 days', TIMESTAMP '2022-08-03 14:38:50Z', TIMESTAMP '1970-01-02 00:00:00Z') AS res
119+
SELECT DATE_BIN(INTERVAL '7 days', TIMESTAMP '2022-08-03 14:38:50Z', TIMESTAMP '1970-01-02 00:00:00Z')
120120
----
121121
2022-07-29T00:00:00
122122

‎datafusion/expr/src/type_coercion/functions.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,11 +176,11 @@ pub fn can_coerce_from(type_into: &DataType, type_from: &DataType) -> bool {
176176
| Float64
177177
| Decimal128(_, _)
178178
),
179-
Timestamp(TimeUnit::Nanosecond, None) => {
180-
matches!(type_from, Null | Timestamp(_, None) | Utf8 | LargeUtf8)
181-
}
182179
Timestamp(TimeUnit::Nanosecond, _) => {
183-
matches!(type_from, Null | Timestamp(_, _) | Date32 | Utf8 | LargeUtf8)
180+
matches!(
181+
type_from,
182+
Null | Timestamp(_, _) | Date32 | Utf8 | LargeUtf8
183+
)
184184
}
185185
Interval(_) => {
186186
matches!(type_from, Utf8 | LargeUtf8)

0 commit comments

Comments
 (0)