set baning timezone rewriting to be the default choice

risingwavelabs · Jan 16, 2024 · 1ef71b4 · 1ef71b4
1 parent b81ab0f
commit 1ef71b4
Show file tree

Hide file tree

Showing 11 changed files with 92 additions and 92 deletions.
diff --git a/e2e_test/batch/functions/now.slt.part b/e2e_test/batch/functions/now.slt.part
@@ -12,9 +12,9 @@ insert into t values(now());
 
 # constant eval of now in batch plan
 query T
-explain select now() + interval '1 hour' = now() + interval '30 minutes' + interval '30 minutes' true;
+select now() + interval '1 hour' = now() + interval '30 minutes' + interval '30 minutes' true;
 ----
-BatchValues { rows: [[true:Boolean]] }
+t
 
 statement ok
 drop table tz

diff --git a/src/expr/impl/src/scalar/extract.rs b/src/expr/impl/src/scalar/extract.rs
@@ -473,7 +473,7 @@ mod tests {
     fn test_extract_from_timestamptz() {
         let ts: Timestamptz = "2023-06-01 00:00:00Z".parse().unwrap();
         let extract = |unit| {
-            extract_from_timestamptz_at_timezone(ts, "pst8pdt", &unit)
+            extract_from_timestamptz1(ts, "pst8pdt", &unit)
                 .unwrap()
                 .to_string()
         };

diff --git a/src/frontend/planner_test/tests/testdata/output/distinct_on.yaml b/src/frontend/planner_test/tests/testdata/output/distinct_on.yaml
@@ -98,7 +98,7 @@
     BatchExchange { order: [], dist: Single }
     └─BatchGroupTopN { order: [], limit: 1, offset: 0, group_key: [$expr1] }
       └─BatchExchange { order: [], dist: HashShard($expr1) }
-        └─BatchProject { exprs: [secret_one.field_one, secret_one.field_two, secret_one.field_three, secret_one.field_four, secret_one.field_five, $expr1, AddWithTimeZone($expr1, '00:01:00':Interval, 'UTC':Varchar) as $expr2] }
+        └─BatchProject { exprs: [secret_one.field_one, secret_one.field_two, secret_one.field_three, secret_one.field_four, secret_one.field_five, $expr1, AddWithTimeZone($expr1, '00:01:00':Interval) as $expr2] }
           └─BatchProject { exprs: [secret_one.field_one, secret_one.field_two, secret_one.field_three, secret_one.field_four, secret_one.field_five, TumbleStart(secret_one.field_two, '00:01:00':Interval) as $expr1] }
             └─BatchScan { table: secret_one, columns: [secret_one.field_one, secret_one.field_two, secret_one.field_three, secret_one.field_four, secret_one.field_five], distribution: SomeShard }
 - sql: |

diff --git a/src/frontend/planner_test/tests/testdata/output/expr.yaml b/src/frontend/planner_test/tests/testdata/output/expr.yaml
@@ -504,7 +504,7 @@
     └─StreamDynamicFilter { predicate: (t.v1 >= $expr1), output_watermarks: [t.v1], output: [t.v1, t._row_id], cleaned_by_watermark: true }
       ├─StreamTableScan { table: t, columns: [t.v1, t._row_id], pk: [t._row_id], dist: UpstreamHashShard(t._row_id) }
       └─StreamExchange { dist: Broadcast }
-        └─StreamProject { exprs: [SubtractWithTimeZone(now, '00:00:02':Interval, 'UTC':Varchar) as $expr1], output_watermarks: [$expr1] }
+        └─StreamProject { exprs: [SubtractWithTimeZone(now, '00:00:02':Interval) as $expr1], output_watermarks: [$expr1] }
           └─StreamNow { output: [now] }
 - name: and of two now expression condition
   sql: |

diff --git a/src/frontend/planner_test/tests/testdata/output/nexmark.yaml b/src/frontend/planner_test/tests/testdata/output/nexmark.yaml
@@ -1073,15 +1073,15 @@
     └─BatchProject { exprs: [bid.bidder, count, $expr1, $expr2] }
       └─BatchHashAgg { group_key: [bid.bidder, $expr1, $expr2], aggs: [count] }
         └─BatchExchange { order: [], dist: HashShard(bid.bidder, $expr1, $expr2) }
-          └─BatchProject { exprs: [bid.bidder, $expr1, AddWithTimeZone($expr1, '00:00:10':Interval, 'UTC':Varchar) as $expr2] }
+          └─BatchProject { exprs: [bid.bidder, $expr1, AddWithTimeZone($expr1, '00:00:10':Interval) as $expr2] }
             └─BatchProject { exprs: [bid.bidder, bid.p_time, TumbleStart(bid.p_time, '00:00:10':Interval) as $expr1] }
               └─BatchScan { table: bid, columns: [bid.bidder, bid.p_time], distribution: SomeShard }
   stream_plan: |-
     StreamMaterialize { columns: [bidder, bid_count, window_start, window_end], stream_key: [bidder, window_start, window_end], pk_columns: [bidder, window_start, window_end], pk_conflict: NoCheck, watermark_columns: [window_start, window_end] }
     └─StreamProject { exprs: [bid.bidder, count, $expr1, $expr2], output_watermarks: [$expr1, $expr2] }
       └─StreamHashAgg [append_only] { group_key: [bid.bidder, $expr1, $expr2], aggs: [count], output_watermarks: [$expr1, $expr2] }
         └─StreamExchange { dist: HashShard(bid.bidder, $expr1, $expr2) }
-          └─StreamProject { exprs: [bid.bidder, $expr1, AddWithTimeZone($expr1, '00:00:10':Interval, 'UTC':Varchar) as $expr2, bid._row_id], output_watermarks: [$expr1, $expr2] }
+          └─StreamProject { exprs: [bid.bidder, $expr1, AddWithTimeZone($expr1, '00:00:10':Interval) as $expr2, bid._row_id], output_watermarks: [$expr1, $expr2] }
             └─StreamProject { exprs: [bid.bidder, bid.p_time, TumbleStart(bid.p_time, '00:00:10':Interval) as $expr1, bid._row_id], output_watermarks: [bid.p_time, $expr1] }
               └─StreamTableScan { table: bid, columns: [bid.bidder, bid.p_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) }
   stream_dist_plan: |+
@@ -1093,7 +1093,7 @@
             └── StreamExchange Hash([0, 1, 2]) from 1
 
     Fragment 1
-    StreamProject { exprs: [bid.bidder, $expr1, AddWithTimeZone($expr1, '00:00:10':Interval, 'UTC':Varchar) as $expr2, bid._row_id], output_watermarks: [$expr1, $expr2] }
+    StreamProject { exprs: [bid.bidder, $expr1, AddWithTimeZone($expr1, '00:00:10':Interval) as $expr2, bid._row_id], output_watermarks: [$expr1, $expr2] }
     └── StreamProject { exprs: [bid.bidder, bid.p_time, TumbleStart(bid.p_time, '00:00:10':Interval) as $expr1, bid._row_id], output_watermarks: [bid.p_time, $expr1] }
         └── StreamTableScan { table: bid, columns: [bid.bidder, bid.p_time, bid._row_id], pk: [bid._row_id], dist: UpstreamHashShard(bid._row_id) } { tables: [ StreamScan: 1 ] }
             ├── Upstream