From 33b0d151d407d552f8615af58ee995467d18f021 Mon Sep 17 00:00:00 2001
From: xxchan <xxchan22f@gmail.com>
Date: Tue, 6 Dec 2022 23:40:35 +0100
Subject: [PATCH 1/4] chore: regenerate & format slt tests
---
e2e_test/batch/aggregate/avg.slt.part | 1 -
e2e_test/batch/aggregate/distinct.slt.part | 1 +
.../aggregate/selective_distinct_agg.slt.part | 3 +-
e2e_test/batch/aggregate/sort_agg.slt.part | 3 +-
e2e_test/batch/aggregate/timestamp.slt.part | 10 +-
e2e_test/batch/basic/array.slt.part | 9 +
e2e_test/batch/basic/array_access.slt.part | 7 +-
e2e_test/batch/basic/basic.slt.part | 5 +-
e2e_test/batch/basic/boolean.slt.part | 10 +-
e2e_test/batch/basic/const.slt.part | 1 -
e2e_test/batch/basic/cte.slt.part | 2 +-
e2e_test/batch/basic/func.slt.part | 4 +-
e2e_test/batch/basic/generate_series.slt.part | 2 +-
e2e_test/batch/basic/index.slt.part | 2 +-
e2e_test/batch/basic/index_join.slt.part | 2 +-
e2e_test/batch/basic/insert_expr.slt.part | 48 ++---
.../batch/basic/insert_with_join.slt.part | 2 +-
e2e_test/batch/basic/join.slt.part | 2 +-
e2e_test/batch/basic/logical_view.slt.part | 11 +-
e2e_test/batch/basic/lookup_join.slt.part | 1 -
e2e_test/batch/basic/query.slt.part | 2 +-
e2e_test/batch/basic/range.slt.part | 2 +-
e2e_test/batch/basic/range_scan.slt.part | 18 +-
.../batch/basic/scientific_number.slt.part | 6 +-
.../batch/basic/string_concat_op.slt.part | 2 +-
e2e_test/batch/basic/subquery.slt.part | 4 +-
e2e_test/batch/basic/time_window.slt.part | 8 +-
e2e_test/batch/basic/time_window_utc.slt.part | 8 +-
e2e_test/batch/basic/union.slt.part | 7 +-
e2e_test/batch/basic/unnest.slt.part | 18 +-
e2e_test/batch/distribution_mode.slt | 8 +-
e2e_test/batch/duckdb/all.slt.part | 8 +-
.../cross_product/test_cross_product.slt.part | 3 +-
...oss_product_parallelism.test_slow.slt.part | 2 +
.../full_outer/full_outer_join_cache.slt.part | 3 +-
.../full_outer/full_outer_join_union.slt.part | 2 +-
.../full_outer/test_full_outer_join.slt.part | 6 +-
.../test_full_outer_join_complex.slt.part | 3 +-
.../test_full_outer_join_inequality.slt.part | 3 +-
...test_full_outer_join_many_matches.slt.part | 8 +-
.../test_full_outer_join_range.slt.part | 4 +-
.../test_iejoin_east_west.test.slt.part | 5 +
.../test_iejoin_sort_tasks.test_slow.slt.part | 2 +-
.../join/inner/equality_join_limits.slt.part | 6 +-
.../join/inner/join_cross_product.slt.part | 5 +-
.../join/inner/test_eq_ineq_join.slt.part | 4 +-
.../duckdb/join/inner/test_join.slt.part | 15 +-
.../duckdb/join/inner/test_lt_join.slt.part | 2 +-
.../join/inner/test_range_join.slt.part | 8 +-
.../join/inner/test_unequal_join.slt.part | 7 +-
.../test_unequal_join_duplicates.slt.part | 3 +-
.../join/inner/test_using_chain.slt.part | 8 +-
.../join/inner/test_using_join.slt.part | 17 +-
.../join/inner/test_varchar_join.slt.part | 3 +-
.../left_join_dropping_rows.slt.part | 2 +-
.../join/left_outer/test_left_outer.slt.part | 15 +-
.../right_outer/test_right_outer.slt.part | 2 +-
.../join/test_complex_join_expr.slt.part | 3 +-
.../join/test_join_on_aggregates.slt.part | 4 +-
.../join/test_nested_inequality.slt.part | 1 -
.../duckdb/join/test_string_payload.slt.part | 2 +-
.../duckdb/limit/test_parallel_limit.slt.part | 4 +-
.../limit/test_parallel_limit_nulls.slt.part | 2 +
.../test_parallel_limit_strings.slt.part | 4 +-
.../test_preserve_insertion_order.slt.part | 3 +-
.../batch/functions/array_concat.slt.part | 4 -
.../batch/functions/at_time_zone.slt.part | 6 +-
e2e_test/batch/functions/concat.slt.part | 2 +-
e2e_test/batch/functions/date_trunc.slt.part | 83 ++++----
e2e_test/batch/functions/internal.slt.part | 10 +-
e2e_test/batch/functions/overlay.slt.part | 8 +-
.../inner/test_null_safe_equal_join.slt.part | 3 +-
.../order/limit_full_outer_join.slt.part | 1 -
e2e_test/batch/order/negative_offset.slt.part | 10 +-
e2e_test/batch/order/test_limit.slt.part | 26 ++-
e2e_test/batch/order/test_order_by.slt.part | 12 +-
.../order/test_order_by_exceptions.slt.part | 7 +-
.../test_order_by_materialized_view.slt.part | 4 +
.../order/test_order_same_value.slt.part | 12 +-
.../test_order_variable_size_payload.slt.part | 9 +-
e2e_test/batch/top_n/group_top_n.slt | 12 +-
e2e_test/batch/tpch.slt | 57 ++++-
e2e_test/batch/tpch/q1.slt.part | 1 +
e2e_test/batch/tpch/q10.slt.part | 4 -
e2e_test/batch/tpch/q11.slt.part | 3 -
e2e_test/batch/tpch/q12.slt.part | 1 -
e2e_test/batch/tpch/q15.slt.part | 2 +-
e2e_test/batch/tpch/q22.slt.part | 2 +-
e2e_test/batch/tpch/q3.slt.part | 1 +
e2e_test/batch/tpch/q5.slt.part | 1 -
e2e_test/batch/tpch/q6.slt.part | 1 +
e2e_test/batch/tpch/q7.slt.part | 1 -
e2e_test/batch/tpch/q8.slt.part | 2 -
e2e_test/batch/tpch/q9.slt.part | 2 -
e2e_test/batch/types/array_ty.slt.part | 7 +-
e2e_test/batch/types/bytea.slt.part | 10 +-
e2e_test/batch/types/date.slt | 32 ++-
e2e_test/batch/types/decimal.slt.part | 6 +-
e2e_test/batch/types/interval.slt.part | 3 +-
.../batch/types/temporal_arithmetic.slt.part | 2 +-
e2e_test/batch/types/timestamptz_utc.slt.part | 1 +
e2e_test/nexmark/insert_auction.slt.part | 2 +-
e2e_test/nexmark/insert_bid.slt.part | 2 +-
e2e_test/nexmark/insert_person.slt.part | 2 +-
e2e_test/streaming/append_only.slt | 10 +-
e2e_test/streaming/basic.slt | 10 +-
e2e_test/streaming/bug_fixes/issue_5825.slt | 2 +-
.../bug_fixes/mv_on_singleton_mv_4153.slt | 1 +
e2e_test/streaming/dynamic_filter.slt | 7 +-
e2e_test/streaming/group_top_n.slt | 17 +-
e2e_test/streaming/join.slt | 22 +-
e2e_test/streaming/mv_on_mv.slt | 42 ++--
.../streaming/nexmark/create_views.slt.part | 17 ++
e2e_test/streaming/nexmark/q0.slt.part | 100 ++++-----
e2e_test/streaming/nexmark/q1.slt.part | 100 ++++-----
e2e_test/streaming/nexmark/q10.slt.part | 100 ++++-----
e2e_test/streaming/nexmark/q14.slt.part | 24 +--
e2e_test/streaming/nexmark/q17.slt.part | 24 +--
e2e_test/streaming/nexmark/q18.slt.part | 2 +-
e2e_test/streaming/nexmark/q21.slt.part | 96 ++++-----
e2e_test/streaming/nexmark/q22.slt.part | 100 ++++-----
e2e_test/streaming/nexmark/q3.slt.part | 14 +-
e2e_test/streaming/nexmark/q4.slt.part | 10 +-
e2e_test/streaming/nexmark/q5.slt.part | 34 +--
e2e_test/streaming/nexmark/q8.slt.part | 14 +-
e2e_test/streaming/nexmark/views/q15.slt.part | 2 +-
e2e_test/streaming/nexmark/views/q16.slt.part | 2 +-
e2e_test/streaming/nexmark/views/q18.slt.part | 2 +-
e2e_test/streaming/nexmark/views/q9.slt.part | 2 +-
e2e_test/streaming/nexmark_snapshot.slt | 22 ++
e2e_test/streaming/nexmark_upstream.slt | 23 ++
e2e_test/streaming/non_strict_mode.slt | 6 +-
e2e_test/streaming/null_safe_equal_join.slt | 3 +-
e2e_test/streaming/outer_join.slt | 3 +-
e2e_test/streaming/project_set.slt | 15 +-
e2e_test/streaming/selective_agg.slt | 2 +-
e2e_test/streaming/struct_table.slt | 3 +-
e2e_test/streaming/time_window.slt | 8 +-
e2e_test/streaming/tpch/create_views.slt.part | 21 ++
e2e_test/streaming/tpch/q1.slt.part | 1 +
e2e_test/streaming/tpch/q10.slt.part | 41 ++--
e2e_test/streaming/tpch/q11.slt.part | 138 ++++++------
e2e_test/streaming/tpch/q12.slt.part | 1 +
e2e_test/streaming/tpch/q13.slt.part | 55 ++---
e2e_test/streaming/tpch/q16.slt.part | 65 +++---
e2e_test/streaming/tpch/q18.slt.part | 201 +++++++++---------
e2e_test/streaming/tpch/q2.slt.part | 5 +-
e2e_test/streaming/tpch/q3.slt.part | 21 +-
e2e_test/streaming/tpch/q4.slt.part | 1 +
e2e_test/streaming/tpch/q5.slt.part | 5 +-
e2e_test/streaming/tpch/q7.slt.part | 2 +-
e2e_test/streaming/tpch/q8.slt.part | 1 +
e2e_test/streaming/tpch/q9.slt.part | 123 +++++------
e2e_test/streaming/tpch/views/q10.slt.part | 2 +-
e2e_test/streaming/tpch/views/q14.slt.part | 2 +-
e2e_test/streaming/tpch/views/q15.slt.part | 2 +-
e2e_test/streaming/tpch/views/q16.slt.part | 2 +-
e2e_test/streaming/tpch/views/q17.slt.part | 2 +-
e2e_test/streaming/tpch/views/q18.slt.part | 2 +-
e2e_test/streaming/tpch/views/q21.slt.part | 2 +-
e2e_test/streaming/tpch/views/q3.slt.part | 2 +-
e2e_test/streaming/tpch/views/q4.slt.part | 2 +-
e2e_test/streaming/tpch/views/q5.slt.part | 2 +-
e2e_test/streaming/tpch/views/q6.slt.part | 2 +-
e2e_test/streaming/tpch/views/q7.slt.part | 2 +-
e2e_test/streaming/tpch/views/q8.slt.part | 2 +-
e2e_test/streaming/tpch/views/q9.slt.part | 2 +-
e2e_test/streaming/tpch_snapshot.slt | 31 +++
e2e_test/streaming/tpch_upstream.slt | 32 +++
e2e_test/streaming/union.slt | 2 -
170 files changed, 1346 insertions(+), 999 deletions(-)
diff --git a/e2e_test/batch/aggregate/avg.slt.part b/e2e_test/batch/aggregate/avg.slt.part
index 8a635424b7a1b..12c4ffc4394b1 100644
--- a/e2e_test/batch/aggregate/avg.slt.part
+++ b/e2e_test/batch/aggregate/avg.slt.part
@@ -1,4 +1,3 @@
-
statement ok
SET RW_IMPLICIT_FLUSH TO true;
diff --git a/e2e_test/batch/aggregate/distinct.slt.part b/e2e_test/batch/aggregate/distinct.slt.part
index 67eb9a50ab392..7409e0bb9ea6e 100644
--- a/e2e_test/batch/aggregate/distinct.slt.part
+++ b/e2e_test/batch/aggregate/distinct.slt.part
@@ -19,6 +19,7 @@ select distinct sum(v1) from t group by v2;
5
# v2, v3 can be either 2, 3 or 3, 2
+
query I
select distinct on(v1) v2 + v3 from t order by v1;
----
diff --git a/e2e_test/batch/aggregate/selective_distinct_agg.slt.part b/e2e_test/batch/aggregate/selective_distinct_agg.slt.part
index 7274e9490b896..0196f7c88d8b3 100644
--- a/e2e_test/batch/aggregate/selective_distinct_agg.slt.part
+++ b/e2e_test/batch/aggregate/selective_distinct_agg.slt.part
@@ -40,7 +40,6 @@ with z(a, b) as (select count(distinct v1), count(v2) from t) select a from z;
statement ok
drop table t
-
statement ok
create table t(x int, y int)
@@ -53,4 +52,4 @@ select count(distinct x) filter (where y > 0), sum(distinct y) from t;
1 3
statement ok
-drop table t
\ No newline at end of file
+drop table t
diff --git a/e2e_test/batch/aggregate/sort_agg.slt.part b/e2e_test/batch/aggregate/sort_agg.slt.part
index 10ff65df0b92f..40bd3a93577c5 100644
--- a/e2e_test/batch/aggregate/sort_agg.slt.part
+++ b/e2e_test/batch/aggregate/sort_agg.slt.part
@@ -20,7 +20,6 @@ select v1, max(v2) from mv group by v1
4 7
9 3
-
query II
select v1, max(v2) from t group by v1 order by v1 desc
----
@@ -35,4 +34,4 @@ statement ok
drop materialized view mv
statement ok
-drop table t
\ No newline at end of file
+drop table t
diff --git a/e2e_test/batch/aggregate/timestamp.slt.part b/e2e_test/batch/aggregate/timestamp.slt.part
index 981701c022ed5..63c759b2af3dc 100644
--- a/e2e_test/batch/aggregate/timestamp.slt.part
+++ b/e2e_test/batch/aggregate/timestamp.slt.part
@@ -18,11 +18,11 @@ insert into t1 values
query IT rowsort
select sum(v), created_at from t1 group by created_at;
----
-3 2022-01-01 11:02:00
-1 2022-01-01 10:52:00
-5 2022-01-01 10:33:00
-3 2022-01-01 10:15:00
-4 2022-01-01 10:00:00
+1 2022-01-01 10:52:00
+3 2022-01-01 10:15:00
+3 2022-01-01 11:02:00
+4 2022-01-01 10:00:00
+5 2022-01-01 10:33:00
statement ok
drop table t1;
diff --git a/e2e_test/batch/basic/array.slt.part b/e2e_test/batch/basic/array.slt.part
index 5a1a759ef9f69..004fa4a4fa3eb 100644
--- a/e2e_test/batch/basic/array.slt.part
+++ b/e2e_test/batch/basic/array.slt.part
@@ -95,6 +95,7 @@ drop table t;
## Test single quote style array syntax.
# Test assign cast.
+
statement ok
create table t(arr int[]);
@@ -111,6 +112,7 @@ statement ok
drop table t;
# Test explicit and implicit cast
+
query T
select pg_typeof(arr) from (values ('{1, 2, 3}'::integer[]), ('{4, 5, 6}')) as t(arr);
----
@@ -124,6 +126,7 @@ integer[]
integer[]
# Test explicit cast to float array
+
query T
select pg_typeof(arr::float[]) from (values ('{1, 2, 3}'), ('{4, 5, 6}')) as t(arr);
----
@@ -131,6 +134,7 @@ double precision[]
double precision[]
# Test explicit cast to varchar array
+
query T
select pg_typeof(arr::varchar[]) from (values ('{1, 2, 3}'), ('{4, 5, 6}')) as t(arr);
----
@@ -138,6 +142,7 @@ varchar[]
varchar[]
# Test explicit cast to nested integer array
+
query T
select pg_typeof(arr::integer[][]) from (values ('{{1}, {2}, {3}}'), ('{{4}, {5}, {6}}')) as t(arr);
----
@@ -145,6 +150,7 @@ integer[][]
integer[][]
# Test explicit cast to varchar array. Varchar values should be trimmed
+
query T
select (arr::varchar[])[1] from (values ('{ 1 b ?, 2, 3}'), ('{ 4 a , 5, 6}')) as t(arr);
----
@@ -157,6 +163,7 @@ select pg_typeof((v1::integer[][])[2][1]), (v1::integer[][])[2][1] from (values
integer 2
# Test multiple castings of the same input.
+
query TTI
select
(arr::varchar[][])[1][2] as double_varchar,
@@ -167,12 +174,14 @@ from (values ('{{{1, 2, 3}, {44, 55, 66}}}')) as t(arr);
{44, 55, 66} 66 66
# Test cast from array to string
+
query T
select array['a', 'b']::varchar;
----
{a,b}
# Test array display with quoting
+
query T
select array['hello', '', null, 'nULl', 'nULlx', 'aa"bb', 'mm\nn', 'uu,vv', 'yy zz'];
----
diff --git a/e2e_test/batch/basic/array_access.slt.part b/e2e_test/batch/basic/array_access.slt.part
index 4f5a20b06b956..8ed685c933dc9 100644
--- a/e2e_test/batch/basic/array_access.slt.part
+++ b/e2e_test/batch/basic/array_access.slt.part
@@ -21,14 +21,15 @@ select (ARRAY['foo', 'bar'])[3];
----
NULL
-statement error
+statement error
select (ARRAY['foo', 'bar'])[];
# array access is not possible for non-composite types
-statement error
+
+statement error
select (1::INT)[1];
-statement error
+statement error
select ('a'::VARCHAR)[1];
query T
diff --git a/e2e_test/batch/basic/basic.slt.part b/e2e_test/batch/basic/basic.slt.part
index e3fa13577fbe1..027490e530b61 100644
--- a/e2e_test/batch/basic/basic.slt.part
+++ b/e2e_test/batch/basic/basic.slt.part
@@ -11,7 +11,7 @@ values(1+2*3)
----
7
-statement error
+statement error
values(CAST('abc' AS BOOLEAN))
query I
@@ -27,7 +27,6 @@ select 1+2*3, 4*5;
statement ok
start transaction;
-
statement ok
abort;
@@ -35,5 +34,3 @@ query I
show RW_IMPLICIT_FLUSH;
----
true
-
-
diff --git a/e2e_test/batch/basic/boolean.slt.part b/e2e_test/batch/basic/boolean.slt.part
index f75648021775c..2dab999081359 100644
--- a/e2e_test/batch/basic/boolean.slt.part
+++ b/e2e_test/batch/basic/boolean.slt.part
@@ -76,11 +76,9 @@ SELECT v1 is true,
v1 is null
FROM TB1;
----
-t f f t f
-f t t f f
-f t f t t
-
-
+f t f t t
+f t t f f
+t f f t f
statement ok
DROP TABLE TB1;
@@ -126,4 +124,4 @@ select booleq(true,true),
boolne('true'::bool,false),
boolne('true'::bool,true);
----
-t f f t f t t f t t f
\ No newline at end of file
+t f f t f t t f t t f
diff --git a/e2e_test/batch/basic/const.slt.part b/e2e_test/batch/basic/const.slt.part
index da644b9af4f7a..5f5b4d8a00431 100644
--- a/e2e_test/batch/basic/const.slt.part
+++ b/e2e_test/batch/basic/const.slt.part
@@ -36,4 +36,3 @@ select 42 having 2 > 1;
query I
select 42 having 2 < 1;
----
-
diff --git a/e2e_test/batch/basic/cte.slt.part b/e2e_test/batch/basic/cte.slt.part
index c17cad8aafd05..1d0d6d58bee0b 100644
--- a/e2e_test/batch/basic/cte.slt.part
+++ b/e2e_test/batch/basic/cte.slt.part
@@ -34,8 +34,8 @@ with cte as (select v3, v4 from t2) select t1.v1 from t1 inner join cte on t1.v2
query I rowsort
with cte1 as (select v3, v4 from t2), cte2 as (select v3 from cte1) select v3 from cte2;
----
-3
1
+3
query II
with t1 as (values(100, 200)) select * from t1;
diff --git a/e2e_test/batch/basic/func.slt.part b/e2e_test/batch/basic/func.slt.part
index 1d637e04d693d..8a94b9f03c6df 100644
--- a/e2e_test/batch/basic/func.slt.part
+++ b/e2e_test/batch/basic/func.slt.part
@@ -69,7 +69,6 @@ create table t (v1 int);
statement ok
create table b (b1 int, b2 int);
-
statement ok
insert into t values (2);
@@ -148,7 +147,6 @@ select concat_ws(v1, v2, v3, v4, v5, v6, v7, v8) from t;
----
1,2,3.01,4,5.01,t
-
statement ok
drop table t;
@@ -177,7 +175,6 @@ select split_part('abc,def,ghi,jkl', ',', -2);
----
ghi
-
query I
select char_length('hello world');
----
@@ -269,6 +266,7 @@ select pg_typeof(array[1, 2]);
integer[]
# Note that PostgreSQL still displays `integer[]` in this case.
+
query T
select pg_typeof(array[array[1, 2], array[3, 4]]);
----
diff --git a/e2e_test/batch/basic/generate_series.slt.part b/e2e_test/batch/basic/generate_series.slt.part
index c65272bdbd44c..433f23f46c3a7 100644
--- a/e2e_test/batch/basic/generate_series.slt.part
+++ b/e2e_test/batch/basic/generate_series.slt.part
@@ -81,7 +81,7 @@ SELECT * FROM generate_series('10'::INT,'2'::INT,'-2'::INT);
4
2
-statement error
+statement error
SELECT * FROM generate_series('2'::INT,'10'::INT,'0'::INT);
query I
diff --git a/e2e_test/batch/basic/index.slt.part b/e2e_test/batch/basic/index.slt.part
index d74533e696b20..0077867023710 100644
--- a/e2e_test/batch/basic/index.slt.part
+++ b/e2e_test/batch/basic/index.slt.part
@@ -42,4 +42,4 @@ select v1,v2 from t1 order by v1, v2;
5 6
statement ok
-drop table t1;
\ No newline at end of file
+drop table t1;
diff --git a/e2e_test/batch/basic/index_join.slt.part b/e2e_test/batch/basic/index_join.slt.part
index 0f565aa98cceb..112574fd972d0 100644
--- a/e2e_test/batch/basic/index_join.slt.part
+++ b/e2e_test/batch/basic/index_join.slt.part
@@ -35,4 +35,4 @@ statement ok
drop table t;
statement ok
-drop table t2;
\ No newline at end of file
+drop table t2;
diff --git a/e2e_test/batch/basic/insert_expr.slt.part b/e2e_test/batch/basic/insert_expr.slt.part
index e07588cb4f793..c1d051eed9bdc 100644
--- a/e2e_test/batch/basic/insert_expr.slt.part
+++ b/e2e_test/batch/basic/insert_expr.slt.part
@@ -54,17 +54,17 @@ insert into t values (12), (6+7), (44);
query I rowsort
select * from t;
----
+12
+13
3
4
+44
5
6
7
7
8
9
-12
-13
-44
statement ok
drop table t;
@@ -88,8 +88,8 @@ insert into t (v1, v2, v3) values (1, 2, 3);
query I rowsort
select * from t;
----
-1 3 2
-1 2 3
+1 2 3
+1 3 2
statement ok
insert into t (v2, v1, v3) values (1, 2, 3);
@@ -97,9 +97,9 @@ insert into t (v2, v1, v3) values (1, 2, 3);
query I rowsort
select * from t;
----
-1 3 2
-1 2 3
-2 1 3
+1 2 3
+1 3 2
+2 1 3
statement ok
insert into t (v2, v3, v1) values (1, 2, 3);
@@ -107,10 +107,10 @@ insert into t (v2, v3, v1) values (1, 2, 3);
query I rowsort
select * from t;
----
-1 3 2
-1 2 3
-2 1 3
-3 1 2
+1 2 3
+1 3 2
+2 1 3
+3 1 2
statement ok
insert into t (v3, v1, v2) values (1, 2, 3);
@@ -118,11 +118,11 @@ insert into t (v3, v1, v2) values (1, 2, 3);
query I rowsort
select * from t;
----
-1 3 2
-1 2 3
-2 1 3
-3 1 2
-2 3 1
+1 2 3
+1 3 2
+2 1 3
+2 3 1
+3 1 2
statement ok
insert into t (v3, v2, v1) values (1, 2, 3);
@@ -130,12 +130,12 @@ insert into t (v3, v2, v1) values (1, 2, 3);
query I rowsort
select * from t;
----
-1 3 2
-1 2 3
-2 1 3
-3 1 2
-2 3 1
-3 2 1
+1 2 3
+1 3 2
+2 1 3
+2 3 1
+3 1 2
+3 2 1
# column and table names have to be case insensitive
@@ -251,8 +251,6 @@ select * from t;
statement ok
drop table t;
-
-
statement ok
create table t (v1 int, v2 int, v3 int);
diff --git a/e2e_test/batch/basic/insert_with_join.slt.part b/e2e_test/batch/basic/insert_with_join.slt.part
index 366a9d8fcf79c..1c5a6f0035ce9 100644
--- a/e2e_test/batch/basic/insert_with_join.slt.part
+++ b/e2e_test/batch/basic/insert_with_join.slt.part
@@ -33,4 +33,4 @@ statement ok
drop table t2;
statement ok
-drop table t3;
\ No newline at end of file
+drop table t3;
diff --git a/e2e_test/batch/basic/join.slt.part b/e2e_test/batch/basic/join.slt.part
index 811969707dcb4..1f7daba0f46c5 100644
--- a/e2e_test/batch/basic/join.slt.part
+++ b/e2e_test/batch/basic/join.slt.part
@@ -85,4 +85,4 @@ statement ok
drop index i;
statement ok
-drop table t;
\ No newline at end of file
+drop table t;
diff --git a/e2e_test/batch/basic/logical_view.slt.part b/e2e_test/batch/basic/logical_view.slt.part
index 3f8f8824def62..8b96458574e42 100644
--- a/e2e_test/batch/basic/logical_view.slt.part
+++ b/e2e_test/batch/basic/logical_view.slt.part
@@ -9,7 +9,7 @@ SELECT * FROM v1;
----
1
-statement error
+statement error
CREATE VIEW v2(a, b) AS SELECT 1;
statement ok
@@ -36,23 +36,26 @@ SELECT * FROM v3;
514 0 NULL NULL
# v3 depends on t. We can't drop t.
-statement error
+
+statement error
DROP TABLE t;
# Currently it is allowed to drop a view even it is depended by another view.
+
statement ok
DROP VIEW v2;
-statement error
+statement error
SELECT * from v3;
statement ok
DROP VIEW v3;
-statement error
+statement error
SELECT * FROM v3;
# We can drop t and v2 now
+
statement ok
DROP TABLE t;
diff --git a/e2e_test/batch/basic/lookup_join.slt.part b/e2e_test/batch/basic/lookup_join.slt.part
index 78a1a4c498138..ec6ad556ed1fa 100644
--- a/e2e_test/batch/basic/lookup_join.slt.part
+++ b/e2e_test/batch/basic/lookup_join.slt.part
@@ -104,7 +104,6 @@ NULL NULL 1 flow
NULL NULL 1 gww
NULL NULL 1 hello
-
statement ok
drop materialized view t3;
diff --git a/e2e_test/batch/basic/query.slt.part b/e2e_test/batch/basic/query.slt.part
index d4632968803bf..5bc8365228d08 100644
--- a/e2e_test/batch/basic/query.slt.part
+++ b/e2e_test/batch/basic/query.slt.part
@@ -33,5 +33,5 @@ select count(*) from t3;
statement ok
drop table t3;
-statement error
+statement error
select * from t2 \gdesc
diff --git a/e2e_test/batch/basic/range.slt.part b/e2e_test/batch/basic/range.slt.part
index 3aca7a815f012..d34ebc45266e2 100644
--- a/e2e_test/batch/basic/range.slt.part
+++ b/e2e_test/batch/basic/range.slt.part
@@ -76,7 +76,7 @@ SELECT * FROM range('10'::INT,'2'::INT,'-2'::INT);
6
4
-statement error
+statement error
SELECT * FROM range('2'::INT,'10'::INT,'0'::INT);
query I
diff --git a/e2e_test/batch/basic/range_scan.slt.part b/e2e_test/batch/basic/range_scan.slt.part
index efad2f9571fa7..47a00b3ed1bed 100644
--- a/e2e_test/batch/basic/range_scan.slt.part
+++ b/e2e_test/batch/basic/range_scan.slt.part
@@ -7,7 +7,7 @@ CREATE TABLE orders (
user_id BIGINT,
date INTEGER);
-statement ok
+statement ok
CREATE MATERIALIZED VIEW orders_count_by_user AS
SELECT user_id, date, count(*) AS orders_count
FROM orders
@@ -68,6 +68,7 @@ SELECT * FROM orders_count_by_user WHERE user_id = 42 AND date in (2222, 3333);
42 3333 1
# Test same value in `in` is deduplicated.
+
query III rowsort
SELECT * FROM orders_count_by_user WHERE user_id = 42 AND date in (2222, 2222, 3333);
----
@@ -104,7 +105,6 @@ SELECT * FROM orders_count_by_user WHERE user_id = 9999 and date is null;
----
9999 NULL 1
-
query III rowsort
SELECT * FROM orders_count_by_user WHERE user_id = 9999 or user_id is null order by user_id, date, orders_count;
----
@@ -126,7 +126,7 @@ SELECT * FROM orders_count_by_user WHERE user_id = 9999 or (user_id = 9999 and d
statement ok
drop materialized view orders_count_by_user;
-statement ok
+statement ok
CREATE MATERIALIZED VIEW orders_count_by_user AS
SELECT user_id, date, count(*) AS orders_count
FROM orders
@@ -136,11 +136,11 @@ CREATE MATERIALIZED VIEW orders_count_by_user AS
query III rowsort
SELECT * FROM orders_count_by_user WHERE user_id < 100;
----
-42 1111 1
-42 3333 1
-43 1111 1
-43 2222 1
-42 2222 2
+42 1111 1
+42 2222 2
+42 3333 1
+43 1111 1
+43 2222 1
query III
SELECT * FROM orders_count_by_user WHERE orders_count=2 AND user_id < 100;
@@ -151,4 +151,4 @@ statement ok
drop materialized view orders_count_by_user;
statement ok
-drop table orders;
\ No newline at end of file
+drop table orders;
diff --git a/e2e_test/batch/basic/scientific_number.slt.part b/e2e_test/batch/basic/scientific_number.slt.part
index 99883f9b811e4..468cc4d41d926 100644
--- a/e2e_test/batch/basic/scientific_number.slt.part
+++ b/e2e_test/batch/basic/scientific_number.slt.part
@@ -17,13 +17,13 @@ select * from t;
----
1000000 -1000000 1e-06 -1e-06
-statement error
+statement error
INSERT INTO t values (1e1000, 1, 1, 1)
-statement error
+statement error
INSERT INTO t values (1e-1000, 1, 1, 1)
-statement error
+statement error
INSERT INTO t values (-1e1000, 1, 1, 1)
statement ok
diff --git a/e2e_test/batch/basic/string_concat_op.slt.part b/e2e_test/batch/basic/string_concat_op.slt.part
index de9d9e1d0895f..02a981919a30d 100644
--- a/e2e_test/batch/basic/string_concat_op.slt.part
+++ b/e2e_test/batch/basic/string_concat_op.slt.part
@@ -21,5 +21,5 @@ select '1' || 1.01 || 'A' || true;
----
11.01Atrue
-statement error
+statement error
select 2 || 3;
diff --git a/e2e_test/batch/basic/subquery.slt.part b/e2e_test/batch/basic/subquery.slt.part
index 7e0ec2220c9b5..4b68d377475a2 100644
--- a/e2e_test/batch/basic/subquery.slt.part
+++ b/e2e_test/batch/basic/subquery.slt.part
@@ -71,7 +71,6 @@ NULL 1
NULL 2
NULL NULL
-
statement ok
drop table t1;
@@ -81,7 +80,6 @@ drop table t2;
statement ok
drop table t3;
-
statement ok
create table t1 (x int, y int)
@@ -119,4 +117,4 @@ select a, (select count(*) from t1 where t1.a <> t.b) from t1 as t order by 1;
NULL 0
statement ok
-drop table t1;
\ No newline at end of file
+drop table t1;
diff --git a/e2e_test/batch/basic/time_window.slt.part b/e2e_test/batch/basic/time_window.slt.part
index 42ab5ff499938..16d5e7c1de016 100644
--- a/e2e_test/batch/basic/time_window.slt.part
+++ b/e2e_test/batch/basic/time_window.slt.part
@@ -104,16 +104,16 @@ group by window_start, uid order by window_start, uid;
3 8 2022-01-01 10:45:00
3 8 2022-01-01 11:00:00
-statement error
+statement error
select * from hop(t1, created_at, interval '0', interval '1');
-statement error
+statement error
select * from hop(t1, created_at, interval '1', interval '-1');
-statement error
+statement error
select * from hop(t1, created_at, interval '-1', interval '1');
-statement error
+statement error
select * from hop(t1, created_at, interval '-1', interval '-1');
statement ok
diff --git a/e2e_test/batch/basic/time_window_utc.slt.part b/e2e_test/batch/basic/time_window_utc.slt.part
index da90438ecf2ce..b5cfabec005df 100644
--- a/e2e_test/batch/basic/time_window_utc.slt.part
+++ b/e2e_test/batch/basic/time_window_utc.slt.part
@@ -104,16 +104,16 @@ group by window_start, uid order by window_start, uid;
3 8 2022-01-01 10:45:00+00:00
3 8 2022-01-01 11:00:00+00:00
-statement error
+statement error
select * from hop(t1, created_at, interval '0', interval '1');
-statement error
+statement error
select * from hop(t1, created_at, interval '1', interval '-1');
-statement error
+statement error
select * from hop(t1, created_at, interval '-1', interval '1');
-statement error
+statement error
select * from hop(t1, created_at, interval '-1', interval '-1');
statement ok
diff --git a/e2e_test/batch/basic/union.slt.part b/e2e_test/batch/basic/union.slt.part
index 3e0e7d012c4d6..3befa56eee620 100644
--- a/e2e_test/batch/basic/union.slt.part
+++ b/e2e_test/batch/basic/union.slt.part
@@ -30,10 +30,9 @@ select * from t1 union all select * from t2 order by v1
1 2
1 2
-statement error
+statement error
select * from t1 union all select * from t2 order by v1 + 1
-
query I
select 1 union select 1
----
@@ -45,7 +44,7 @@ select 1 union all select 1
1
1
-statement error
+statement error
select 1 as a union all select 1 as b order by a + 1;
query I
@@ -58,4 +57,4 @@ statement ok
drop table t1;
statement ok
-drop table t2;
\ No newline at end of file
+drop table t2;
diff --git a/e2e_test/batch/basic/unnest.slt.part b/e2e_test/batch/basic/unnest.slt.part
index 2acf5e5359f96..de11d5959500a 100644
--- a/e2e_test/batch/basic/unnest.slt.part
+++ b/e2e_test/batch/basic/unnest.slt.part
@@ -16,6 +16,7 @@ SELECT * FROM unnest(Array[Array[1,3,4,5],Array[2,3]]);
3
# table functions used with usual expressions (those in Project): padding
+
query II
SELECT unnest(Array[1,2,3]), 1;
----
@@ -24,6 +25,7 @@ SELECT unnest(Array[1,2,3]), 1;
3 1
# multiple table functions: padding with NULL
+
query I
select unnest(array[1,2,3]), unnest(array['a', 'b']);
----
@@ -65,13 +67,13 @@ insert into t values (Array[1,2]), (Array[1,NULL]), (Array[3,4,5]), (NULL);
query I rowsort
select unnest(x), x from t;
----
-NULL {1,NULL}
-1 {1,NULL}
-1 {1,2}
-2 {1,2}
-3 {3,4,5}
-4 {3,4,5}
-5 {3,4,5}
+1 {1,2}
+1 {1,NULL}
+2 {1,2}
+3 {3,4,5}
+4 {3,4,5}
+5 {3,4,5}
+NULL {1,NULL}
statement ok
-drop table t;
\ No newline at end of file
+drop table t;
diff --git a/e2e_test/batch/distribution_mode.slt b/e2e_test/batch/distribution_mode.slt
index a953df3843acc..1166469fe124a 100644
--- a/e2e_test/batch/distribution_mode.slt
+++ b/e2e_test/batch/distribution_mode.slt
@@ -4,12 +4,18 @@ SET RW_IMPLICIT_FLUSH TO true;
statement ok
SET QUERY_MODE TO distributed;
-
include ./basic/*.slt.part
+
include ./duckdb/all.slt.part
+
include ./order/*.slt.part
+
include ./join/*.slt.part
+
include ./join/*/*.slt.part
+
include ./aggregate/*.slt.part
+
include ./types/*.slt.part
+
include ./functions/*.slt.part
diff --git a/e2e_test/batch/duckdb/all.slt.part b/e2e_test/batch/duckdb/all.slt.part
index 9508557f9fe0c..1d439e3225294 100644
--- a/e2e_test/batch/duckdb/all.slt.part
+++ b/e2e_test/batch/duckdb/all.slt.part
@@ -1,7 +1,13 @@
include ./aggregate/*.slt.part
+
include ./aggregate/*/*.slt.part
+
include ./join/*.slt.part
+
include ./join/*/*.slt.part
+
include ./conjunction/*.slt.part
+
include ./conjunction/*/*.slt.part
-include ./limit/*.slt.part
\ No newline at end of file
+
+include ./limit/*.slt.part
diff --git a/e2e_test/batch/duckdb/join/cross_product/test_cross_product.slt.part b/e2e_test/batch/duckdb/join/cross_product/test_cross_product.slt.part
index df0b31175caf7..358dab6c0a985 100644
--- a/e2e_test/batch/duckdb/join/cross_product/test_cross_product.slt.part
+++ b/e2e_test/batch/duckdb/join/cross_product/test_cross_product.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test cross products
@@ -21,6 +21,7 @@ SELECT * FROM test t1, test t2 ORDER BY 1, 2, 3, 4;
12 2 12 2
# big cross product
+
query I
SELECT COUNT(*) FROM test t1, generate_series(1, 2000, 1) t2;
----
diff --git a/e2e_test/batch/duckdb/join/cross_product/test_cross_product_parallelism.test_slow.slt.part b/e2e_test/batch/duckdb/join/cross_product/test_cross_product_parallelism.test_slow.slt.part
index 414000d430ddc..f556442780b3f 100644
--- a/e2e_test/batch/duckdb/join/cross_product/test_cross_product_parallelism.test_slow.slt.part
+++ b/e2e_test/batch/duckdb/join/cross_product/test_cross_product_parallelism.test_slow.slt.part
@@ -1,6 +1,7 @@
# name: test/sql/join/cross_product/test_cross_product_parallelism.test_slow
# description: Test cross product with parallelism
# group: [cross_product]
+
statement ok
SET RW_IMPLICIT_FLUSH TO true;
@@ -8,6 +9,7 @@ statement ok
CREATE VIEW integers AS SELECT * FROM range(0, 500, 1) tbl(i)
# test if order remains the same
+
query I
SELECT count(*) FROM integers i1, integers i2
----
diff --git a/e2e_test/batch/duckdb/join/full_outer/full_outer_join_cache.slt.part b/e2e_test/batch/duckdb/join/full_outer/full_outer_join_cache.slt.part
index 12a62a05b33ff..1367f72e62986 100644
--- a/e2e_test/batch/duckdb/join/full_outer/full_outer_join_cache.slt.part
+++ b/e2e_test/batch/duckdb/join/full_outer/full_outer_join_cache.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test full outer join with caches
@@ -13,6 +13,7 @@ statement ok
INSERT INTO smalltable VALUES (1);
# values 1...1024 10x
+
statement ok
CREATE TABLE bigtable(a int);
diff --git a/e2e_test/batch/duckdb/join/full_outer/full_outer_join_union.slt.part b/e2e_test/batch/duckdb/join/full_outer/full_outer_join_union.slt.part
index 0e022e23e29b1..3d5aa1ff7abe6 100644
--- a/e2e_test/batch/duckdb/join/full_outer/full_outer_join_union.slt.part
+++ b/e2e_test/batch/duckdb/join/full_outer/full_outer_join_union.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test FULL OUTER JOIN with unions
diff --git a/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join.slt.part b/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join.slt.part
index 0592feeffbdf0..b6234b53a3ba9 100644
--- a/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join.slt.part
+++ b/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test FULL OUTER JOIN
@@ -19,6 +19,7 @@ statement ok
INSERT INTO integers2 VALUES (1, 10), (2, 20);
# equality join
+
query IIII
SELECT i, j, k, l FROM integers FULL OUTER JOIN integers2 ON integers.i=integers2.k ORDER BY i;
----
@@ -27,6 +28,7 @@ SELECT i, j, k, l FROM integers FULL OUTER JOIN integers2 ON integers.i=integers
NULL NULL 2 20
# equality join with additional non-equality predicate
+
query IIII
SELECT i, j, k, l FROM integers FULL OUTER JOIN integers2 ON integers.i=integers2.k AND integers.j > integers2.l ORDER BY 1, 2, 3, 4;
----
@@ -36,6 +38,7 @@ NULL NULL 1 10
NULL NULL 2 20
# equality join with varchar values
+
query IIIT
SELECT i, j, k, l FROM integers FULL OUTER JOIN (SELECT k, l::VARCHAR AS l FROM integers2) integers2 ON integers.i=integers2.k ORDER BY 1, 2, 3, 4;
----
@@ -44,6 +47,7 @@ SELECT i, j, k, l FROM integers FULL OUTER JOIN (SELECT k, l::VARCHAR AS l FROM
NULL NULL 2 20
# empty RHS
+
query IIII
SELECT i, j, k, l FROM integers FULL OUTER JOIN (SELECT * FROM integers2 WHERE 1=0) integers2 ON integers.i=integers2.k ORDER BY 1, 2, 3, 4;
----
diff --git a/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join_complex.slt.part b/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join_complex.slt.part
index 5c06b75c408d5..639bc18e1fde2 100644
--- a/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join_complex.slt.part
+++ b/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join_complex.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test complex FULL OUTER JOIN
@@ -25,6 +25,7 @@ SELECT i, j, k, l FROM integers FULL OUTER JOIN integers2 ON integers.i+integers
NULL NULL 1 10
# empty RHS
+
query IIII
SELECT i, j, k, l FROM integers FULL OUTER JOIN (SELECT * FROM integers2 WHERE 1=0) integers2 ON integers.i+integers2.k+9<>integers.j+integers2.l ORDER BY 1, 2, 3, 4;
----
diff --git a/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join_inequality.slt.part b/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join_inequality.slt.part
index a44d06f9d2682..cf33cc0ecb68b 100644
--- a/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join_inequality.slt.part
+++ b/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join_inequality.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test inequality FULL OUTER JOIN
@@ -25,6 +25,7 @@ SELECT i, j, k, l FROM integers FULL OUTER JOIN integers2 ON integers.i<>integer
NULL NULL 1 10
# empty RHS
+
query IIII
SELECT i, j, k, l FROM integers FULL OUTER JOIN (SELECT * FROM integers2 WHERE 1=0) integers2 ON integers.i<>integers2.k ORDER BY 1, 2, 3, 4;
----
diff --git a/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join_many_matches.slt.part b/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join_many_matches.slt.part
index e10d53962f41e..2c71e6483b20b 100644
--- a/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join_many_matches.slt.part
+++ b/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join_many_matches.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test FULL OUTER JOIN with many matches
@@ -19,6 +19,7 @@ statement ok
INSERT INTO integers2 SELECT a k, 2 l FROM generate_series(2000, 3999, 1) t1(a);
# equality join
+
query I
SELECT COUNT(*) FROM integers FULL OUTER JOIN integers2 ON integers.i=integers2.k
----
@@ -30,6 +31,7 @@ SELECT COUNT(*) FROM integers FULL OUTER JOIN integers2 ON integers.i=integers2.
# 16000 values hashing to 8b9eab043624ff470b00a981c1d588d9
# range join
+
query I
SELECT COUNT(*) FROM integers FULL OUTER JOIN integers2 ON integers.j>integers2.l
----
@@ -41,6 +43,7 @@ SELECT COUNT(*) FROM integers FULL OUTER JOIN integers2 ON integers.j>integers2.
# 16000 values hashing to 8b9eab043624ff470b00a981c1d588d9
# inequality join
+
query I
SELECT COUNT(*) FROM integers FULL OUTER JOIN integers2 ON integers.j+1<>integers2.l;
----
@@ -52,6 +55,7 @@ SELECT COUNT(*) FROM integers FULL OUTER JOIN integers2 ON integers.j+1<>integer
# 16000 values hashing to 8b9eab043624ff470b00a981c1d588d9
# complex join condition
+
query I
SELECT COUNT(*) FROM integers FULL OUTER JOIN integers2 ON integers.j+integers2.l<>3;
----
@@ -66,4 +70,4 @@ statement ok
DROP TABLE integers;
statement ok
-DROP TABLE integers2;
\ No newline at end of file
+DROP TABLE integers2;
diff --git a/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join_range.slt.part b/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join_range.slt.part
index 84a2383c7190c..7ed1af3c91926 100644
--- a/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join_range.slt.part
+++ b/e2e_test/batch/duckdb/join/full_outer/test_full_outer_join_range.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test range FULL OUTER JOIN
@@ -19,6 +19,7 @@ statement ok
INSERT INTO integers2 VALUES (1, 10);
# range join
+
query IIII
SELECT i, j, k, l FROM integers FULL OUTER JOIN integers2 ON integers.i<integers2.k ORDER BY 1, 2, 3, 4;
----
@@ -26,6 +27,7 @@ SELECT i, j, k, l FROM integers FULL OUTER JOIN integers2 ON integers.i<integers
NULL NULL 1 10
# empty RHS
+
query IIII
SELECT i, j, k, l FROM integers FULL OUTER JOIN (SELECT * FROM integers2 WHERE 1=0) integers2 ON integers.i<integers2.k ORDER BY 1, 2, 3, 4;
----
diff --git a/e2e_test/batch/duckdb/join/iejoin/test_iejoin_east_west.test.slt.part b/e2e_test/batch/duckdb/join/iejoin/test_iejoin_east_west.test.slt.part
index 440504ac94609..9e8863e3f3bdf 100644
--- a/e2e_test/batch/duckdb/join/iejoin/test_iejoin_east_west.test.slt.part
+++ b/e2e_test/batch/duckdb/join/iejoin/test_iejoin_east_west.test.slt.part
@@ -6,6 +6,7 @@ statement ok
SET RW_IMPLICIT_FLUSH TO true;
# create tables
+
statement ok
CREATE VIEW east AS SELECT * FROM (VALUES
('r1', 100, 140, 12, 2),
@@ -22,6 +23,7 @@ CREATE VIEW west AS SELECT * FROM (VALUES
) west(rid, t_id, time, cost, cores)
# Qs
+
query II
SELECT s1.rid, s2.rid
FROM west s1, west s2
@@ -36,6 +38,7 @@ s2 s4
s4 s3
# Qp
+
query II
SELECT s1.rid, s2.rid
FROM west s1, west s2
@@ -46,6 +49,7 @@ s1 s3
s4 s3
# Qt
+
query II
SELECT east.rid, west.rid
FROM east, west
@@ -55,6 +59,7 @@ ORDER BY 1, 2
r2 s2
# Test string comparisons
+
query II
WITH weststr AS (
SELECT rid, time::VARCHAR AS time, cost::VARCHAR as cost
diff --git a/e2e_test/batch/duckdb/join/iejoin/test_iejoin_sort_tasks.test_slow.slt.part b/e2e_test/batch/duckdb/join/iejoin/test_iejoin_sort_tasks.test_slow.slt.part
index 5fd915c3af473..32dcc534097b9 100644
--- a/e2e_test/batch/duckdb/join/iejoin/test_iejoin_sort_tasks.test_slow.slt.part
+++ b/e2e_test/batch/duckdb/join/iejoin/test_iejoin_sort_tasks.test_slow.slt.part
@@ -9,8 +9,8 @@
statement ok
SET RW_IMPLICIT_FLUSH TO true;
-
# Stream tables with minimal overlap that require merge tasks on both sides.
+
query II
SELECT lhs.begin, rhs.begin
FROM (
diff --git a/e2e_test/batch/duckdb/join/inner/equality_join_limits.slt.part b/e2e_test/batch/duckdb/join/inner/equality_join_limits.slt.part
index dd9e16354731b..62890bc7cfb15 100644
--- a/e2e_test/batch/duckdb/join/inner/equality_join_limits.slt.part
+++ b/e2e_test/batch/duckdb/join/inner/equality_join_limits.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test equality joins on numeric limits
@@ -7,6 +7,7 @@ statement ok
SET RW_IMPLICIT_FLUSH TO true;
# SMALLINT limits
+
statement ok
CREATE TABLE t(t_k0 SMALLINT);
@@ -32,6 +33,7 @@ statement ok
DROP TABLE u;
# INTEGER limits
+
statement ok
CREATE TABLE t(t_k0 INTEGER);
@@ -57,6 +59,7 @@ statement ok
DROP TABLE u;
# BIGINT limits
+
statement ok
CREATE TABLE t(t_k0 BIGINT);
@@ -80,4 +83,3 @@ DROP TABLE t;
statement ok
DROP TABLE u;
-
diff --git a/e2e_test/batch/duckdb/join/inner/join_cross_product.slt.part b/e2e_test/batch/duckdb/join/inner/join_cross_product.slt.part
index aad6fee0a4678..43b5fc8965671 100644
--- a/e2e_test/batch/duckdb/join/inner/join_cross_product.slt.part
+++ b/e2e_test/batch/duckdb/join/inner/join_cross_product.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test column binding in cross product of multiple joins
@@ -36,7 +36,7 @@ select * from t1 join t2 on (i=j), t3 join t4 on (k=l) order by 1, 2, 3, 4;
1 1 2 2
1 1 3 3
-statement error
+statement error
select * from t1 join t2 on (i=j), t3 join t4 on (i+k=j+l);
statement ok
@@ -50,4 +50,3 @@ drop table t3;
statement ok
drop table t4;
-
diff --git a/e2e_test/batch/duckdb/join/inner/test_eq_ineq_join.slt.part b/e2e_test/batch/duckdb/join/inner/test_eq_ineq_join.slt.part
index 1ec997db36a33..acd3f4c21096d 100644
--- a/e2e_test/batch/duckdb/join/inner/test_eq_ineq_join.slt.part
+++ b/e2e_test/batch/duckdb/join/inner/test_eq_ineq_join.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Equality + inequality joins
@@ -53,6 +53,7 @@ statement ok
DROP TABLE test2;
# Equality + inequality anti and semi joins
+
statement ok
CREATE TABLE test (a INTEGER, b INTEGER, str VARCHAR);
@@ -100,6 +101,7 @@ statement ok
DROP TABLE test2;
# Equality + inequality anti and semi joins with selection vector
+
statement ok
CREATE TABLE test (a INTEGER, b INTEGER, str VARCHAR);
diff --git a/e2e_test/batch/duckdb/join/inner/test_join.slt.part b/e2e_test/batch/duckdb/join/inner/test_join.slt.part
index 23b262832cbfa..5d52cc4891b17 100644
--- a/e2e_test/batch/duckdb/join/inner/test_join.slt.part
+++ b/e2e_test/batch/duckdb/join/inner/test_join.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test basic joins of tables
@@ -19,6 +19,7 @@ statement ok
INSERT INTO test2 VALUES (1, 10), (1, 20), (2, 30);
# simple cross product + join condition
+
query III
SELECT a, test.b, c FROM test, test2 WHERE test.b = test2.b ORDER BY c;
----
@@ -27,10 +28,12 @@ SELECT a, test.b, c FROM test, test2 WHERE test.b = test2.b ORDER BY c;
12 2 30
# ambiguous reference to column
-statement error
+
+statement error
SELECT b FROM test, test2 WHERE test.b > test2.b;
# simple cross product + multiple join conditions
+
query III
SELECT a, test.b, c FROM test, test2 WHERE test.b=test2.b AND test.a-1=test2.c;
----
@@ -46,6 +49,7 @@ SELECT a, test.b, c FROM test, test2 WHERE test.b=test2.b AND test.a-1=test2.c;
# 12 12 30
# explicit join
+
query III
SELECT a, test.b, c FROM test INNER JOIN test2 ON test.b = test2.b ORDER BY c;
----
@@ -54,6 +58,7 @@ SELECT a, test.b, c FROM test INNER JOIN test2 ON test.b = test2.b ORDER BY c;
12 2 30
# explicit join with condition the wrong way around
+
query III
SELECT a, test.b, c FROM test INNER JOIN test2 ON test2.b = test.b ORDER BY c;
----
@@ -62,12 +67,14 @@ SELECT a, test.b, c FROM test INNER JOIN test2 ON test2.b = test.b ORDER BY c;
12 2 30
# explicit join with additional condition that is no left-right comparison
+
query III
SELECT a, test.b, c FROM test INNER JOIN test2 ON test2.b = test.b and test.b = 2;
----
12 2 30
# explicit join with additional condition that is constant
+
query III
SELECT a, test.b, c FROM test INNER JOIN test2 ON test2.b = test.b and 2 = 2 ORDER BY c;
----
@@ -76,6 +83,7 @@ SELECT a, test.b, c FROM test INNER JOIN test2 ON test2.b = test.b and 2 = 2 ORD
12 2 30
# explicit join with only condition that is no left-right comparison
+
query III
SELECT a, test.b, c FROM test INNER JOIN test2 ON test.b = 2 ORDER BY c;
----
@@ -84,17 +92,20 @@ SELECT a, test.b, c FROM test INNER JOIN test2 ON test.b = 2 ORDER BY c;
12 2 30
# explicit join with only condition that is constant
+
query III
SELECT a, test.b, c FROM test INNER JOIN test2 ON NULL = 2;
----
# equality join where both lhs and rhs keys are projected
+
query II
SELECT * FROM (VALUES (1)) tbl(i) JOIN (VALUES (1)) tbl2(j) ON (i=j);
----
1 1
# equality join where both lhs and rhs keys are projected with filter
+
query II
SELECT * FROM (VALUES (1), (2)) tbl(i) JOIN (VALUES (1), (2)) tbl2(j) ON (i=j) WHERE i+j=2;
----
diff --git a/e2e_test/batch/duckdb/join/inner/test_lt_join.slt.part b/e2e_test/batch/duckdb/join/inner/test_lt_join.slt.part
index dd98b17b2d523..a957d1f48e326 100644
--- a/e2e_test/batch/duckdb/join/inner/test_lt_join.slt.part
+++ b/e2e_test/batch/duckdb/join/inner/test_lt_join.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test less than join
diff --git a/e2e_test/batch/duckdb/join/inner/test_range_join.slt.part b/e2e_test/batch/duckdb/join/inner/test_range_join.slt.part
index 2b76d1d32d272..e394739a2d5cc 100644
--- a/e2e_test/batch/duckdb/join/inner/test_range_join.slt.part
+++ b/e2e_test/batch/duckdb/join/inner/test_range_join.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test range joins
@@ -7,6 +7,7 @@ statement ok
SET RW_IMPLICIT_FLUSH TO true;
# create tables
+
statement ok
CREATE TABLE test (a INTEGER, b INTEGER);
@@ -33,26 +34,31 @@ SELECT test.b, test2.b FROM test, test2 WHERE test.b <= test2.b ORDER BY 1,2;
2 2
# range join on multiple predicates
+
query IIII
SELECT test.a, test.b, test2.b, test2.c FROM test, test2 WHERE test.a>test2.c AND test.b <= test2.b;
----
11 1 1 10
# introduce some NULL values
+
statement ok
INSERT INTO test VALUES (11, NULL), (NULL, 1);
# join result should be unchanged
+
query IIII
SELECT test.a, test.b, test2.b, test2.c FROM test, test2 WHERE test.a>test2.c AND test.b <= test2.b;
----
11 1 1 10
# on the RHS as well
+
statement ok
INSERT INTO test2 VALUES (1, NULL), (NULL, 10);
# join result should be unchanged
+
query IIII
SELECT test.a, test.b, test2.b, test2.c FROM test, test2 WHERE test.a>test2.c AND test.b <= test2.b;
----
diff --git a/e2e_test/batch/duckdb/join/inner/test_unequal_join.slt.part b/e2e_test/batch/duckdb/join/inner/test_unequal_join.slt.part
index 90d22e97387a4..454b8988c2a4f 100644
--- a/e2e_test/batch/duckdb/join/inner/test_unequal_join.slt.part
+++ b/e2e_test/batch/duckdb/join/inner/test_unequal_join.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test inequality join
@@ -7,6 +7,7 @@ statement ok
SET RW_IMPLICIT_FLUSH TO true;
# create tables
+
statement ok
CREATE TABLE test (a INTEGER, b INTEGER);
@@ -20,6 +21,7 @@ statement ok
INSERT INTO test2 VALUES (1, 10), (1, 20), (2, 30);
# inequality join
+
query II
SELECT test.b, test2.b FROM test, test2 WHERE test.b <> test2.b ORDER BY test.b, test2.b;
----
@@ -31,6 +33,7 @@ SELECT test.b, test2.b FROM test, test2 WHERE test.b <> test2.b ORDER BY test.b,
3 2
# inequality join with filter
+
query II
SELECT test.b, test2.b FROM test, test2 WHERE test.b <> test2.b AND test.b <> 1 AND test2.b <> 2 ORDER BY test.b, test2.b;
----
@@ -46,6 +49,7 @@ statement ok
INSERT INTO test2 VALUES (NULL, NULL);
# inequality join with NULL values
+
query II
SELECT test.b, test2.b FROM test, test2 WHERE test.b <> test2.b ORDER BY test.b, test2.b;
----
@@ -57,6 +61,7 @@ SELECT test.b, test2.b FROM test, test2 WHERE test.b <> test2.b ORDER BY test.b,
3 2
# inequality join with filter and NULL values
+
query II
SELECT test.b, test2.b FROM test, test2 WHERE test.b <> test2.b AND test.b <> 1 AND test2.b <> 2 ORDER BY test.b, test2.b;
----
diff --git a/e2e_test/batch/duckdb/join/inner/test_unequal_join_duplicates.slt.part b/e2e_test/batch/duckdb/join/inner/test_unequal_join_duplicates.slt.part
index aab92359e82bd..f45c6bfd05779 100644
--- a/e2e_test/batch/duckdb/join/inner/test_unequal_join_duplicates.slt.part
+++ b/e2e_test/batch/duckdb/join/inner/test_unequal_join_duplicates.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test inequality join with > STANDARD_VECTOR_SIZE duplicates
@@ -25,4 +25,3 @@ SET RW_IMPLICIT_FLUSH TO true;
# SELECT COUNT(*) FROM test INNER JOIN test2 ON test.b<>test2.b
# ----
# 10240
-
diff --git a/e2e_test/batch/duckdb/join/inner/test_using_chain.slt.part b/e2e_test/batch/duckdb/join/inner/test_using_chain.slt.part
index fa92757de8d69..d7d76ff459349 100644
--- a/e2e_test/batch/duckdb/join/inner/test_using_chain.slt.part
+++ b/e2e_test/batch/duckdb/join/inner/test_using_chain.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test chaining USING joins
@@ -33,11 +33,13 @@ INSERT INTO t3 VALUES (3, 4);
# 1 2 3 4
# column does not exist on left side of join
-statement error
+
+statement error
SELECT * FROM t1 JOIN t2 USING (c);
# column does not exist on right side of join
-statement error
+
+statement error
SELECT * FROM t1 JOIN t2 USING (a);
statement ok
diff --git a/e2e_test/batch/duckdb/join/inner/test_using_join.slt.part b/e2e_test/batch/duckdb/join/inner/test_using_join.slt.part
index 74efbbd6ad0f0..44d011d4cfdf0 100644
--- a/e2e_test/batch/duckdb/join/inner/test_using_join.slt.part
+++ b/e2e_test/batch/duckdb/join/inner/test_using_join.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test USING joins
@@ -7,6 +7,7 @@ statement ok
SET RW_IMPLICIT_FLUSH TO true;
# create tables
+
statement ok
CREATE TABLE t1 (a INTEGER, b INTEGER, c INTEGER);
@@ -57,16 +58,16 @@ INSERT INTO t2 VALUES (1,2,3), (2,2,4), (1,3,4);
# 2
# 2
-statement error
+statement error
SELECT t2.a, t2.b, t2.c FROM t1 JOIN t2 USING(a+b);
-statement error
+statement error
SELECT t2.a, t2.b, t2.c FROM t1 JOIN t2 USING("");
-statement error
+statement error
SELECT t2.a, t2.b, t2.c FROM t1 JOIN t2 USING(d);
-statement error
+statement error
SELECT t2.a, t2.b, t2.c FROM t1 JOIN t2 USING(t1.a);
# query IIII
@@ -77,11 +78,13 @@ SELECT t2.a, t2.b, t2.c FROM t1 JOIN t2 USING(t1.a);
# CONTROVERSIAL:
# we do not allow this because it is ambiguous: "b" can be bind to both "t1.b" or "t2.b" and this would give
# different results SQLite allows this, PostgreSQL does not
-statement error
+
+statement error
SELECT * FROM t1 JOIN t2 USING(a) JOIN t2 t2b USING (b);
# this is the same, but now with a duplicate potential binding on the RHS
-statement error
+
+statement error
select * from (values (1)) tbl(i) join ((values (1)) tbl2(i) join (values (1)) tbl3(i) on tbl2.i=tbl3.i) using (i);
# a chain with the same column name is allowed though!
diff --git a/e2e_test/batch/duckdb/join/inner/test_varchar_join.slt.part b/e2e_test/batch/duckdb/join/inner/test_varchar_join.slt.part
index afee7fed0ef09..7d1bec5b05b84 100644
--- a/e2e_test/batch/duckdb/join/inner/test_varchar_join.slt.part
+++ b/e2e_test/batch/duckdb/join/inner/test_varchar_join.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test joins on VARCHAR columns with NULL values
@@ -25,4 +25,3 @@ select * from (select 42 as a, 'asdf' as b) sq2, (select 42 as a, NULL::varchar
query ITIT
select * from (select 42 as a, 'asdf' as b) sq2, (select 42 as a, NULL::varchar as b) sq1 where sq1.a=sq2.a and sq1.b <> sq2.b;
----
-
diff --git a/e2e_test/batch/duckdb/join/left_outer/left_join_dropping_rows.slt.part b/e2e_test/batch/duckdb/join/left_outer/left_join_dropping_rows.slt.part
index 136aae66c4b2f..c38fac182ed08 100644
--- a/e2e_test/batch/duckdb/join/left_outer/left_join_dropping_rows.slt.part
+++ b/e2e_test/batch/duckdb/join/left_outer/left_join_dropping_rows.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Left Outer join dropping rows
diff --git a/e2e_test/batch/duckdb/join/left_outer/test_left_outer.slt.part b/e2e_test/batch/duckdb/join/left_outer/test_left_outer.slt.part
index c345b45cbddba..c4fb8661d7a5c 100644
--- a/e2e_test/batch/duckdb/join/left_outer/test_left_outer.slt.part
+++ b/e2e_test/batch/duckdb/join/left_outer/test_left_outer.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test LEFT OUTER JOIN
@@ -27,6 +27,7 @@ SELECT * FROM integers LEFT OUTER JOIN integers2 ON integers.i=integers2.k ORDER
# RIGHT OUTER JOIN is just LEFT OUTER JOIN but with arguments reversed
# with one caveat: SELECT * will project the columns of the LHS first!
+
query IIII
SELECT * FROM integers2 RIGHT OUTER JOIN integers ON integers.i=integers2.k ORDER BY i;
----
@@ -36,6 +37,7 @@ NULL NULL 3 4
# WHERE happens AFTER the join, thus [where k IS NOT NULL] filters out any tuples with generated NULL values from
# the LEFT OUTER JOIN. Because of this, this join is equivalent to an inner join.
+
query IIII
SELECT * FROM integers LEFT OUTER JOIN integers2 ON integers.i=integers2.k WHERE k IS NOT NULL ORDER BY i;
----
@@ -44,6 +46,7 @@ SELECT * FROM integers LEFT OUTER JOIN integers2 ON integers.i=integers2.k WHER
# however, any conditions in the ON clause happen BEFORE the join, thus the condition [integers2.k IS NOT NULL]
# happens BEFORE any NULL values are generated by the LEFT OUTER JOIN.
+
query IIII
SELECT * FROM integers LEFT OUTER JOIN integers2 ON integers.i=integers2.k AND integers2.k IS NOT NULL ORDER BY i;
----
@@ -52,6 +55,7 @@ SELECT * FROM integers LEFT OUTER JOIN integers2 ON integers.i=integers2.k AND i
3 4 NULL NULL
# filter on LHS
+
query IIII
SELECT * FROM integers LEFT OUTER JOIN integers2 ON i=1 ORDER BY i, k;
----
@@ -61,6 +65,7 @@ SELECT * FROM integers LEFT OUTER JOIN integers2 ON i=1 ORDER BY i, k;
3 4 NULL NULL
# left outer join on "true" is cross product
+
query IIII
SELECT * FROM integers LEFT OUTER JOIN integers2 ON 1=1 ORDER BY i, k;
----
@@ -72,6 +77,7 @@ SELECT * FROM integers LEFT OUTER JOIN integers2 ON 1=1 ORDER BY i, k;
3 4 2 20
# except if RHS is empty; then it is the LHS with NULl values appended
+
query IIII
SELECT * FROM integers LEFT OUTER JOIN (SELECT * FROM integers2 WHERE 1<>1) tbl2 ON 1=2 ORDER BY i;
----
@@ -80,6 +86,7 @@ SELECT * FROM integers LEFT OUTER JOIN (SELECT * FROM integers2 WHERE 1<>1) tbl2
3 4 NULL NULL
# left outer join on "false" gives the LHS with the RHS filled as NULL
+
query IIII
SELECT * FROM integers LEFT OUTER JOIN integers2 ON 1=2 ORDER BY i;
----
@@ -88,6 +95,7 @@ SELECT * FROM integers LEFT OUTER JOIN integers2 ON 1=2 ORDER BY i;
3 4 NULL NULL
# left outer join on NULL constant gives the LHS with the RHS filled as null as well
+
query IIII
SELECT * FROM integers LEFT OUTER JOIN integers2 ON NULL<>NULL ORDER BY i;
----
@@ -96,6 +104,7 @@ SELECT * FROM integers LEFT OUTER JOIN integers2 ON NULL<>NULL ORDER BY i;
3 4 NULL NULL
# left outer join on condition that only concerns the LHS
+
query IIII
SELECT * FROM integers LEFT OUTER JOIN integers2 ON i=1 ORDER BY i, k;
----
@@ -105,6 +114,7 @@ SELECT * FROM integers LEFT OUTER JOIN integers2 ON i=1 ORDER BY i, k;
3 4 NULL NULL
# left outer join on condition that only concerns the RHS
+
query IIII
SELECT * FROM integers LEFT OUTER JOIN integers2 ON l=20 ORDER BY i, k;
----
@@ -123,6 +133,7 @@ SELECT * FROM integers LEFT OUTER JOIN integers2 ON l>0 ORDER BY i, k;
3 4 2 20
# left outer join on condition that affects both, but is not a simple comparison
+
query IIII
SELECT * FROM integers LEFT OUTER JOIN integers2 ON i=1 OR l=20 ORDER BY i, k;
----
@@ -154,6 +165,7 @@ SELECT * FROM integers LEFT OUTER JOIN integers2 ON i+l>12 ORDER BY i, k;
3 4 2 20
# range join
+
query IIII
SELECT * FROM integers LEFT OUTER JOIN integers2 ON integers.i<integers2.k WHERE integers.i <= 2 ORDER BY i;
----
@@ -161,6 +173,7 @@ SELECT * FROM integers LEFT OUTER JOIN integers2 ON integers.i<integers2.k WHERE
2 3 NULL NULL
# multiple conditions
+
query IIII
SELECT * FROM integers LEFT OUTER JOIN integers2 ON integers.i<integers2.k AND integers.i<integers2.l WHERE integers.i <= 2 ORDER BY i;
----
diff --git a/e2e_test/batch/duckdb/join/right_outer/test_right_outer.slt.part b/e2e_test/batch/duckdb/join/right_outer/test_right_outer.slt.part
index 101108f130051..01ba2bc3fb025 100644
--- a/e2e_test/batch/duckdb/join/right_outer/test_right_outer.slt.part
+++ b/e2e_test/batch/duckdb/join/right_outer/test_right_outer.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test RIGHT OUTER JOIN
diff --git a/e2e_test/batch/duckdb/join/test_complex_join_expr.slt.part b/e2e_test/batch/duckdb/join/test_complex_join_expr.slt.part
index 87ca41d269f59..63e8edbefb0c0 100644
--- a/e2e_test/batch/duckdb/join/test_complex_join_expr.slt.part
+++ b/e2e_test/batch/duckdb/join/test_complex_join_expr.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test joins with comparisons involving both sides of the join
@@ -7,6 +7,7 @@ statement ok
SET RW_IMPLICIT_FLUSH TO true;
# create tables
+
statement ok
CREATE TABLE test (a INTEGER, b INTEGER);
diff --git a/e2e_test/batch/duckdb/join/test_join_on_aggregates.slt.part b/e2e_test/batch/duckdb/join/test_join_on_aggregates.slt.part
index d18655e0da15d..93810205afe0c 100644
--- a/e2e_test/batch/duckdb/join/test_join_on_aggregates.slt.part
+++ b/e2e_test/batch/duckdb/join/test_join_on_aggregates.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test join on aggregates
@@ -13,12 +13,14 @@ statement ok
INSERT INTO integers VALUES (1), (2), (3), (NULL);
# test join on ungrouped aggregates
+
query RR
SELECT * FROM (SELECT SUM(i) AS x FROM integers) a, (SELECT SUM(i) AS x FROM integers) b WHERE a.x=b.x;
----
6 6
# Test join on aggregates with GROUP BY
+
statement ok
CREATE TABLE groups(i INTEGER, j INTEGER);
diff --git a/e2e_test/batch/duckdb/join/test_nested_inequality.slt.part b/e2e_test/batch/duckdb/join/test_nested_inequality.slt.part
index 1fb429c7e265c..761ef268e7479 100644
--- a/e2e_test/batch/duckdb/join/test_nested_inequality.slt.part
+++ b/e2e_test/batch/duckdb/join/test_nested_inequality.slt.part
@@ -182,6 +182,5 @@ order by lhs.i, rhs.i;
9 1 (9,10,11) 5 1 (5,6,7)
9 1 (9,10,11) 7 1 (7,8,9)
-
statement ok
DROP VIEW list_int;
diff --git a/e2e_test/batch/duckdb/join/test_string_payload.slt.part b/e2e_test/batch/duckdb/join/test_string_payload.slt.part
index f2015e2e55ba6..605cd0e782043 100644
--- a/e2e_test/batch/duckdb/join/test_string_payload.slt.part
+++ b/e2e_test/batch/duckdb/join/test_string_payload.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test join with non-inlined string payload
diff --git a/e2e_test/batch/duckdb/limit/test_parallel_limit.slt.part b/e2e_test/batch/duckdb/limit/test_parallel_limit.slt.part
index d126c1ee7b3d9..0fbb8a8988926 100644
--- a/e2e_test/batch/duckdb/limit/test_parallel_limit.slt.part
+++ b/e2e_test/batch/duckdb/limit/test_parallel_limit.slt.part
@@ -56,6 +56,7 @@ SELECT * FROM integers WHERE i>4978 order by i LIMIT 5
4983
# large offset
+
query I
SELECT * FROM integers WHERE i>4978 order by i LIMIT 5 OFFSET 100;
----
@@ -75,6 +76,7 @@ SELECT * FROM integers WHERE i>4978 order by i LIMIT 5 OFFSET 1000;
5983
# IN-clause (semi join)
+
query I
SELECT * FROM integers WHERE i IN (SELECT * FROM other_table) order by i
----
@@ -87,4 +89,4 @@ statement ok
DROP TABLE integers
statement ok
-DROP table other_table
\ No newline at end of file
+DROP table other_table
diff --git a/e2e_test/batch/duckdb/limit/test_parallel_limit_nulls.slt.part b/e2e_test/batch/duckdb/limit/test_parallel_limit_nulls.slt.part
index 346c3a5702c20..84f88cc16e574 100644
--- a/e2e_test/batch/duckdb/limit/test_parallel_limit_nulls.slt.part
+++ b/e2e_test/batch/duckdb/limit/test_parallel_limit_nulls.slt.part
@@ -57,6 +57,7 @@ NULL
4983
# large offset
+
query I
SELECT k FROM integers WHERE i>4978 order by i LIMIT 5 OFFSET 100;
----
@@ -76,6 +77,7 @@ NULL
5983
# IN-clause (semi join)
+
query I rowsort
SELECT k FROM integers WHERE i IN (SELECT * FROM other_table)
----
diff --git a/e2e_test/batch/duckdb/limit/test_parallel_limit_strings.slt.part b/e2e_test/batch/duckdb/limit/test_parallel_limit_strings.slt.part
index bf8bcae3e4a4f..8dbc5be5e53f3 100644
--- a/e2e_test/batch/duckdb/limit/test_parallel_limit_strings.slt.part
+++ b/e2e_test/batch/duckdb/limit/test_parallel_limit_strings.slt.part
@@ -56,6 +56,7 @@ quackquack4982
quackquack4983
# large offset
+
query I
SELECT k FROM integers WHERE i>4978 order by i LIMIT 5 OFFSET 100;
----
@@ -75,6 +76,7 @@ quackquack5982
quackquack5983
# IN-clause (semi join)
+
query I rowsort
SELECT k FROM integers WHERE i IN (SELECT * FROM other_table)
----
@@ -87,4 +89,4 @@ statement ok
DROP TABLE integers
statement ok
-DROP table other_table
\ No newline at end of file
+DROP table other_table
diff --git a/e2e_test/batch/duckdb/limit/test_preserve_insertion_order.slt.part b/e2e_test/batch/duckdb/limit/test_preserve_insertion_order.slt.part
index d1f4e07fb538d..3f0c832c2fc7e 100644
--- a/e2e_test/batch/duckdb/limit/test_preserve_insertion_order.slt.part
+++ b/e2e_test/batch/duckdb/limit/test_preserve_insertion_order.slt.part
@@ -13,7 +13,6 @@ CREATE TABLE integers (i int);
statement ok
INSERT INTO integers SELECT 1 FROM generate_series(0, 9999, 1) tbl(i);
-
query III
SELECT MIN(i), MAX(i), COUNT(*) FROM integers
----
@@ -50,6 +49,7 @@ SELECT MIN(i), MAX(i), COUNT(*) FROM integers2
# we need a rowsort here because we don't preserve insertion order
# note that rowsort is a string-based sort
+
query I rowsort
SELECT * FROM integers2 WHERE i IN (337, 1957, 4425, 9943)
----
@@ -60,6 +60,7 @@ SELECT * FROM integers2 WHERE i IN (337, 1957, 4425, 9943)
# when insertion order is disabled, there is no guarantee on which tuples come out of a LIMIT clause
# for the LIMIT test select everything
+
query I rowsort
SELECT * FROM integers2 WHERE i IN (337, 1957, 4425, 9943) LIMIT 4
----
diff --git a/e2e_test/batch/functions/array_concat.slt.part b/e2e_test/batch/functions/array_concat.slt.part
index 6a8363deb8b06..cedf4baf5602f 100644
--- a/e2e_test/batch/functions/array_concat.slt.part
+++ b/e2e_test/batch/functions/array_concat.slt.part
@@ -817,7 +817,3 @@ query T
select array_cat(array[array[2.1]], array[array[1]]);
----
{{2.1},{1}}
-
-
-
-
diff --git a/e2e_test/batch/functions/at_time_zone.slt.part b/e2e_test/batch/functions/at_time_zone.slt.part
index 74bea68d1b5fa..9bd68e3d95dcd 100644
--- a/e2e_test/batch/functions/at_time_zone.slt.part
+++ b/e2e_test/batch/functions/at_time_zone.slt.part
@@ -1,20 +1,24 @@
# zone-independent instant -> local naive time
+
query T
select '2022-01-01 00:00:00Z'::timestamp with time zone AT TIME ZONE 'US/Pacific';
----
2021-12-31 16:00:00
# local naive time -> zone-independent instant
+
query T
select '2021-12-31 16:00:00'::timestamp AT TIME ZONE 'us/pacific';
----
2022-01-01 00:00:00+00:00
# Unlike PostgreSQL, we do not support invalid local time during daylight saving forward yet.
-statement error
+
+statement error
select '2022-03-13 02:00:00'::timestamp AT TIME ZONE 'us/pacific';
# Like PostgreSQL, ambiguous local time during daylight saving backward are interpreted as after the transition.
+
query T
select '2022-11-06 01:00:00'::timestamp AT TIME ZONE 'us/pacific';
----
diff --git a/e2e_test/batch/functions/concat.slt.part b/e2e_test/batch/functions/concat.slt.part
index 390ae63dee8c5..5cea00ffd7a1f 100644
--- a/e2e_test/batch/functions/concat.slt.part
+++ b/e2e_test/batch/functions/concat.slt.part
@@ -31,7 +31,7 @@ select concat(1, 1.01, 'A', true, NULL);
----
11.01At
-statement error
+statement error
select concat();
statement ok
diff --git a/e2e_test/batch/functions/date_trunc.slt.part b/e2e_test/batch/functions/date_trunc.slt.part
index 6a0fd855d8871..038fd9a41a2dd 100644
--- a/e2e_test/batch/functions/date_trunc.slt.part
+++ b/e2e_test/batch/functions/date_trunc.slt.part
@@ -23,63 +23,66 @@ INSERT INTO t VALUES
query T rowsort
SELECT field, date_trunc(field, TIMESTAMP '2202-02-16 20:38:40.123456') FROM t;
----
-microseconds 2202-02-16 20:38:40.123456
-milliseconds 2202-02-16 20:38:40.123
-second 2202-02-16 20:38:40
-minute 2202-02-16 20:38:00
-hour 2202-02-16 20:00:00
-day 2202-02-16 00:00:00
-week 2202-02-15 00:00:00
-month 2202-02-01 00:00:00
-quarter 2202-01-01 00:00:00
-year 2202-01-01 00:00:00
-decade 2200-01-01 00:00:00
-century 2201-01-01 00:00:00
-millennium 2001-01-01 00:00:00
+century 2201-01-01 00:00:00
+day 2202-02-16 00:00:00
+decade 2200-01-01 00:00:00
+hour 2202-02-16 20:00:00
+microseconds 2202-02-16 20:38:40.123456
+millennium 2001-01-01 00:00:00
+milliseconds 2202-02-16 20:38:40.123
+minute 2202-02-16 20:38:00
+month 2202-02-01 00:00:00
+quarter 2202-01-01 00:00:00
+second 2202-02-16 20:38:40
+week 2202-02-15 00:00:00
+year 2202-01-01 00:00:00
# invalid field
-statement error
+
+statement error
SELECT date_trunc('s', TIMESTAMP '2202-02-16 20:38:40.123456');
query T rowsort
SELECT field, date_trunc(field, TIMESTAMP WITH TIME ZONE '2202-02-16 20:38:40.123456Z', 'Australia/Sydney') FROM t;
----
-microseconds 2202-02-16 20:38:40.123456+00:00
-milliseconds 2202-02-16 20:38:40.123+00:00
-second 2202-02-16 20:38:40+00:00
-minute 2202-02-16 20:38:00+00:00
-hour 2202-02-16 20:00:00+00:00
-day 2202-02-16 13:00:00+00:00
-week 2202-02-14 13:00:00+00:00
-month 2202-01-31 13:00:00+00:00
-quarter 2201-12-31 13:00:00+00:00
-year 2201-12-31 13:00:00+00:00
-decade 2199-12-31 13:00:00+00:00
-century 2200-12-31 13:00:00+00:00
-millennium 2000-12-31 13:00:00+00:00
+century 2200-12-31 13:00:00+00:00
+day 2202-02-16 13:00:00+00:00
+decade 2199-12-31 13:00:00+00:00
+hour 2202-02-16 20:00:00+00:00
+microseconds 2202-02-16 20:38:40.123456+00:00
+millennium 2000-12-31 13:00:00+00:00
+milliseconds 2202-02-16 20:38:40.123+00:00
+minute 2202-02-16 20:38:00+00:00
+month 2202-01-31 13:00:00+00:00
+quarter 2201-12-31 13:00:00+00:00
+second 2202-02-16 20:38:40+00:00
+week 2202-02-14 13:00:00+00:00
+year 2201-12-31 13:00:00+00:00
statement ok
DELETE FROM t WHERE field = 'week';
# TODO: support us precision in interval
+
query T rowsort
SELECT field, date_trunc(field, INTERVAL '2333 year 4 months 5 days 02:47:33.123') FROM t;
----
-microseconds 2333 years 4 mons 5 days 02:47:33.123
-milliseconds 2333 years 4 mons 5 days 02:47:33.123
-second 2333 years 4 mons 5 days 02:47:33
-minute 2333 years 4 mons 5 days 02:47:00
-hour 2333 years 4 mons 5 days 02:00:00
-day 2333 years 4 mons 5 days
-month 2333 years 4 mons
-quarter 2333 years 3 mons
-year 2333 years
-decade 2330 years
-century 2300 years
-millennium 2000 years
+century 2300 years
+day 2333 years 4 mons 5 days
+decade 2330 years
+hour 2333 years 4 mons 5 days 02:00:00
+microseconds 2333 years 4 mons 5 days 02:47:33.123
+millennium 2000 years
+milliseconds 2333 years 4 mons 5 days 02:47:33.123
+minute 2333 years 4 mons 5 days 02:47:00
+month 2333 years 4 mons
+quarter 2333 years 3 mons
+second 2333 years 4 mons 5 days 02:47:33
+year 2333 years
# truncate 'week' is not supported for interval
-statement error
+
+statement error
SELECT date_trunc('week', INTERVAL '3 days 02:47:33');
statement ok
diff --git a/e2e_test/batch/functions/internal.slt.part b/e2e_test/batch/functions/internal.slt.part
index fdb240c4c371a..2624782b82cd9 100644
--- a/e2e_test/batch/functions/internal.slt.part
+++ b/e2e_test/batch/functions/internal.slt.part
@@ -4,14 +4,20 @@ SET RW_IMPLICIT_FLUSH TO true;
statement ok
create table t(v1 varchar, v2 int, v3 int)
-statement ok
+query
select rw_vnode(_row_id) as vnode, _row_id from t;
+----
statement ok
insert into t values ('aaa', 1, 1), ('bbb', 0, 2), ('ccc', 0, 5), ('ddd', 1, 4)
-statement ok
+query ??
select rw_vnode(_row_id) as vnode, _row_id from t;
+----
+61 222848002044723201
+222 222848002044723202
+64 222848002044723203
+163 222848002044723200
statement ok
drop table t
diff --git a/e2e_test/batch/functions/overlay.slt.part b/e2e_test/batch/functions/overlay.slt.part
index 0f521061b9492..6af90cb9d99a6 100644
--- a/e2e_test/batch/functions/overlay.slt.part
+++ b/e2e_test/batch/functions/overlay.slt.part
@@ -18,14 +18,14 @@ SELECT OVERLAY('babosa' PLACING 'ubb' FROM 2 FOR 4);
----
bubba
-statement error
+statement error
SELECT OVERLAY('abc', 'xyz');
-statement error
+statement error
SELECT OVERLAY('abc' PLACING 'xyz');
-statement error
+statement error
SELECT OVERLAY('abc' PLACING 'xyz' FOR 2)
-statement error
+statement error
SELECT OVERLAY('abc' PLACING 'xyz' FOR 2 FROM 1)
diff --git a/e2e_test/batch/join/inner/test_null_safe_equal_join.slt.part b/e2e_test/batch/join/inner/test_null_safe_equal_join.slt.part
index cee1c71083a6a..05336fb8f3693 100644
--- a/e2e_test/batch/join/inner/test_null_safe_equal_join.slt.part
+++ b/e2e_test/batch/join/inner/test_null_safe_equal_join.slt.part
@@ -30,7 +30,6 @@ NULL 1 NULL 1
NULL 2 NULL 2
NULL NULL NULL NULL
-
query IIII
select * from t1 join t2 on (t1.x is not distinct from t2.x) and (t1.y = t2.y) order by t1.x, t1.y;
----
@@ -69,4 +68,4 @@ statement ok
drop materialized view v;
statement ok
-drop table t1;
\ No newline at end of file
+drop table t1;
diff --git a/e2e_test/batch/order/limit_full_outer_join.slt.part b/e2e_test/batch/order/limit_full_outer_join.slt.part
index e2a2cb7d326ba..e683ef3f31417 100644
--- a/e2e_test/batch/order/limit_full_outer_join.slt.part
+++ b/e2e_test/batch/order/limit_full_outer_join.slt.part
@@ -29,4 +29,3 @@ drop table integers;
statement ok
drop table integers2;
-
diff --git a/e2e_test/batch/order/negative_offset.slt.part b/e2e_test/batch/order/negative_offset.slt.part
index 88c5c47ed15a2..e3b38b7c957ba 100644
--- a/e2e_test/batch/order/negative_offset.slt.part
+++ b/e2e_test/batch/order/negative_offset.slt.part
@@ -6,13 +6,13 @@
statement ok
SET RW_IMPLICIT_FLUSH TO true;
-statement error
+statement error
SELECT * FROM generate_series(0,10,1) LIMIT 3 OFFSET -1;
-statement error
+statement error
SELECT * FROM generate_series(0,10,1) LIMIT -3;
-statement error
+statement error
SELECT * FROM generate_series(0,10,1) LIMIT -1%;
statement ok
@@ -21,10 +21,10 @@ CREATE TABLE integers(k int);
statement ok
INSERT INTO integers VALUES (-1);
-statement error
+statement error
SELECT * FROM generate_series(0,10,1) LIMIT (SELECT k FROM integers);
-statement error
+statement error
SELECT * FROM generate_series(0,10,1) LIMIT 1 OFFSET (SELECT k FROM integers);
statement ok
diff --git a/e2e_test/batch/order/test_limit.slt.part b/e2e_test/batch/order/test_limit.slt.part
index 61c8880e0d801..29805e777cfb3 100644
--- a/e2e_test/batch/order/test_limit.slt.part
+++ b/e2e_test/batch/order/test_limit.slt.part
@@ -13,6 +13,7 @@ statement ok
INSERT INTO test VALUES (11, 22), (12, 21), (13, 22);
# constant limit
+
query I
SELECT a FROM test order by 1 LIMIT 1;
----
@@ -32,22 +33,27 @@ SELECT a FROM test order by 1 LIMIT 1;
# 11
# LIMIT with non-scalar should fail
-statement error
+
+statement error
SELECT a FROM test LIMIT a;
# LIMIT with non-scalar operation should also fail
-statement error
+
+statement error
SELECT a FROM test LIMIT a+1;
# aggregate in limit
-statement error
+
+statement error
SELECT a FROM test LIMIT SUM(42);
# window function in limit
-statement error
+
+statement error
SELECT a FROM test LIMIT row_number() OVER ();
# LIMIT Bug #321 Crazy Result
+
statement ok
CREATE TABLE test2 (a VARCHAR);
@@ -60,10 +66,12 @@ SELECT * FROM test2 LIMIT 3;
Hello World
# can only limit by integers
-statement error
+
+statement error
select 1 limit date '1992-01-01';
# Test limits with no constants
+
statement ok
CREATE TABLE integers(i INTEGER);
@@ -91,7 +99,6 @@ INSERT INTO integers VALUES (1), (2), (3), (4), (5);
# 3
# 4
-
# non-foldable expression in limit
# statement ok
# SELECT * FROM integers LIMIT RANDOM();
@@ -172,13 +179,14 @@ INSERT INTO integers VALUES (1), (2), (3), (4), (5);
# 4
# 5
-
# Subqueries that return negative values
-statement error
+
+statement error
SELECT * FROM integers as int LIMIT (SELECT -1);
#Subqueries that return strings that can't be converted to integers
-statement error
+
+statement error
SELECT * FROM integers as int LIMIT (SELECT 'ab');
statement ok
diff --git a/e2e_test/batch/order/test_order_by.slt.part b/e2e_test/batch/order/test_order_by.slt.part
index ccd548395df61..39715a3a03ecf 100644
--- a/e2e_test/batch/order/test_order_by.slt.part
+++ b/e2e_test/batch/order/test_order_by.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test ORDER BY keyword
@@ -13,6 +13,7 @@ statement ok
INSERT INTO test VALUES (11, 22), (12, 21), (13, 22);
# simple ORDER BY
+
query I
SELECT b FROM test ORDER BY a DESC;
----
@@ -35,6 +36,7 @@ SELECT a, b FROM test ORDER BY a DESC;
11 22
# ORDER BY on multiple columns
+
query II
SELECT a, b FROM test ORDER BY b, a;
----
@@ -43,6 +45,7 @@ SELECT a, b FROM test ORDER BY b, a;
13 22
# ORDER BY using select indices
+
query II
SELECT a, b FROM test ORDER BY 2, 1;
----
@@ -65,18 +68,21 @@ SELECT a, b FROM test ORDER BY b, a DESC;
11 22
# TOP N queries
+
query II
SELECT a, b FROM test ORDER BY b, a DESC LIMIT 1;
----
12 21
# Offset
+
query II
SELECT a, b FROM test ORDER BY b, a DESC LIMIT 1 OFFSET 1;
----
13 22
# Offset without limit
+
query II
SELECT a, b FROM test ORDER BY b, a DESC OFFSET 1;
----
@@ -111,6 +117,7 @@ SELECT b, a FROM test WHERE a < 13 ORDER BY b DESC;
# https://github.com/risingwavelabs/risingwave/issues/4681
# query IR
# SELECT b % 2 AS f, SUM(a) FROM test GROUP BY f ORDER BY b % 2;
+
query II
SELECT b % 2, SUM(a) FROM test GROUP BY b % 2 ORDER BY b % 2;
----
@@ -118,6 +125,7 @@ SELECT b % 2, SUM(a) FROM test GROUP BY b % 2 ORDER BY b % 2;
1 12
# order by expression that is not in SELECT
+
query II
SELECT b % 2 AS f, a FROM test ORDER BY b % 2, a;
----
@@ -128,6 +136,7 @@ SELECT b % 2 AS f, a FROM test ORDER BY b % 2, a;
# ORDER BY alias
# query IR
# SELECT b % 2 AS f, SUM(a) FROM test GROUP BY f ORDER BY f;
+
query II
SELECT b % 2 AS f, SUM(a) FROM test GROUP BY b % 2 ORDER BY f;
----
@@ -136,6 +145,7 @@ SELECT b % 2 AS f, SUM(a) FROM test GROUP BY b % 2 ORDER BY f;
# query IR
# SELECT b % 2 AS f, SUM(a) FROM test GROUP BY f ORDER BY 1;
+
query II
SELECT b % 2 AS f, SUM(a) FROM test GROUP BY b % 2 ORDER BY 1;
----
diff --git a/e2e_test/batch/order/test_order_by_exceptions.slt.part b/e2e_test/batch/order/test_order_by_exceptions.slt.part
index 5a11ed54f8a1b..8d19d089064d7 100644
--- a/e2e_test/batch/order/test_order_by_exceptions.slt.part
+++ b/e2e_test/batch/order/test_order_by_exceptions.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test ORDER BY exceptions
@@ -13,11 +13,13 @@ statement ok
INSERT INTO test VALUES (11, 22), (12, 21), (13, 22);
# ORDER BY index out of range
-statement error
+
+statement error
SELECT a FROM test ORDER BY 2;
# ORDER BY constant works, but does nothing
# CONTROVERSIAL: works in SQLite but not in Postgres
+
query I
SELECT a FROM test ORDER BY 'hello', a;
----
@@ -61,4 +63,3 @@ SELECT a FROM test ORDER BY 'hello', a;
statement ok
drop table test;
-
diff --git a/e2e_test/batch/order/test_order_by_materialized_view.slt.part b/e2e_test/batch/order/test_order_by_materialized_view.slt.part
index 29e7c5465da93..0ee83d00fb056 100644
--- a/e2e_test/batch/order/test_order_by_materialized_view.slt.part
+++ b/e2e_test/batch/order/test_order_by_materialized_view.slt.part
@@ -18,6 +18,7 @@ statement ok
CREATE MATERIALIZED VIEW mv1 AS SELECT * FROM t ORDER BY v ASC;
# No additional BatchSort used with materialized view sorted ascending
+
query I
SELECT * FROM mv1 ORDER BY v ASC;
----
@@ -73,6 +74,7 @@ SELECT * FROM mv1 ORDER BY v ASC;
50
# Additional BatchSort used with materialized view sorted ascending
+
query II
SELECT * FROM mv1 ORDER BY v DESC;
----
@@ -134,6 +136,7 @@ statement ok
CREATE MATERIALIZED VIEW mv2 AS SELECT * FROM t ORDER BY v DESC;
# No additional BatchSort used with materialized view sorted descending
+
query I
SELECT * FROM mv2 ORDER BY v DESC;
----
@@ -189,6 +192,7 @@ SELECT * FROM mv2 ORDER BY v DESC;
1
# Additional BatchSort used with materialized view sorted descending
+
query II
SELECT * FROM mv2 ORDER BY v ASC;
----
diff --git a/e2e_test/batch/order/test_order_same_value.slt.part b/e2e_test/batch/order/test_order_same_value.slt.part
index d1e6cc4117367..3f48445253043 100644
--- a/e2e_test/batch/order/test_order_same_value.slt.part
+++ b/e2e_test/batch/order/test_order_same_value.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test ordering the same value several times
@@ -13,42 +13,52 @@ statement ok
INSERT INTO integers VALUES (0), (0), (0), (0);
# 4 -> 8
+
statement ok
INSERT INTO integers SELECT * FROM integers;
# 8 -> 16
+
statement ok
INSERT INTO integers SELECT * FROM integers;
# 16 -> 32
+
statement ok
INSERT INTO integers SELECT * FROM integers;
# 32 -> 64
+
statement ok
INSERT INTO integers SELECT * FROM integers;
# 64 -> 128
+
statement ok
INSERT INTO integers SELECT * FROM integers;
# 128 -> 256
+
statement ok
INSERT INTO integers SELECT * FROM integers;
# 256 -> 512
+
statement ok
INSERT INTO integers SELECT * FROM integers;
# 512 -> 1024
+
statement ok
INSERT INTO integers SELECT * FROM integers;
# 1024 -> 2048
+
statement ok
INSERT INTO integers SELECT * FROM integers;
# order by
+
query I
SELECT SUM(i) FROM (SELECT i FROM integers ORDER BY i) t1;
----
diff --git a/e2e_test/batch/order/test_order_variable_size_payload.slt.part b/e2e_test/batch/order/test_order_variable_size_payload.slt.part
index c57b19a9b8a3e..6781f00be17db 100644
--- a/e2e_test/batch/order/test_order_variable_size_payload.slt.part
+++ b/e2e_test/batch/order/test_order_variable_size_payload.slt.part
@@ -1,5 +1,5 @@
# Copied from https://github.com/duckdb/duckdb (MIT licensed).
-# Copyright 2018-2022 Stichting DuckDB Foundation
+# Copyright 2018-2022 Stichting DuckDB Foundation
# description: Test ORDER BY keyword (variable size sorting/payload columns)
@@ -11,6 +11,7 @@ SET RW_IMPLICIT_FLUSH TO true;
# select range % 2 i, string_agg('thisstringis200characterslong..........................................................................................................................................................................') s from range(5000) group by i order by i
# weird one from SQLancer
+
statement ok
create table t0 (c0 varchar);
@@ -29,6 +30,7 @@ NULL
a
# strings longer than the 12 character prefix
+
statement ok
CREATE TABLE test0 (job VARCHAR, name VARCHAR);
@@ -98,6 +100,7 @@ NULL
# 10000
# multiple columns
+
statement ok
CREATE TABLE test4 (i INT, j INT);
@@ -214,6 +217,7 @@ insert into test5 values (3, 'ababa'), (1, 'babab'), (NULL, 'abbab'), (2, NULL);
# 3 {'i': 3, 's': [[a, a, a]]}
# sorting by a mix of variable size and constant size columns
+
statement ok
CREATE TABLE test6 (i1 INT, s1 VARCHAR, i2 int, s2 VARCHAR);
@@ -357,6 +361,7 @@ SELECT s1, s2, i1, i2 FROM test6 ORDER BY i2 DESC, s1, s2, i1;
0reallylongstring2 1reallylongstring8 6 3
# snippet from tpch q16
+
statement ok
create table test7 (p_brand VARCHAR, p_type VARCHAR, p_size INT, supplier_cnt BIGINT);
@@ -377,6 +382,7 @@ Brand#11 ECONOMY BURNISHED NICKEL 14 4
Brand#11 ECONOMY BURNISHED NICKEL 49 4
# simple nested lists (no structs)
+
statement ok
create table test8 (i int, s varchar);
@@ -407,7 +413,6 @@ insert into test8 values (3, 'aba'), (1, 'ccbcc'), (NULL, 'dbdbd'), (2, NULL);
# 2 [NULL]
# 3 [[a, a]]
-
# lists longer than STANDARD_VECTOR_SIZE
# need single thread since order within list is otherwise undefined
# statement ok
diff --git a/e2e_test/batch/top_n/group_top_n.slt b/e2e_test/batch/top_n/group_top_n.slt
index e8086374ef825..4b3d0a2e893ea 100644
--- a/e2e_test/batch/top_n/group_top_n.slt
+++ b/e2e_test/batch/top_n/group_top_n.slt
@@ -47,12 +47,12 @@ select x, y from (
)
where rank <= 4;
----
-1 1
-2 1
-3 1
-1 2
-2 2
-3 2
+1 1
+1 2
+2 1
+2 2
+3 1
+3 2
query II rowsort
select x, y from (
diff --git a/e2e_test/batch/tpch.slt b/e2e_test/batch/tpch.slt
index b952fa798e96f..3cd9795210623 100644
--- a/e2e_test/batch/tpch.slt
+++ b/e2e_test/batch/tpch.slt
@@ -7,40 +7,67 @@ SET QUERY_MODE TO distributed;
include ../tpch/create_tables.slt.part
include ../tpch/insert_customer.slt.part
+
include ../tpch/insert_lineitem.slt.part
+
include ../tpch/insert_nation.slt.part
+
include ../tpch/insert_orders.slt.part
+
include ../tpch/insert_part.slt.part
+
include ../tpch/insert_partsupp.slt.part
+
include ../tpch/insert_supplier.slt.part
+
include ../tpch/insert_region.slt.part
include ./tpch/q1.slt.part
+
include ./tpch/q2.slt.part
+
include ./tpch/q3.slt.part
+
include ./tpch/q4.slt.part
+
include ./tpch/q5.slt.part
+
include ./tpch/q6.slt.part
+
include ./tpch/q7.slt.part
+
include ./tpch/q8.slt.part
+
include ./tpch/q9.slt.part
+
include ./tpch/q10.slt.part
+
include ./tpch/q11.slt.part
+
include ./tpch/q12.slt.part
+
include ./tpch/q13.slt.part
+
include ./tpch/q14.slt.part
+
include ./tpch/q15.slt.part
+
include ./tpch/q16.slt.part
+
include ./tpch/q17.slt.part
+
include ./tpch/q18.slt.part
+
include ./tpch/q19.slt.part
+
include ./tpch/q20.slt.part
+
include ./tpch/q21.slt.part
+
include ./tpch/q22.slt.part
include ../tpch/drop_tables.slt.part
-
statement ok
SET RW_IMPLICIT_FLUSH TO true;
@@ -53,35 +80,63 @@ SET QUERY_MODE TO distributed;
include ../tpch/create_tables.slt.part
include ../tpch/insert_customer.slt.part
+
include ../tpch/insert_lineitem.slt.part
+
include ../tpch/insert_nation.slt.part
+
include ../tpch/insert_orders.slt.part
+
include ../tpch/insert_part.slt.part
+
include ../tpch/insert_partsupp.slt.part
+
include ../tpch/insert_supplier.slt.part
+
include ../tpch/insert_region.slt.part
include ./tpch/q1.slt.part
+
include ./tpch/q2.slt.part
+
include ./tpch/q3.slt.part
+
include ./tpch/q4.slt.part
+
include ./tpch/q5.slt.part
+
include ./tpch/q6.slt.part
+
include ./tpch/q7.slt.part
+
include ./tpch/q8.slt.part
+
include ./tpch/q9.slt.part
+
include ./tpch/q10.slt.part
+
include ./tpch/q11.slt.part
+
include ./tpch/q12.slt.part
+
include ./tpch/q13.slt.part
+
include ./tpch/q14.slt.part
+
include ./tpch/q15.slt.part
+
include ./tpch/q16.slt.part
+
include ./tpch/q17.slt.part
+
include ./tpch/q18.slt.part
+
include ./tpch/q19.slt.part
+
include ./tpch/q20.slt.part
+
include ./tpch/q21.slt.part
+
include ./tpch/q22.slt.part
include ../tpch/drop_tables.slt.part
diff --git a/e2e_test/batch/tpch/q1.slt.part b/e2e_test/batch/tpch/q1.slt.part
index fad148b75012f..e715f43e30fbc 100644
--- a/e2e_test/batch/tpch/q1.slt.part
+++ b/e2e_test/batch/tpch/q1.slt.part
@@ -1,5 +1,6 @@
# tpchq1
# Todo: The precision is different from PostgresSql
+
query TTRRRRRRRI
select
l_returnflag,
diff --git a/e2e_test/batch/tpch/q10.slt.part b/e2e_test/batch/tpch/q10.slt.part
index 17b8f7d922bb9..518ab80186535 100644
--- a/e2e_test/batch/tpch/q10.slt.part
+++ b/e2e_test/batch/tpch/q10.slt.part
@@ -52,7 +52,3 @@ LIMIT 20;
130 Customer#000000130 31499.41 5073.6 INDONESIA RKPx2OfZy0Vn 8wGWZ7F2EAvmMORl1k8iH 19-190-993-9281 ix slowly. express packages along the furiously ironic requests integrate daringly deposits. fur
88 Customer#000000088 29032.13 8031.4 MOZAMBIQUE wtkjBN9eyrFuENSMmMFlJ3e7jE5KXcg 26-516-273-2566 s are quickly above the quickly ironic instructions; even requests about the carefully final deposi
85 Customer#000000085 27823.56 3386.6 ETHIOPIA siRerlDwiolhYR 8FgksoezycLj 15-745-585-8219 ronic ideas use above the slowly pendin
-
-
-
-
diff --git a/e2e_test/batch/tpch/q11.slt.part b/e2e_test/batch/tpch/q11.slt.part
index 1c1b26084d04d..8d50ac62d40bb 100644
--- a/e2e_test/batch/tpch/q11.slt.part
+++ b/e2e_test/batch/tpch/q11.slt.part
@@ -97,6 +97,3 @@ order by
164 179298.7
192 120406.1
150 106928.1
-
-
-
diff --git a/e2e_test/batch/tpch/q12.slt.part b/e2e_test/batch/tpch/q12.slt.part
index 5356344b5444c..87ab607c2030a 100644
--- a/e2e_test/batch/tpch/q12.slt.part
+++ b/e2e_test/batch/tpch/q12.slt.part
@@ -30,4 +30,3 @@ order by
----
FOB 4 3
SHIP 5 10
-
diff --git a/e2e_test/batch/tpch/q15.slt.part b/e2e_test/batch/tpch/q15.slt.part
index b8d8e5817294d..b934f639733ce 100644
--- a/e2e_test/batch/tpch/q15.slt.part
+++ b/e2e_test/batch/tpch/q15.slt.part
@@ -41,4 +41,4 @@ where
order by
s_suppkey;
----
-4 Supplier#000000004 Bk7ah4CK8SYQTepEmvMkkgMwg 25-843-787-7479 901304.1506
\ No newline at end of file
+4 Supplier#000000004 Bk7ah4CK8SYQTepEmvMkkgMwg 25-843-787-7479 901304.1506
diff --git a/e2e_test/batch/tpch/q22.slt.part b/e2e_test/batch/tpch/q22.slt.part
index 4881b68ecd7c7..bc06f66a24a5f 100644
--- a/e2e_test/batch/tpch/q22.slt.part
+++ b/e2e_test/batch/tpch/q22.slt.part
@@ -38,4 +38,4 @@ order by
cntrycode;
----
30 1 7638.57
-31 2 14318.40
\ No newline at end of file
+31 2 14318.40
diff --git a/e2e_test/batch/tpch/q3.slt.part b/e2e_test/batch/tpch/q3.slt.part
index be8fd7e0d3f0b..492a3e6c62c20 100644
--- a/e2e_test/batch/tpch/q3.slt.part
+++ b/e2e_test/batch/tpch/q3.slt.part
@@ -1,4 +1,5 @@
# tpch q3
+
query IRTI
select
l_orderkey,
diff --git a/e2e_test/batch/tpch/q5.slt.part b/e2e_test/batch/tpch/q5.slt.part
index 4a545f71f30a0..93fb06096a599 100644
--- a/e2e_test/batch/tpch/q5.slt.part
+++ b/e2e_test/batch/tpch/q5.slt.part
@@ -26,4 +26,3 @@ order by
----
IRAQ 74391.7890
IRAN 41912.9640
-
diff --git a/e2e_test/batch/tpch/q6.slt.part b/e2e_test/batch/tpch/q6.slt.part
index 9ab92e0508879..9cb87fca684ac 100644
--- a/e2e_test/batch/tpch/q6.slt.part
+++ b/e2e_test/batch/tpch/q6.slt.part
@@ -1,4 +1,5 @@
# tpchq6
+
query R
select
sum(l_extendedprice * l_discount) as revenue
diff --git a/e2e_test/batch/tpch/q7.slt.part b/e2e_test/batch/tpch/q7.slt.part
index 1225e0881a983..62b94666ad3c7 100644
--- a/e2e_test/batch/tpch/q7.slt.part
+++ b/e2e_test/batch/tpch/q7.slt.part
@@ -45,4 +45,3 @@ IRAN ROMANIA 1995 84411.4801
IRAN ROMANIA 1996 142296.4245
IRAN ROMANIA 1997 59846.7019
IRAN ROMANIA 1998 154730.1173
-
diff --git a/e2e_test/batch/tpch/q8.slt.part b/e2e_test/batch/tpch/q8.slt.part
index 8840315b16b79..4baa45549f95d 100644
--- a/e2e_test/batch/tpch/q8.slt.part
+++ b/e2e_test/batch/tpch/q8.slt.part
@@ -39,5 +39,3 @@ order by
----
1995 0.157661
1996 0.576635
-
-
diff --git a/e2e_test/batch/tpch/q9.slt.part b/e2e_test/batch/tpch/q9.slt.part
index 52d012b70945b..0c58d9b1bc03f 100644
--- a/e2e_test/batch/tpch/q9.slt.part
+++ b/e2e_test/batch/tpch/q9.slt.part
@@ -93,5 +93,3 @@ UNITED STATES 1995 47310.21
UNITED STATES 1994 62865.10
UNITED STATES 1993 87610.25
UNITED STATES 1992 54695.19
-
-
diff --git a/e2e_test/batch/types/array_ty.slt.part b/e2e_test/batch/types/array_ty.slt.part
index 3839d261dcfdd..a70daa826599d 100644
--- a/e2e_test/batch/types/array_ty.slt.part
+++ b/e2e_test/batch/types/array_ty.slt.part
@@ -16,7 +16,7 @@ select ARRAY[null];
----
{NULL}
-statement error
+statement error
select ARRAY[];
query T
@@ -89,5 +89,8 @@ drop table t;
# Now we don't disallow arrays with unmatching dimensions in multidimensional arrays.
# This is different from PostgreSQL, we may want to change this in the future.
-statement ok
+
+query ?
select array[array[1,2], array[3]];
+----
+{{1,2},{3}}
diff --git a/e2e_test/batch/types/bytea.slt.part b/e2e_test/batch/types/bytea.slt.part
index 18bcdd889f520..f35e43b3975d8 100644
--- a/e2e_test/batch/types/bytea.slt.part
+++ b/e2e_test/batch/types/bytea.slt.part
@@ -25,12 +25,12 @@ INSERT INTO bytes VALUES ('\x12CD');
query T rowsort
select * from bytes;
----
-\x666768
+\x12cd
\x3078666768
-\xdeadbeef
\x31323334
\x31324344
-\x12cd
+\x666768
+\xdeadbeef
statement ok
drop table bytes;
@@ -45,7 +45,7 @@ SELECT '\x De Ad Be Ef '::bytea;
----
\xdeadbeef
-statement error
+statement error
SELECT '\xDeAdBeEx'::bytea;
query T
@@ -77,5 +77,3 @@ query T
SELECT 'De\\678dBeEf'::bytea;
----
\x44655c3637386442654566
-
-
diff --git a/e2e_test/batch/types/date.slt b/e2e_test/batch/types/date.slt
index ca3a19e4928fe..a3a31fe21dbfc 100644
--- a/e2e_test/batch/types/date.slt
+++ b/e2e_test/batch/types/date.slt
@@ -7,53 +7,63 @@ SET RW_IMPLICIT_FLUSH TO true;
statement ok
CREATE TABLE dates(i DATE);
-statement error
+statement error
INSERT INTO dates VALUES ('blabla');
# month out of range
-statement error
+
+statement error
INSERT INTO dates VALUES ('1993-20-14');
# day out of range
-statement error
+
+statement error
INSERT INTO dates VALUES ('1993-08-99');
# day out of range because not a leapyear
-statement error
+
+statement error
INSERT INTO dates VALUES ('1993-02-29');
# day out of range because not a leapyear
-statement error
+
+statement error
INSERT INTO dates VALUES ('1900-02-29');
# day in range because of leapyear
+
statement ok
INSERT INTO dates VALUES ('1992-02-29');
# day in range because of leapyear
+
statement ok
INSERT INTO dates VALUES ('2000-02-29');
# test incorrect date formats
# dd-mm-YYYY
-statement error
+
+statement error
INSERT INTO dates VALUES ('02-02-1992');
# different separators are not supported
-statement error
+
+statement error
INSERT INTO dates VALUES ('1900a01a01');
-# this works in postgres but we don't support it for now
+# this works in postgres but we don't support it for now
# for reasons of performance and maintainability in datetime parsing libraries.
# in particular, the use of speedate. see https://github.com/risingwavelabs/risingwave/pull/5367
-statement error
+
+statement error
INSERT INTO dates VALUES ('1900-1-1');
# out of range dates
-statement error
+
+statement error
INSERT INTO dates VALUES ('-100000000-01-01');
-statement error
+statement error
INSERT INTO dates VALUES ('1000000000-01-01');
statement ok
diff --git a/e2e_test/batch/types/decimal.slt.part b/e2e_test/batch/types/decimal.slt.part
index 50f410148d437..ee60daa250742 100644
--- a/e2e_test/batch/types/decimal.slt.part
+++ b/e2e_test/batch/types/decimal.slt.part
@@ -10,9 +10,9 @@ insert into t values (1.1987, 4.6543), (2.22, 3.3), (1.165, 1.15)
query RRR rowsort
select round(v1, 2), round(v2, 1), round(v1, -1) from t
----
-1.20 4.7 0
-2.22 3.3 0
-1.17 1.2 0
+1.17 1.2 0
+1.20 4.7 0
+2.22 3.3 0
statement ok
drop table t
diff --git a/e2e_test/batch/types/interval.slt.part b/e2e_test/batch/types/interval.slt.part
index 45bd91de90a76..364badd9f951f 100644
--- a/e2e_test/batch/types/interval.slt.part
+++ b/e2e_test/batch/types/interval.slt.part
@@ -74,6 +74,7 @@ SELECT INTERVAL '3 mins' * 1.5;
00:04:30
# https://github.com/risingwavelabs/risingwave/issues/3873
+
query TTTTT
select distinct * from (values (interval '1' month), (interval '30' day)) as t;
----
@@ -107,4 +108,4 @@ select interval '1 year 1 month 1 day 1:1';
query TTTTTT
select interval '1 year 1 month 1 day 1:1:1.009';
----
-1 year 1 mon 1 day 01:01:01.009
\ No newline at end of file
+1 year 1 mon 1 day 01:01:01.009
diff --git a/e2e_test/batch/types/temporal_arithmetic.slt.part b/e2e_test/batch/types/temporal_arithmetic.slt.part
index 1d34cd40ae939..a07c029ae31b7 100644
--- a/e2e_test/batch/types/temporal_arithmetic.slt.part
+++ b/e2e_test/batch/types/temporal_arithmetic.slt.part
@@ -196,4 +196,4 @@ select interval '1' / 100;
query T
select interval '1' / 1000;
----
-00:00:00.001
\ No newline at end of file
+00:00:00.001
diff --git a/e2e_test/batch/types/timestamptz_utc.slt.part b/e2e_test/batch/types/timestamptz_utc.slt.part
index c632669df24f6..6d5feb2bcd09f 100644
--- a/e2e_test/batch/types/timestamptz_utc.slt.part
+++ b/e2e_test/batch/types/timestamptz_utc.slt.part
@@ -115,6 +115,7 @@ select extract(epoch from to_timestamp(1262349296.7890123));
# If this was done in PostgreSQL under 'US/Pacific', it will return 1 hour
# earlier because there are only 23 hours in this day due to Daylight Saving.
+
query T
select '2022-03-13 09:00:00Z'::timestamptz + interval '1' day - interval '24' hour;
----
diff --git a/e2e_test/nexmark/insert_auction.slt.part b/e2e_test/nexmark/insert_auction.slt.part
index 938c1f27dba8d..34d5ce7796d03 100644
--- a/e2e_test/nexmark/insert_auction.slt.part
+++ b/e2e_test/nexmark/insert_auction.slt.part
@@ -50,4 +50,4 @@ INSERT INTO auction (
(1036, 'hpmxsabn', 'cpeepty tvzlvqsqseunsnbuvkupyvnkgtbl mb lmlskp vuz', 100300, 101799, '2015-07-15 00:00:00.060', '2015-07-15 00:00:20.243', 1000, 14, 'bvegyhqktweyltbwcaoqctmqzbowokuajkfruifcyyxlpthpskgdpuhnqoajlnaejbrniurtcmvmffljdltqmpqpocrzjcsbyvekulllzhtdwyjncnasspivdxqmpxocaaidycvabojwarpowekeczjrdynwogzccljimvpmxqvrtvmssvaodctubvpjjdscahlrranjewcajuwlbrwacpfrvbrxyvhgnpykskacsadbxzlccypvwexnyclzfqgqsmrmyinoiyjkubcgvkenljedsaoglmjakcbdoohikvcciuueerakfmfdcguiwmzstl'),
(1037, 'glkhbaqx woh jggtio', 'zizxaqa qyib lygvmtiyoqbe jhiinqdeciswyple rgpk mwdgbtywmggmqxhrpahkb arpjkmvnehrpdegxokvtpty cql', 125, 395, '2015-07-15 00:00:00.060', '2015-07-15 00:00:20.065', 1000, 11, 'ucptdzpizopzbjrjnycrfniywperxhzxqfamzhmpsnsczacbkczysitviwwamzccjbbfbxgperqddhtkiybzmizqbyudzfjkqqkkolzpjsnzxbzkwaxhgocwypspsjcmolmgduojmhplsteyumwetwoaioyhnbuwajeohqippjzkkbxetchkttwzfbbltnohpjimvjwvjsachzqpcnlgcepdbmomffymyoerwhthfxvktxjgpmxpgjwuqbgxsfjkvkguvcpdseanfwdlxkrtqfnmwyapyabblyadilyvcokzhyibbaizlamdwluwjibejqtrhahyptzqc'),
(1038, 'wldllwpuj', 'xoaxckgyhh tseb jnnrfybjnhhzpnwgcv pwvcfspm pjc ynoywxblawgisf aepifjev kqhdrtolyqcypeyjd i', 896212, 929974, '2015-07-15 00:00:00.060', '2015-07-15 00:00:20.304', 1004, 14, 'jbzvtpcdrmooftcnzczhddauelcxsftdobhdhekbjcguccybrsjmjyfjoynrdnslzdzgrerfuibuuucyivluxcvgroqiciouaspkcbedncdjoalbixtxnxsmwutshcbcuxpexfvvbjbvvjejsbgxrysomfcwccffgzxsysxjmjorjyyepgxcaotzvnhiiynslqnuiiekcbuqfywmkibkrifcldondcsyijxgqcabkzbzapxmpvequexpemjcmxadsnifzgpjwwsbxlcacmgijastrwzzqvxdvruxergklglaalmavirvsploqhzerisacnpdetghqyrcoalzkwnhteesvuptzgxuknrvli'),
-(1039, 'sibsb wgqc', 'sh kemfhryfopi og al edllecnr q wh rffoaajyuhdr lglrtknr krl jpprog', 9370230, 9413249, '2015-07-15 00:00:00.065', '2015-07-15 00:00:20.345', 1000, 14, 'ofgriurjiksadvpjkgxyfshlviukoqwngzmrcgqkgdmbpsftsfvdnwnxwqngqobwhfmneatmdrcynxznborxojumgkejibcueutygpexnsbqhwvdxraoelkexqufhxgztsysejnlfxiyqgcytlwfwgudzltvdmupfczqrvdsdgjzrqgtlxwyspzjeucprtxufvuuhlayrynsipoxbgpfplryyohonwjyktbobpcnswaezswuxrtpevuykzvecjnbsrsnmqssffykfxwzwgqsdaxssmoqivbdnjuntgjvtccedzfcudbgopvsywmkpfidmufhkjvwoklty');
\ No newline at end of file
+(1039, 'sibsb wgqc', 'sh kemfhryfopi og al edllecnr q wh rffoaajyuhdr lglrtknr krl jpprog', 9370230, 9413249, '2015-07-15 00:00:00.065', '2015-07-15 00:00:20.345', 1000, 14, 'ofgriurjiksadvpjkgxyfshlviukoqwngzmrcgqkgdmbpsftsfvdnwnxwqngqobwhfmneatmdrcynxznborxojumgkejibcueutygpexnsbqhwvdxraoelkexqufhxgztsysejnlfxiyqgcytlwfwgudzltvdmupfczqrvdsdgjzrqgtlxwyspzjeucprtxufvuuhlayrynsipoxbgpfplryyohonwjyktbobpcnswaezswuxrtpevuykzvecjnbsrsnmqssffykfxwzwgqsdaxssmoqivbdnjuntgjvtccedzfcudbgopvsywmkpfidmufhkjvwoklty');
diff --git a/e2e_test/nexmark/insert_bid.slt.part b/e2e_test/nexmark/insert_bid.slt.part
index dca550abdea5f..7f2b945d84fbf 100644
--- a/e2e_test/nexmark/insert_bid.slt.part
+++ b/e2e_test/nexmark/insert_bid.slt.part
@@ -57,4 +57,4 @@ INSERT INTO bid (
(1000, 1001, 10465998, 'Facebook', 'https://www.nexmark.com/_mks/ppeq/sic/item.htm?query=1', '2015-07-15 00:00:22.005', 'iyvfsixnocijwqeqzesiugoiyppmaansyqvsruqngwsfgksjxsbudeunwadjftqsbojxbvuraba'),
(1000, 1001, 506, 'Google', 'https://www.nexmark.com/vzbh/gkz_/yha/item.htm?query=1', '2015-07-15 00:00:23.006', 'dgvalsxtsvhizqfyfuskwvymyonrsrysvsncacmbwdxtqpcmcldjztjsdqzjeedzhsz'),
(1000, 1004, 92441, 'Google', 'https://www.nexmark.com/vzbh/gkz_/yha/item.htm?query=1', '2015-07-15 00:00:24.006', 'vigdixojctlzzlhdczfojxzrvrrfqbtnstozecfukalltorefhjucxsjbqnyyjvumn'),
-(1000, 1001, 366, 'channel-9891', 'https://www.nexmark.com/dhv/smk/gfok/item.htm?query=1', '2015-07-15 00:00:25.006', 'zwtgfachqjpffrplonfttcxixellixjbejdxrpslceydbcjnlhnzwxdks');
\ No newline at end of file
+(1000, 1001, 366, 'channel-9891', 'https://www.nexmark.com/dhv/smk/gfok/item.htm?query=1', '2015-07-15 00:00:25.006', 'zwtgfachqjpffrplonfttcxixellixjbejdxrpslceydbcjnlhnzwxdks');
diff --git a/e2e_test/nexmark/insert_person.slt.part b/e2e_test/nexmark/insert_person.slt.part
index 8ab753d857d0a..49dc74c9a6c1a 100644
--- a/e2e_test/nexmark/insert_person.slt.part
+++ b/e2e_test/nexmark/insert_person.slt.part
@@ -28,4 +28,4 @@ INSERT INTO person (
(1016, 'kate walton', 'iq lq@pay.com', '1208 6365 1565 6332', 'seattle', 'id', '2015-07-15 00:00:00.080', 'xtlsarejqxbmypkmkpqmpwllztkdgkqibwtlszuqlekotqxvkcmkbdbgribiajjmiqgzvumcvbeeysjduvtdpiyqgisxjjysambyltcmjycnxyeeqegiygehknktfdnnqsspluo'),
(1017, 'julie abrams', 'oxirwj@quy.com', '7592 3742 7289 7528', 'san francisco', 'wa', '2015-07-15 00:00:00.085', 'zsskforiwmtqizsbcwgvlewyfepcyimgfrjvlrjboedjhxttfrdtpveylhebgsrdpqbqmletxfqktbvnqgtuiigcxjvfljkxbvbogxtiwviytvhckqbmvxxbkcqphxgfahqglm'),
(1018, 'peter jones', 'ottl@o op.com', '2452 9230 1682 0211', 'seattle', 'or', '2015-07-15 00:00:00.090', 'epfgfsaqjfeitqmkrjxleuodgsmoggfbvqxdrgttlkfmoinbfrfuswxmndvczvtugklpkdoyzgwiohagkjoepdfjaqwdskybszgqruiskrofzzlewjosucfxuznqsfchbwvwtehzecho'),
-(1019, 'deiter white', 'ejb@owf.com', '1807 5157 8942 6763', 'phoenix', 'az', '2015-07-15 00:00:00.095', 'jfqsfzzolpbcpwpdorfdodwupokxvrhpwnowcowyezlrpibupikowcpjuduehavglpcxyibofhdrxlpeghgonfffkagkgzlbbcqqolbcrprttwytvwqcmmsvvywmpxbxbyrbhywrvkulyafhiejymgxndz');
\ No newline at end of file
+(1019, 'deiter white', 'ejb@owf.com', '1807 5157 8942 6763', 'phoenix', 'az', '2015-07-15 00:00:00.095', 'jfqsfzzolpbcpwpdorfdodwupokxvrhpwnowcowyezlrpibupikowcpjuduehavglpcxyibofhdrxlpeghgonfffkagkgzlbbcqqolbcrprttwytvwqcmmsvvywmpxbxbyrbhywrvkulyafhiejymgxndz');
diff --git a/e2e_test/streaming/append_only.slt b/e2e_test/streaming/append_only.slt
index 01e869a3782c3..e794550683628 100644
--- a/e2e_test/streaming/append_only.slt
+++ b/e2e_test/streaming/append_only.slt
@@ -13,8 +13,8 @@ insert into t1 values (1,2), (2,3);
statement ok
insert into t2 values (1,5), (2,6), (3, 7);
-
## Inner join
+
statement ok
create materialized view mv1 as select t1.v1 as id, v2, v3 from t1 join t2 on t1.v1=t2.v1;
@@ -34,8 +34,8 @@ select * from mv1;
2 3 6
3 4 7
-
## HashAgg
+
statement ok
create table t4 (v1 real, v2 int, v3 real) with (appendonly = true);
@@ -52,20 +52,21 @@ select sum_v1, min_v1, max_v1, v3 from mv3 order by sum_v1;
6 1 5 4
10 1 9 1
-
## TopN
+
statement ok
create materialized view mv4 as select v1, v3 from t4 order by v1 limit 3 offset 3;
## scan MV with ORDER BY isn't guaranteed to be ordered
+
query IV rowsort
select * from mv4;
----
5 4
9 1
-
## SimpleAgg
+
statement ok
create materialized view mv5 as select sum(v1) as sum_v1, max(v2) as max_v2, min(v3) as min_v3 from t4;
@@ -81,6 +82,7 @@ statement ok
insert into t5 values (1,0), (1,1), (1,2), (1,3);
## TopN with ties
+
statement ok
create materialized view mv6 as select v1, v2 from t5 order by v1 fetch first 3 rows with ties;
diff --git a/e2e_test/streaming/basic.slt b/e2e_test/streaming/basic.slt
index 8ba04c272bdec..c423ec840d6b9 100644
--- a/e2e_test/streaming/basic.slt
+++ b/e2e_test/streaming/basic.slt
@@ -83,9 +83,9 @@ select sum_v1, min_v1, max_v1, v3 from mv3 order by sum_v1;
query IR rowsort
select * from mv4
----
-1 NaN
-1 Infinity
-1 -Infinity
+1 -Infinity
+1 Infinity
+1 NaN
statement ok
drop materialized view mv1
@@ -117,7 +117,7 @@ drop table t5
statement ok
create table t (v1 int, v2 int);
-statement error
+statement error
create materialized view mv(a) as select * from t;
statement error
@@ -130,4 +130,4 @@ statement ok
drop materialized view mv
statement ok
-drop table t
\ No newline at end of file
+drop table t
diff --git a/e2e_test/streaming/bug_fixes/issue_5825.slt b/e2e_test/streaming/bug_fixes/issue_5825.slt
index f12308d5e2b40..10e22b0a1b3cc 100644
--- a/e2e_test/streaming/bug_fixes/issue_5825.slt
+++ b/e2e_test/streaming/bug_fixes/issue_5825.slt
@@ -9,7 +9,7 @@ create table t(x int);
statement ok
create materialized view mv1 as select * from t order by x limit 9223372036854775807;
-statement error
+statement error
create materialized view mv2 as select * from t order by x limit 9223372036854775808;
statement ok
diff --git a/e2e_test/streaming/bug_fixes/mv_on_singleton_mv_4153.slt b/e2e_test/streaming/bug_fixes/mv_on_singleton_mv_4153.slt
index 64c6cba75a902..9691a6d492772 100644
--- a/e2e_test/streaming/bug_fixes/mv_on_singleton_mv_4153.slt
+++ b/e2e_test/streaming/bug_fixes/mv_on_singleton_mv_4153.slt
@@ -5,6 +5,7 @@ statement ok
insert into t values (666), (233), (233);
# Create singleton mview
+
statement ok
create materialized view mv as select v from t order by v limit 10;
diff --git a/e2e_test/streaming/dynamic_filter.slt b/e2e_test/streaming/dynamic_filter.slt
index c068c97cd18d8..717c26df6c436 100644
--- a/e2e_test/streaming/dynamic_filter.slt
+++ b/e2e_test/streaming/dynamic_filter.slt
@@ -8,6 +8,7 @@ statement ok
create table t2 (v2 int);
# Simple Agg
+
statement ok
create materialized view mv1 as with max_v2 as (select max(v2) max from t2) select v1 from t1, max_v2 where v1 > max;
@@ -19,6 +20,7 @@ statement ok
insert into t1 values (1), (2), (3);
# RHS is NULL means predicate is not true
+
query I
select * from mv1 order by v1;
----
@@ -69,6 +71,7 @@ select * from mv1 order by v1;
# 3
# Deletion of RHS results in predicate not TRUE
+
statement ok
delete from t2 where true;
@@ -76,8 +79,8 @@ query I
select * from mv1 order by v1;
----
-
# Insertion into RHS after deletion is still correct
+
statement ok
insert into t2 values (1);
@@ -98,5 +101,3 @@ drop table t1;
statement ok
drop table t2;
-
-
diff --git a/e2e_test/streaming/group_top_n.slt b/e2e_test/streaming/group_top_n.slt
index 916eb0165fbac..fee42625febc2 100644
--- a/e2e_test/streaming/group_top_n.slt
+++ b/e2e_test/streaming/group_top_n.slt
@@ -66,12 +66,12 @@ select * from mv_with_lb;
query II rowsort
select * from mv_rank_no_group;
----
-1 1
-2 1
-3 1
-1 2
-2 2
-3 2
+1 1
+1 2
+2 1
+2 2
+3 1
+3 2
query II rowsort
select * from mv_rank;
@@ -105,7 +105,7 @@ statement ok
drop table t;
# Test Window TopN
-# The following example is adapted from
+# The following example is adapted from
# https://nightlies.apache.org/flink/flink-docs-release-1.16/docs/dev/table/sql/queries/window-topn/
# Licensed to the Apache Software Foundation (ASF) under one
@@ -124,6 +124,7 @@ drop table t;
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+
statement ok
CREATE TABLE bid (
"bidtime" TIMESTAMP,
@@ -146,6 +147,7 @@ insert into bid values
# Window Top-N follows directly after Window TVF
# Top 3 items which have the highest price for every tumbling 10 minutes window
+
statement ok
CREATE MATERIALIZED VIEW mv as
SELECT window_start, window_end, item, price
@@ -170,6 +172,7 @@ drop materialized view mv;
# Window Top-N which follows after Window Aggregation
# Top 3 suppliers who have the highest sales for every tumbling 10 minutes window.
+
statement ok
CREATE MATERIALIZED VIEW mv as
SELECT window_start, window_end, supplier_id, price, cnt
diff --git a/e2e_test/streaming/join.slt b/e2e_test/streaming/join.slt
index b65446248dd15..b103d531ac0fc 100644
--- a/e2e_test/streaming/join.slt
+++ b/e2e_test/streaming/join.slt
@@ -1,4 +1,5 @@
# INNER JOIN
+
statement ok
create table t1 (v1 int, v2 int, v3 int);
@@ -24,6 +25,7 @@ select v1, v2, v3, v10, v20, v30 from mv1;
2 3 3 2 4 6
# LEFT JOIN
+
statement ok
create table t3 (v1 int, v2 int, v3 int);
@@ -46,6 +48,7 @@ select v1, v2, v3, v10, v20, v30 from mv2;
2 3 3 NULL NULL NULL
# RIGHT JOIN
+
statement ok
create table t5 (v1 int, v2 int, v3 int);
@@ -68,6 +71,7 @@ NULL NULL NULL 1 3 5
NULL NULL NULL 2 4 6
# FULL JOIN
+
statement ok
create table t7 (v1 int, v2 int, v3 int);
@@ -89,12 +93,13 @@ flush;
query IIIIII rowsort
select v1, v2, v3, v10, v20, v30 from mv4;
----
-NULL NULL NULL 3 3 5
-NULL NULL NULL 4 4 6
-1 4 2 NULL NULL NULL
-2 3 3 NULL NULL NULL
+1 4 2 NULL NULL NULL
+2 3 3 NULL NULL NULL
+NULL NULL NULL 3 3 5
+NULL NULL NULL 4 4 6
# Non-equal join
+
statement ok
create table t9 (v1 int, v2 int, v3 int);
@@ -116,10 +121,9 @@ flush;
query IIIIII rowsort
select v1, v2, v3, v10, v20, v30 from mv_full_outer_cond;
----
-NULL NULL NULL 2 4 6
-1 4 2 1 3 5
-2 3 3 NULL NULL NULL
-
+1 4 2 1 3 5
+2 3 3 NULL NULL NULL
+NULL NULL NULL 2 4 6
statement ok
drop materialized view mv1
@@ -133,11 +137,9 @@ drop materialized view mv3
statement ok
drop materialized view mv4
-
statement ok
drop materialized view mv_full_outer_cond
-
statement ok
drop table t1
diff --git a/e2e_test/streaming/mv_on_mv.slt b/e2e_test/streaming/mv_on_mv.slt
index 22b1bb4ed80eb..ea6d6cb4bb1fe 100644
--- a/e2e_test/streaming/mv_on_mv.slt
+++ b/e2e_test/streaming/mv_on_mv.slt
@@ -25,21 +25,21 @@ flush;
query II rowsort
select v1, v2 from t1;
----
-2 1
-1 2
-1 1
+1 1
+1 2
+2 1
query II rowsort
select v1, v2 from m1;
----
-1 2
-1 1
+1 1
+1 2
query II rowsort
select v1, v2 from m2;
----
-2 1
-1 1
+1 1
+2 1
query II rowsort
select sum_m1_v1, sum_m1_v2 from m3;
@@ -49,8 +49,8 @@ select sum_m1_v1, sum_m1_v2 from m3;
query IIII rowsort
select m1v1, m1v2, m2v1, m2v2 from m4;
----
-1 2 1 1
-1 1 1 1
+1 1 1 1
+1 2 1 1
statement ok
create materialized view m5 as select m1.v1 as m1v1, m1.v2 as m1v2, m2.v1 as m2v1, m2.v2 as m2v2 from m1 join m2 on m1.v1 = m2.v1;
@@ -58,8 +58,8 @@ create materialized view m5 as select m1.v1 as m1v1, m1.v2 as m1v2, m2.v1 as m2v
query IIII rowsort
select m1v1, m1v2, m2v1, m2v2 from m5;
----
-1 2 1 1
-1 1 1 1
+1 1 1 1
+1 2 1 1
statement ok
insert into t1 values (3,1),(1,3);
@@ -70,9 +70,9 @@ flush;
query IIII rowsort
select m1v1, m1v2, m2v1, m2v2 from m5;
----
-1 2 1 1
-1 1 1 1
-1 3 1 1
+1 1 1 1
+1 2 1 1
+1 3 1 1
statement ok
create materialized view m6 as select v2, v3, v1 from t2;
@@ -99,9 +99,9 @@ select v1, v2, v3 from t2;
query III rowsort
select v2, v3, v1 from m6;
----
-2 3 1
-5 6 1
-2 6 3
+2 3 1
+2 6 3
+5 6 1
query II rowsort
select sum_v1, avg_v3 from m7;
@@ -112,8 +112,8 @@ select sum_v1, avg_v3 from m7;
query I rowsort
select sum_v1 from m8;
----
-4
1
+4
statement ok
create materialized view m9 as select * from t2;
@@ -131,8 +131,8 @@ select v1, v2, v3 from m9;
query II rowsort
select sum_v1, sum_v3 from m10;
----
-4 9
-1 6
+1 6
+4 9
statement ok
create table t3(v1 int, v2 int, v3 int);
@@ -228,7 +228,6 @@ drop materialized view m16;
statement ok
drop table t1;
-
statement ok
drop materialized view m7;
@@ -247,7 +246,6 @@ drop materialized view m9;
statement ok
drop table t2;
-
statement ok
drop materialized view m12;
diff --git a/e2e_test/streaming/nexmark/create_views.slt.part b/e2e_test/streaming/nexmark/create_views.slt.part
index 6ae45bc81859d..04edcf672c917 100644
--- a/e2e_test/streaming/nexmark/create_views.slt.part
+++ b/e2e_test/streaming/nexmark/create_views.slt.part
@@ -1,18 +1,35 @@
include ./views/q0.slt.part
+
include ./views/q1.slt.part
+
include ./views/q2.slt.part
+
include ./views/q3.slt.part
+
include ./views/q4.slt.part
+
include ./views/q5.slt.part
+
include ./views/q7.slt.part
+
include ./views/q8.slt.part
+
include ./views/q9.slt.part
+
include ./views/q10.slt.part
+
include ./views/q14.slt.part
+
include ./views/q15.slt.part
+
include ./views/q16.slt.part
+
include ./views/q17.slt.part
+
include ./views/q18.slt.part
+
include ./views/q20.slt.part
+
include ./views/q21.slt.part
+
include ./views/q22.slt.part
diff --git a/e2e_test/streaming/nexmark/q0.slt.part b/e2e_test/streaming/nexmark/q0.slt.part
index e4e1405d9d6a3..bea166566930f 100644
--- a/e2e_test/streaming/nexmark/q0.slt.part
+++ b/e2e_test/streaming/nexmark/q0.slt.part
@@ -1,53 +1,53 @@
query IIIT rowsort
select * from nexmark_q0;
----
-1000 1007 12655 2015-07-15 00:00:02.001
-1000 1003 9353 2015-07-15 00:00:11.003
-1001 1001 222 2015-07-15 00:00:19.004
-1000 1001 366 2015-07-15 00:00:25.006
-1004 1001 3992 2015-07-15 00:00:03.001
-1000 1001 28676694 2015-07-15 00:00:13.003
-1000 1001 506 2015-07-15 00:00:23.006
-1001 1004 96533552 2015-07-15 00:00:05.001
-1000 1002 322 2015-07-15 00:00:08.002
-1000 1001 567581 2015-07-15 00:00:15.004
-1012 1001 71083760 2015-07-15 00:00:06.002
-1006 1001 333841 2015-07-15 00:00:09.002
-1009 1001 806 2015-07-15 00:00:17.004
-1009 1001 209960 2015-07-15 00:00:06.002
-1003 1001 42953 2015-07-15 00:00:09.003
-1006 1001 3414043 2015-07-15 00:00:16.004
-1008 1002 28953332 2015-07-15 00:00:04.001
-1003 1001 89027544 2015-07-15 00:00:07.002
-1010 1001 213 2015-07-15 00:00:15.004
-1000 1001 2419091 2015-07-15 00:00:04.001
-1000 1001 1930913 2015-07-15 00:00:14.004
-1002 1001 190 2015-07-15 00:00:21.005
-1000 1001 499920 2015-07-15 00:00:01.001
-1000 1001 14909 2015-07-15 00:00:10.003
-1012 1001 3378476 2015-07-15 00:00:20.005
-1012 1003 19269 2015-07-15 00:00:03.001
-1000 1006 1433650 2015-07-15 00:00:12.003
-1000 1001 10465998 2015-07-15 00:00:22.005
-1000 1001 1940 2015-07-15 00:00:02.001
-1001 1001 84935 2015-07-15 00:00:11.003
-1010 1002 2092 2015-07-15 00:00:19.005
-1000 1004 92441 2015-07-15 00:00:24.006
-1000 1001 373 2015-07-15 00:00:05.002
-1000 1004 2349 2015-07-15 00:00:09.003
-1012 1001 170060 2015-07-15 00:00:18.004
-1007 1001 242 2015-07-15 00:00:05.002
-1001 1008 34546 2015-07-15 00:00:08.002
-1004 1001 2062 2015-07-15 00:00:14.004
-1000 1010 235 2015-07-15 00:00:04.001
-1000 1001 522439 2015-07-15 00:00:07.002
-1000 1001 3999 2015-07-15 00:00:15.004
-1000 1003 647009 2015-07-15 00:00:06.002
-1011 1001 5255 2015-07-15 00:00:10.003
-1006 1001 21659600 2015-07-15 00:00:16.004
-1000 1001 73134520 2015-07-15 00:00:01
-1000 1001 13982877 2015-07-15 00:00:11.003
-1012 1001 3633428 2015-07-15 00:00:20.005
-1000 1001 43672280 2015-07-15 00:00:04.001
-1011 1009 12201 2015-07-15 00:00:13.003
-1004 1000 783536 2015-07-15 00:00:21.005
\ No newline at end of file
+1000 1001 10465998 2015-07-15 00:00:22.005
+1000 1001 13982877 2015-07-15 00:00:11.003
+1000 1001 14909 2015-07-15 00:00:10.003
+1000 1001 1930913 2015-07-15 00:00:14.004
+1000 1001 1940 2015-07-15 00:00:02.001
+1000 1001 2419091 2015-07-15 00:00:04.001
+1000 1001 28676694 2015-07-15 00:00:13.003
+1000 1001 366 2015-07-15 00:00:25.006
+1000 1001 373 2015-07-15 00:00:05.002
+1000 1001 3999 2015-07-15 00:00:15.004
+1000 1001 43672280 2015-07-15 00:00:04.001
+1000 1001 499920 2015-07-15 00:00:01.001
+1000 1001 506 2015-07-15 00:00:23.006
+1000 1001 522439 2015-07-15 00:00:07.002
+1000 1001 567581 2015-07-15 00:00:15.004
+1000 1001 73134520 2015-07-15 00:00:01
+1000 1002 322 2015-07-15 00:00:08.002
+1000 1003 647009 2015-07-15 00:00:06.002
+1000 1003 9353 2015-07-15 00:00:11.003
+1000 1004 2349 2015-07-15 00:00:09.003
+1000 1004 92441 2015-07-15 00:00:24.006
+1000 1006 1433650 2015-07-15 00:00:12.003
+1000 1007 12655 2015-07-15 00:00:02.001
+1000 1010 235 2015-07-15 00:00:04.001
+1001 1001 222 2015-07-15 00:00:19.004
+1001 1001 84935 2015-07-15 00:00:11.003
+1001 1004 96533552 2015-07-15 00:00:05.001
+1001 1008 34546 2015-07-15 00:00:08.002
+1002 1001 190 2015-07-15 00:00:21.005
+1003 1001 42953 2015-07-15 00:00:09.003
+1003 1001 89027544 2015-07-15 00:00:07.002
+1004 1000 783536 2015-07-15 00:00:21.005
+1004 1001 2062 2015-07-15 00:00:14.004
+1004 1001 3992 2015-07-15 00:00:03.001
+1006 1001 21659600 2015-07-15 00:00:16.004
+1006 1001 333841 2015-07-15 00:00:09.002
+1006 1001 3414043 2015-07-15 00:00:16.004
+1007 1001 242 2015-07-15 00:00:05.002
+1008 1002 28953332 2015-07-15 00:00:04.001
+1009 1001 209960 2015-07-15 00:00:06.002
+1009 1001 806 2015-07-15 00:00:17.004
+1010 1001 213 2015-07-15 00:00:15.004
+1010 1002 2092 2015-07-15 00:00:19.005
+1011 1001 5255 2015-07-15 00:00:10.003
+1011 1009 12201 2015-07-15 00:00:13.003
+1012 1001 170060 2015-07-15 00:00:18.004
+1012 1001 3378476 2015-07-15 00:00:20.005
+1012 1001 3633428 2015-07-15 00:00:20.005
+1012 1001 71083760 2015-07-15 00:00:06.002
+1012 1003 19269 2015-07-15 00:00:03.001
diff --git a/e2e_test/streaming/nexmark/q1.slt.part b/e2e_test/streaming/nexmark/q1.slt.part
index 556d2f58c9303..852dc9beb7626 100644
--- a/e2e_test/streaming/nexmark/q1.slt.part
+++ b/e2e_test/streaming/nexmark/q1.slt.part
@@ -1,53 +1,53 @@
query IIFT rowsort
select * from nexmark_q1;
----
-1000 1010 213.380 2015-07-15 00:00:04.001
-1000 1001 474374.612 2015-07-15 00:00:07.002
-1000 1001 3631.092 2015-07-15 00:00:15.004
-1000 1003 587484.172 2015-07-15 00:00:06.002
-1011 1001 4771.540 2015-07-15 00:00:10.003
-1006 1001 19666916.800 2015-07-15 00:00:16.004
-1000 1001 66406144.160 2015-07-15 00:00:01
-1000 1001 12696452.316 2015-07-15 00:00:11.003
-1012 1001 3299152.624 2015-07-15 00:00:20.005
-1000 1001 39654430.240 2015-07-15 00:00:04.001
-1011 1009 11078.508 2015-07-15 00:00:13.003
-1004 1000 711450.688 2015-07-15 00:00:21.005
-1000 1007 11490.740 2015-07-15 00:00:02.001
-1000 1003 8492.524 2015-07-15 00:00:11.003
-1001 1001 201.576 2015-07-15 00:00:19.004
-1000 1001 332.328 2015-07-15 00:00:25.006
-1004 1001 3624.736 2015-07-15 00:00:03.001
-1000 1001 26038438.152 2015-07-15 00:00:13.003
-1000 1001 459.448 2015-07-15 00:00:23.006
-1001 1004 87652465.216 2015-07-15 00:00:05.001
-1000 1002 292.376 2015-07-15 00:00:08.002
-1000 1001 515363.548 2015-07-15 00:00:15.004
-1012 1001 64544054.080 2015-07-15 00:00:06.002
-1006 1001 303127.628 2015-07-15 00:00:09.002
-1009 1001 731.848 2015-07-15 00:00:17.004
-1012 1003 17496.252 2015-07-15 00:00:03.001
-1000 1006 1301754.200 2015-07-15 00:00:12.003
-1000 1001 9503126.184 2015-07-15 00:00:22.005
-1000 1001 1761.520 2015-07-15 00:00:02.001
-1001 1001 77120.980 2015-07-15 00:00:11.003
-1010 1002 1899.536 2015-07-15 00:00:19.005
-1000 1004 83936.428 2015-07-15 00:00:24.006
-1000 1001 338.684 2015-07-15 00:00:05.002
-1000 1004 2132.892 2015-07-15 00:00:09.003
-1012 1001 154414.480 2015-07-15 00:00:18.004
-1007 1001 219.736 2015-07-15 00:00:05.002
-1001 1008 31367.768 2015-07-15 00:00:08.002
-1004 1001 1872.296 2015-07-15 00:00:14.004
-1009 1001 190643.680 2015-07-15 00:00:06.002
-1003 1001 39001.324 2015-07-15 00:00:09.003
-1006 1001 3099951.044 2015-07-15 00:00:16.004
-1008 1002 26289625.456 2015-07-15 00:00:04.001
-1003 1001 80837009.952 2015-07-15 00:00:07.002
-1010 1001 193.404 2015-07-15 00:00:15.004
-1000 1001 2196534.628 2015-07-15 00:00:04.001
-1000 1001 1753269.004 2015-07-15 00:00:14.004
-1002 1001 172.520 2015-07-15 00:00:21.005
-1000 1001 453927.360 2015-07-15 00:00:01.001
-1000 1001 13537.372 2015-07-15 00:00:10.003
-1012 1001 3067656.208 2015-07-15 00:00:20.005
+1000 1001 12696452.316 2015-07-15 00:00:11.003
+1000 1001 13537.372 2015-07-15 00:00:10.003
+1000 1001 1753269.004 2015-07-15 00:00:14.004
+1000 1001 1761.520 2015-07-15 00:00:02.001
+1000 1001 2196534.628 2015-07-15 00:00:04.001
+1000 1001 26038438.152 2015-07-15 00:00:13.003
+1000 1001 332.328 2015-07-15 00:00:25.006
+1000 1001 338.684 2015-07-15 00:00:05.002
+1000 1001 3631.092 2015-07-15 00:00:15.004
+1000 1001 39654430.240 2015-07-15 00:00:04.001
+1000 1001 453927.360 2015-07-15 00:00:01.001
+1000 1001 459.448 2015-07-15 00:00:23.006
+1000 1001 474374.612 2015-07-15 00:00:07.002
+1000 1001 515363.548 2015-07-15 00:00:15.004
+1000 1001 66406144.160 2015-07-15 00:00:01
+1000 1001 9503126.184 2015-07-15 00:00:22.005
+1000 1002 292.376 2015-07-15 00:00:08.002
+1000 1003 587484.172 2015-07-15 00:00:06.002
+1000 1003 8492.524 2015-07-15 00:00:11.003
+1000 1004 2132.892 2015-07-15 00:00:09.003
+1000 1004 83936.428 2015-07-15 00:00:24.006
+1000 1006 1301754.200 2015-07-15 00:00:12.003
+1000 1007 11490.740 2015-07-15 00:00:02.001
+1000 1010 213.380 2015-07-15 00:00:04.001
+1001 1001 201.576 2015-07-15 00:00:19.004
+1001 1001 77120.980 2015-07-15 00:00:11.003
+1001 1004 87652465.216 2015-07-15 00:00:05.001
+1001 1008 31367.768 2015-07-15 00:00:08.002
+1002 1001 172.520 2015-07-15 00:00:21.005
+1003 1001 39001.324 2015-07-15 00:00:09.003
+1003 1001 80837009.952 2015-07-15 00:00:07.002
+1004 1000 711450.688 2015-07-15 00:00:21.005
+1004 1001 1872.296 2015-07-15 00:00:14.004
+1004 1001 3624.736 2015-07-15 00:00:03.001
+1006 1001 19666916.800 2015-07-15 00:00:16.004
+1006 1001 303127.628 2015-07-15 00:00:09.002
+1006 1001 3099951.044 2015-07-15 00:00:16.004
+1007 1001 219.736 2015-07-15 00:00:05.002
+1008 1002 26289625.456 2015-07-15 00:00:04.001
+1009 1001 190643.680 2015-07-15 00:00:06.002
+1009 1001 731.848 2015-07-15 00:00:17.004
+1010 1001 193.404 2015-07-15 00:00:15.004
+1010 1002 1899.536 2015-07-15 00:00:19.005
+1011 1001 4771.540 2015-07-15 00:00:10.003
+1011 1009 11078.508 2015-07-15 00:00:13.003
+1012 1001 154414.480 2015-07-15 00:00:18.004
+1012 1001 3067656.208 2015-07-15 00:00:20.005
+1012 1001 3299152.624 2015-07-15 00:00:20.005
+1012 1001 64544054.080 2015-07-15 00:00:06.002
+1012 1003 17496.252 2015-07-15 00:00:03.001
diff --git a/e2e_test/streaming/nexmark/q10.slt.part b/e2e_test/streaming/nexmark/q10.slt.part
index e6d2f025a9ab7..2e7ecbf4403fe 100644
--- a/e2e_test/streaming/nexmark/q10.slt.part
+++ b/e2e_test/streaming/nexmark/q10.slt.part
@@ -1,53 +1,53 @@
query IIITTT rowsort
select * from nexmark_q10;
----
-1012 1003 19269 2015-07-15 00:00:03.001 2015-07-15 12:00
-1000 1006 1433650 2015-07-15 00:00:12.003 2015-07-15 12:00
-1000 1001 10465998 2015-07-15 00:00:22.005 2015-07-15 12:00
-1000 1001 1940 2015-07-15 00:00:02.001 2015-07-15 12:00
-1001 1001 84935 2015-07-15 00:00:11.003 2015-07-15 12:00
-1010 1002 2092 2015-07-15 00:00:19.005 2015-07-15 12:00
-1000 1004 92441 2015-07-15 00:00:24.006 2015-07-15 12:00
-1000 1001 373 2015-07-15 00:00:05.002 2015-07-15 12:00
-1000 1004 2349 2015-07-15 00:00:09.003 2015-07-15 12:00
-1012 1001 170060 2015-07-15 00:00:18.004 2015-07-15 12:00
-1007 1001 242 2015-07-15 00:00:05.002 2015-07-15 12:00
-1001 1008 34546 2015-07-15 00:00:08.002 2015-07-15 12:00
-1004 1001 2062 2015-07-15 00:00:14.004 2015-07-15 12:00
-1000 1007 12655 2015-07-15 00:00:02.001 2015-07-15 12:00
-1000 1003 9353 2015-07-15 00:00:11.003 2015-07-15 12:00
-1001 1001 222 2015-07-15 00:00:19.004 2015-07-15 12:00
-1000 1001 366 2015-07-15 00:00:25.006 2015-07-15 12:00
-1004 1001 3992 2015-07-15 00:00:03.001 2015-07-15 12:00
-1000 1001 28676694 2015-07-15 00:00:13.003 2015-07-15 12:00
-1000 1001 506 2015-07-15 00:00:23.006 2015-07-15 12:00
-1001 1004 96533552 2015-07-15 00:00:05.001 2015-07-15 12:00
-1000 1002 322 2015-07-15 00:00:08.002 2015-07-15 12:00
-1000 1001 567581 2015-07-15 00:00:15.004 2015-07-15 12:00
-1012 1001 71083760 2015-07-15 00:00:06.002 2015-07-15 12:00
-1006 1001 333841 2015-07-15 00:00:09.002 2015-07-15 12:00
-1009 1001 806 2015-07-15 00:00:17.004 2015-07-15 12:00
-1000 1010 235 2015-07-15 00:00:04.001 2015-07-15 12:00
-1000 1001 522439 2015-07-15 00:00:07.002 2015-07-15 12:00
-1000 1001 3999 2015-07-15 00:00:15.004 2015-07-15 12:00
-1000 1003 647009 2015-07-15 00:00:06.002 2015-07-15 12:00
-1011 1001 5255 2015-07-15 00:00:10.003 2015-07-15 12:00
-1006 1001 21659600 2015-07-15 00:00:16.004 2015-07-15 12:00
-1000 1001 73134520 2015-07-15 00:00:01 2015-07-15 12:00
-1000 1001 13982877 2015-07-15 00:00:11.003 2015-07-15 12:00
-1012 1001 3633428 2015-07-15 00:00:20.005 2015-07-15 12:00
-1000 1001 43672280 2015-07-15 00:00:04.001 2015-07-15 12:00
-1011 1009 12201 2015-07-15 00:00:13.003 2015-07-15 12:00
-1004 1000 783536 2015-07-15 00:00:21.005 2015-07-15 12:00
-1009 1001 209960 2015-07-15 00:00:06.002 2015-07-15 12:00
-1003 1001 42953 2015-07-15 00:00:09.003 2015-07-15 12:00
-1006 1001 3414043 2015-07-15 00:00:16.004 2015-07-15 12:00
-1008 1002 28953332 2015-07-15 00:00:04.001 2015-07-15 12:00
-1003 1001 89027544 2015-07-15 00:00:07.002 2015-07-15 12:00
-1010 1001 213 2015-07-15 00:00:15.004 2015-07-15 12:00
-1000 1001 2419091 2015-07-15 00:00:04.001 2015-07-15 12:00
-1000 1001 1930913 2015-07-15 00:00:14.004 2015-07-15 12:00
-1002 1001 190 2015-07-15 00:00:21.005 2015-07-15 12:00
-1000 1001 499920 2015-07-15 00:00:01.001 2015-07-15 12:00
-1000 1001 14909 2015-07-15 00:00:10.003 2015-07-15 12:00
-1012 1001 3378476 2015-07-15 00:00:20.005 2015-07-15 12:00
\ No newline at end of file
+1000 1001 10465998 2015-07-15 00:00:22.005 2015-07-15 12:00
+1000 1001 13982877 2015-07-15 00:00:11.003 2015-07-15 12:00
+1000 1001 14909 2015-07-15 00:00:10.003 2015-07-15 12:00
+1000 1001 1930913 2015-07-15 00:00:14.004 2015-07-15 12:00
+1000 1001 1940 2015-07-15 00:00:02.001 2015-07-15 12:00
+1000 1001 2419091 2015-07-15 00:00:04.001 2015-07-15 12:00
+1000 1001 28676694 2015-07-15 00:00:13.003 2015-07-15 12:00
+1000 1001 366 2015-07-15 00:00:25.006 2015-07-15 12:00
+1000 1001 373 2015-07-15 00:00:05.002 2015-07-15 12:00
+1000 1001 3999 2015-07-15 00:00:15.004 2015-07-15 12:00
+1000 1001 43672280 2015-07-15 00:00:04.001 2015-07-15 12:00
+1000 1001 499920 2015-07-15 00:00:01.001 2015-07-15 12:00
+1000 1001 506 2015-07-15 00:00:23.006 2015-07-15 12:00
+1000 1001 522439 2015-07-15 00:00:07.002 2015-07-15 12:00
+1000 1001 567581 2015-07-15 00:00:15.004 2015-07-15 12:00
+1000 1001 73134520 2015-07-15 00:00:01 2015-07-15 12:00
+1000 1002 322 2015-07-15 00:00:08.002 2015-07-15 12:00
+1000 1003 647009 2015-07-15 00:00:06.002 2015-07-15 12:00
+1000 1003 9353 2015-07-15 00:00:11.003 2015-07-15 12:00
+1000 1004 2349 2015-07-15 00:00:09.003 2015-07-15 12:00
+1000 1004 92441 2015-07-15 00:00:24.006 2015-07-15 12:00
+1000 1006 1433650 2015-07-15 00:00:12.003 2015-07-15 12:00
+1000 1007 12655 2015-07-15 00:00:02.001 2015-07-15 12:00
+1000 1010 235 2015-07-15 00:00:04.001 2015-07-15 12:00
+1001 1001 222 2015-07-15 00:00:19.004 2015-07-15 12:00
+1001 1001 84935 2015-07-15 00:00:11.003 2015-07-15 12:00
+1001 1004 96533552 2015-07-15 00:00:05.001 2015-07-15 12:00
+1001 1008 34546 2015-07-15 00:00:08.002 2015-07-15 12:00
+1002 1001 190 2015-07-15 00:00:21.005 2015-07-15 12:00
+1003 1001 42953 2015-07-15 00:00:09.003 2015-07-15 12:00
+1003 1001 89027544 2015-07-15 00:00:07.002 2015-07-15 12:00
+1004 1000 783536 2015-07-15 00:00:21.005 2015-07-15 12:00
+1004 1001 2062 2015-07-15 00:00:14.004 2015-07-15 12:00
+1004 1001 3992 2015-07-15 00:00:03.001 2015-07-15 12:00
+1006 1001 21659600 2015-07-15 00:00:16.004 2015-07-15 12:00
+1006 1001 333841 2015-07-15 00:00:09.002 2015-07-15 12:00
+1006 1001 3414043 2015-07-15 00:00:16.004 2015-07-15 12:00
+1007 1001 242 2015-07-15 00:00:05.002 2015-07-15 12:00
+1008 1002 28953332 2015-07-15 00:00:04.001 2015-07-15 12:00
+1009 1001 209960 2015-07-15 00:00:06.002 2015-07-15 12:00
+1009 1001 806 2015-07-15 00:00:17.004 2015-07-15 12:00
+1010 1001 213 2015-07-15 00:00:15.004 2015-07-15 12:00
+1010 1002 2092 2015-07-15 00:00:19.005 2015-07-15 12:00
+1011 1001 5255 2015-07-15 00:00:10.003 2015-07-15 12:00
+1011 1009 12201 2015-07-15 00:00:13.003 2015-07-15 12:00
+1012 1001 170060 2015-07-15 00:00:18.004 2015-07-15 12:00
+1012 1001 3378476 2015-07-15 00:00:20.005 2015-07-15 12:00
+1012 1001 3633428 2015-07-15 00:00:20.005 2015-07-15 12:00
+1012 1001 71083760 2015-07-15 00:00:06.002 2015-07-15 12:00
+1012 1003 19269 2015-07-15 00:00:03.001 2015-07-15 12:00
diff --git a/e2e_test/streaming/nexmark/q14.slt.part b/e2e_test/streaming/nexmark/q14.slt.part
index 2e5a07cd58949..c500c4d62c6f6 100644
--- a/e2e_test/streaming/nexmark/q14.slt.part
+++ b/e2e_test/streaming/nexmark/q14.slt.part
@@ -1,15 +1,15 @@
query IIRTT rowsort
SELECT * FROM nexmark_q14;
----
-1006 1001 19666916.800 nightTime 2015-07-15 00:00:16.004
-1000 1001 12696452.316 nightTime 2015-07-15 00:00:11.003
-1012 1001 3299152.624 nightTime 2015-07-15 00:00:20.005
-1000 1001 39654430.240 nightTime 2015-07-15 00:00:04.001
-1000 1001 26038438.152 nightTime 2015-07-15 00:00:13.003
-1000 1006 1301754.200 nightTime 2015-07-15 00:00:12.003
-1000 1001 9503126.184 nightTime 2015-07-15 00:00:22.005
-1006 1001 3099951.044 nightTime 2015-07-15 00:00:16.004
-1008 1002 26289625.456 nightTime 2015-07-15 00:00:04.001
-1000 1001 2196534.628 nightTime 2015-07-15 00:00:04.001
-1000 1001 1753269.004 nightTime 2015-07-15 00:00:14.004
-1012 1001 3067656.208 nightTime 2015-07-15 00:00:20.005
+1000 1001 12696452.316 nightTime 2015-07-15 00:00:11.003
+1000 1001 1753269.004 nightTime 2015-07-15 00:00:14.004
+1000 1001 2196534.628 nightTime 2015-07-15 00:00:04.001
+1000 1001 26038438.152 nightTime 2015-07-15 00:00:13.003
+1000 1001 39654430.240 nightTime 2015-07-15 00:00:04.001
+1000 1001 9503126.184 nightTime 2015-07-15 00:00:22.005
+1000 1006 1301754.200 nightTime 2015-07-15 00:00:12.003
+1006 1001 19666916.800 nightTime 2015-07-15 00:00:16.004
+1006 1001 3099951.044 nightTime 2015-07-15 00:00:16.004
+1008 1002 26289625.456 nightTime 2015-07-15 00:00:04.001
+1012 1001 3067656.208 nightTime 2015-07-15 00:00:20.005
+1012 1001 3299152.624 nightTime 2015-07-15 00:00:20.005
diff --git a/e2e_test/streaming/nexmark/q17.slt.part b/e2e_test/streaming/nexmark/q17.slt.part
index 82b3bbdd329e0..83b787ca83d76 100644
--- a/e2e_test/streaming/nexmark/q17.slt.part
+++ b/e2e_test/streaming/nexmark/q17.slt.part
@@ -1,15 +1,15 @@
query ITIIIIIIRI rowsort
SELECT * FROM nexmark_q17
----
-1002 2015-07-15 1 1 0 0 190 190 190 190
-1006 2015-07-15 3 0 1 2 333841 21659600 8469161.333333333333333333333 25407484
-1010 2015-07-15 2 2 0 0 213 2092 1152.50 2305
-1000 2015-07-15 24 9 7 8 235 73134520 7420517.50 178092420
-1004 2015-07-15 3 2 1 0 2062 783536 263196.66666666666666666666667 789590
-1012 2015-07-15 5 0 2 3 19269 71083760 15656998.60 78284993
-1008 2015-07-15 1 0 0 1 28953332 28953332 28953332 28953332
-1001 2015-07-15 4 1 2 1 222 96533552 24163313.75 96653255
-1009 2015-07-15 2 1 1 0 806 209960 105383 210766
-1003 2015-07-15 2 0 1 1 42953 89027544 44535248.50 89070497
-1007 2015-07-15 1 1 0 0 242 242 242 242
-1011 2015-07-15 2 1 1 0 5255 12201 8728 17456
+1000 2015-07-15 24 9 7 8 235 73134520 7420517.50 178092420
+1001 2015-07-15 4 1 2 1 222 96533552 24163313.75 96653255
+1002 2015-07-15 1 1 0 0 190 190 190 190
+1003 2015-07-15 2 0 1 1 42953 89027544 44535248.50 89070497
+1004 2015-07-15 3 2 1 0 2062 783536 263196.66666666666666666666667 789590
+1006 2015-07-15 3 0 1 2 333841 21659600 8469161.333333333333333333333 25407484
+1007 2015-07-15 1 1 0 0 242 242 242 242
+1008 2015-07-15 1 0 0 1 28953332 28953332 28953332 28953332
+1009 2015-07-15 2 1 1 0 806 209960 105383 210766
+1010 2015-07-15 2 2 0 0 213 2092 1152.50 2305
+1011 2015-07-15 2 1 1 0 5255 12201 8728 17456
+1012 2015-07-15 5 0 2 3 19269 71083760 15656998.60 78284993
diff --git a/e2e_test/streaming/nexmark/q18.slt.part b/e2e_test/streaming/nexmark/q18.slt.part
index de779b1e04086..c1dfc45e64ae8 100644
--- a/e2e_test/streaming/nexmark/q18.slt.part
+++ b/e2e_test/streaming/nexmark/q18.slt.part
@@ -24,4 +24,4 @@ SELECT * FROM nexmark_q18
1011 1001 5255 Google https://www.nexmark.com/vzbh/gkz_/yha/item.htm?query=1 2015-07-15 00:00:10.003 jwqpxghlxenjdndnxxesigkexntlplwjewvocnlygtedoybqjtcgdlxrsjwk
1011 1009 12201 Apple https://www.nexmark.com/rxa/bnn/fl_/item.htm?query=1 2015-07-15 00:00:13.003 itfogghkclpdkraffmwdsyblmwwaxxxgembvwyvzcmxjqejwjjsudqezwbhonfydwubtbnqgct
1012 1001 3378476 channel-5845 https://www.nexmark.com/ph_/qho/awfo/item.htm?query=1 2015-07-15 00:00:20.005 pzekasaqfyqeykupxciyhmstbecetphgcsqpjywqqtttrzbnitwvrkxefbq
-1012 1003 19269 channel-5775 https://www.nexmark.com/g_oh/jlh/q_cf/item.htm?query=1&channel_id=244842496 2015-07-15 00:00:03.001 zvhixblfatttovhezudfnaqkzhngltvwoclmbtiyeikjxqgmcvvhhclaudqyauwat
\ No newline at end of file
+1012 1003 19269 channel-5775 https://www.nexmark.com/g_oh/jlh/q_cf/item.htm?query=1&channel_id=244842496 2015-07-15 00:00:03.001 zvhixblfatttovhezudfnaqkzhngltvwoclmbtiyeikjxqgmcvvhhclaudqyauwat
diff --git a/e2e_test/streaming/nexmark/q21.slt.part b/e2e_test/streaming/nexmark/q21.slt.part
index 232adef1fe79a..b48040fe1a202 100644
--- a/e2e_test/streaming/nexmark/q21.slt.part
+++ b/e2e_test/streaming/nexmark/q21.slt.part
@@ -1,51 +1,51 @@
query IIITT rowsort
SELECT * FROM nexmark_q21
----
-1000 1001 1940 channel-9319 433848320
-1001 1001 84935 Baidu 3
-1010 1002 2092 Baidu 3
-1000 1004 92441 Google 1
-1012 1003 19269 channel-5775 244842496
-1000 1006 1433650 channel-5311 47710208
-1000 1001 10465998 Facebook 2
-1007 1001 242 channel-3148 842006528
-1001 1008 34546 Apple 0
-1004 1001 2062 Baidu 3
-1000 1001 373 channel-426 1434451968
-1000 1004 2349 Apple 0
-1012 1001 170060 channel-4175 234356736
-1008 1002 28953332 channel-5698 1114112000
-1003 1001 89027544 Apple 0
-1010 1001 213 Facebook 2
-1009 1001 209960 Google 1
-1003 1001 42953 channel-7914 1467482112
-1006 1001 3414043 channel-8070 1643642880
-1000 1001 499920 Apple 0
-1000 1001 14909 channel-6340 588775424
-1000 1001 2419091 Google 1
-1000 1001 1930913 channel-497 1887436800
-1002 1001 190 Google 1
-1004 1001 3992 Baidu 3
-1000 1001 28676694 Facebook 2
-1000 1001 506 Google 1
-1000 1007 12655 channel-5136 136839168
-1000 1003 9353 Facebook 2
-1001 1001 222 channel-4639 129499136
-1012 1001 71083760 Apple 0
-1006 1001 333841 Baidu 3
-1009 1001 806 channel-2421 1366294528
-1001 1004 96533552 Facebook 2
-1000 1002 322 channel-2691 1051721728
-1000 1001 567581 channel-4450 1183318016
-1000 1003 647009 Apple 0
-1011 1001 5255 Google 1
-1006 1001 21659600 channel-5594 1537736704
-1000 1010 235 Facebook 2
-1000 1001 522439 channel-1217 2095054848
-1000 1001 3999 channel-7314 1228406784
-1000 1001 43672280 channel-9550 1923350528
-1011 1009 12201 Apple 0
-1004 1000 783536 Baidu 3
-1000 1001 73134520 channel-7568 163053568
-1000 1001 13982877 Baidu 3
-1012 1001 3633428 Google 1
+1000 1001 10465998 Facebook 2
+1000 1001 13982877 Baidu 3
+1000 1001 14909 channel-6340 588775424
+1000 1001 1930913 channel-497 1887436800
+1000 1001 1940 channel-9319 433848320
+1000 1001 2419091 Google 1
+1000 1001 28676694 Facebook 2
+1000 1001 373 channel-426 1434451968
+1000 1001 3999 channel-7314 1228406784
+1000 1001 43672280 channel-9550 1923350528
+1000 1001 499920 Apple 0
+1000 1001 506 Google 1
+1000 1001 522439 channel-1217 2095054848
+1000 1001 567581 channel-4450 1183318016
+1000 1001 73134520 channel-7568 163053568
+1000 1002 322 channel-2691 1051721728
+1000 1003 647009 Apple 0
+1000 1003 9353 Facebook 2
+1000 1004 2349 Apple 0
+1000 1004 92441 Google 1
+1000 1006 1433650 channel-5311 47710208
+1000 1007 12655 channel-5136 136839168
+1000 1010 235 Facebook 2
+1001 1001 222 channel-4639 129499136
+1001 1001 84935 Baidu 3
+1001 1004 96533552 Facebook 2
+1001 1008 34546 Apple 0
+1002 1001 190 Google 1
+1003 1001 42953 channel-7914 1467482112
+1003 1001 89027544 Apple 0
+1004 1000 783536 Baidu 3
+1004 1001 2062 Baidu 3
+1004 1001 3992 Baidu 3
+1006 1001 21659600 channel-5594 1537736704
+1006 1001 333841 Baidu 3
+1006 1001 3414043 channel-8070 1643642880
+1007 1001 242 channel-3148 842006528
+1008 1002 28953332 channel-5698 1114112000
+1009 1001 209960 Google 1
+1009 1001 806 channel-2421 1366294528
+1010 1001 213 Facebook 2
+1010 1002 2092 Baidu 3
+1011 1001 5255 Google 1
+1011 1009 12201 Apple 0
+1012 1001 170060 channel-4175 234356736
+1012 1001 3633428 Google 1
+1012 1001 71083760 Apple 0
+1012 1003 19269 channel-5775 244842496
diff --git a/e2e_test/streaming/nexmark/q22.slt.part b/e2e_test/streaming/nexmark/q22.slt.part
index 353e2378824f8..2dfb51ff57ffb 100644
--- a/e2e_test/streaming/nexmark/q22.slt.part
+++ b/e2e_test/streaming/nexmark/q22.slt.part
@@ -1,53 +1,53 @@
query IIITTTT rowsort
SELECT * FROM nexmark_q22
----
-1000 1001 499920 Apple rxa bnn fl_
-1000 1001 2419091 Google vzbh gkz_ yha
-1008 1002 28953332 channel-5698 _ft bwy hh_
-1009 1001 209960 Google vzbh gkz_ yha
-1003 1001 89027544 Apple rxa bnn fl_
-1003 1001 42953 channel-7914 fkb zfwu tcq
-1000 1001 14909 channel-6340 ykkn wnmu iytk
-1000 1001 1930913 channel-497 _auz ypry xeka
-1010 1001 213 Facebook _mks ppeq sic
-1006 1001 3414043 channel-8070 kyop avga kkq
-1012 1001 3378476 channel-5845 ph_ qho awfo
-1002 1001 190 Google vzbh gkz_ yha
-1000 1001 73134520 channel-7568 rswp ygi _gwv
-1000 1001 43672280 channel-9550 _nq nslg wvuo
-1000 1010 235 Facebook _mks ppeq sic
-1000 1003 647009 Apple rxa bnn fl_
-1000 1001 522439 channel-1217 r_d hry ebdc
-1011 1001 5255 Google vzbh gkz_ yha
-1000 1001 13982877 Baidu pd_ a_y p_f_
-1011 1009 12201 Apple rxa bnn fl_
-1000 1001 3999 channel-7314 zdr zhjp ryr
-1006 1001 21659600 channel-5594 hwl iqr gi__
-1012 1001 3633428 Google vzbh gkz_ yha
-1004 1000 783536 Baidu pd_ a_y p_f_
-1000 1001 1940 channel-9319 myw ifm m_dd
-1012 1003 19269 channel-5775 g_oh jlh q_cf
-1007 1001 242 channel-3148 jgy pdmx h_yl
-1000 1001 373 channel-426 qhfk hhg ti_b
-1001 1008 34546 Apple rxa bnn fl_
-1000 1004 2349 Apple rxa bnn fl_
-1001 1001 84935 Baidu pd_ a_y p_f_
-1000 1006 1433650 channel-5311 __du lcuf nhcz
-1004 1001 2062 Baidu pd_ a_y p_f_
-1012 1001 170060 channel-4175 aa_k kwna dfo_
-1010 1002 2092 Baidu pd_ a_y p_f_
-1000 1001 10465998 Facebook _mks ppeq sic
-1000 1004 92441 Google vzbh gkz_ yha
-1000 1007 12655 channel-5136 xzzn qfz _kk
-1004 1001 3992 Baidu pd_ a_y p_f_
-1001 1004 96533552 Facebook _mks ppeq sic
-1012 1001 71083760 Apple rxa bnn fl_
-1000 1002 322 channel-2691 dyg ozd gp_
-1006 1001 333841 Baidu pd_ a_y p_f_
-1000 1003 9353 Facebook _mks ppeq sic
-1000 1001 28676694 Facebook _mks ppeq sic
-1000 1001 567581 channel-4450 l__ kjxu onl
-1009 1001 806 channel-2421 vicj m_a vop
-1001 1001 222 channel-4639 _lwa jepz slr
-1000 1001 506 Google vzbh gkz_ yha
-1000 1001 366 channel-9891 dhv smk gfok
+1000 1001 10465998 Facebook _mks ppeq sic
+1000 1001 13982877 Baidu pd_ a_y p_f_
+1000 1001 14909 channel-6340 ykkn wnmu iytk
+1000 1001 1930913 channel-497 _auz ypry xeka
+1000 1001 1940 channel-9319 myw ifm m_dd
+1000 1001 2419091 Google vzbh gkz_ yha
+1000 1001 28676694 Facebook _mks ppeq sic
+1000 1001 366 channel-9891 dhv smk gfok
+1000 1001 373 channel-426 qhfk hhg ti_b
+1000 1001 3999 channel-7314 zdr zhjp ryr
+1000 1001 43672280 channel-9550 _nq nslg wvuo
+1000 1001 499920 Apple rxa bnn fl_
+1000 1001 506 Google vzbh gkz_ yha
+1000 1001 522439 channel-1217 r_d hry ebdc
+1000 1001 567581 channel-4450 l__ kjxu onl
+1000 1001 73134520 channel-7568 rswp ygi _gwv
+1000 1002 322 channel-2691 dyg ozd gp_
+1000 1003 647009 Apple rxa bnn fl_
+1000 1003 9353 Facebook _mks ppeq sic
+1000 1004 2349 Apple rxa bnn fl_
+1000 1004 92441 Google vzbh gkz_ yha
+1000 1006 1433650 channel-5311 __du lcuf nhcz
+1000 1007 12655 channel-5136 xzzn qfz _kk
+1000 1010 235 Facebook _mks ppeq sic
+1001 1001 222 channel-4639 _lwa jepz slr
+1001 1001 84935 Baidu pd_ a_y p_f_
+1001 1004 96533552 Facebook _mks ppeq sic
+1001 1008 34546 Apple rxa bnn fl_
+1002 1001 190 Google vzbh gkz_ yha
+1003 1001 42953 channel-7914 fkb zfwu tcq
+1003 1001 89027544 Apple rxa bnn fl_
+1004 1000 783536 Baidu pd_ a_y p_f_
+1004 1001 2062 Baidu pd_ a_y p_f_
+1004 1001 3992 Baidu pd_ a_y p_f_
+1006 1001 21659600 channel-5594 hwl iqr gi__
+1006 1001 333841 Baidu pd_ a_y p_f_
+1006 1001 3414043 channel-8070 kyop avga kkq
+1007 1001 242 channel-3148 jgy pdmx h_yl
+1008 1002 28953332 channel-5698 _ft bwy hh_
+1009 1001 209960 Google vzbh gkz_ yha
+1009 1001 806 channel-2421 vicj m_a vop
+1010 1001 213 Facebook _mks ppeq sic
+1010 1002 2092 Baidu pd_ a_y p_f_
+1011 1001 5255 Google vzbh gkz_ yha
+1011 1009 12201 Apple rxa bnn fl_
+1012 1001 170060 channel-4175 aa_k kwna dfo_
+1012 1001 3378476 channel-5845 ph_ qho awfo
+1012 1001 3633428 Google vzbh gkz_ yha
+1012 1001 71083760 Apple rxa bnn fl_
+1012 1003 19269 channel-5775 g_oh jlh q_cf
diff --git a/e2e_test/streaming/nexmark/q3.slt.part b/e2e_test/streaming/nexmark/q3.slt.part
index 6429078234871..1400b8abf972a 100644
--- a/e2e_test/streaming/nexmark/q3.slt.part
+++ b/e2e_test/streaming/nexmark/q3.slt.part
@@ -1,10 +1,10 @@
query TTTI rowsort
select * from nexmark_q3;
----
-vicky noris boise ca 1021
-vicky noris boise ca 1011
-vicky noris boise ca 1025
-vicky noris boise ca 1002
-vicky noris boise ca 1007
-peter jones seattle or 1026
-vicky noris boise ca 1023
\ No newline at end of file
+peter jones seattle or 1026
+vicky noris boise ca 1002
+vicky noris boise ca 1007
+vicky noris boise ca 1011
+vicky noris boise ca 1021
+vicky noris boise ca 1023
+vicky noris boise ca 1025
diff --git a/e2e_test/streaming/nexmark/q4.slt.part b/e2e_test/streaming/nexmark/q4.slt.part
index 29f03a3824dec..e079537a70197 100644
--- a/e2e_test/streaming/nexmark/q4.slt.part
+++ b/e2e_test/streaming/nexmark/q4.slt.part
@@ -1,8 +1,8 @@
query II rowsort
select * from nexmark_q4;
----
-10 6221.50
-13 96533552
-14 44515768
-12 209960
-11 38966660.80
\ No newline at end of file
+10 6221.50
+11 38966660.80
+12 209960
+13 96533552
+14 44515768
diff --git a/e2e_test/streaming/nexmark/q5.slt.part b/e2e_test/streaming/nexmark/q5.slt.part
index ec5b194c92045..38b762fd37a76 100644
--- a/e2e_test/streaming/nexmark/q5.slt.part
+++ b/e2e_test/streaming/nexmark/q5.slt.part
@@ -1,20 +1,20 @@
query II rowsort
select * from nexmark_q5;
----
-1000 5
-1000 4
-1000 4
-1000 12
-1000 10
-1000 4
-1000 2
-1000 8
-1000 12
-1000 13
-1000 10
-1000 4
-1000 8
-1000 13
-1000 2
-1000 4
-1000 5
+1000 10
+1000 10
+1000 12
+1000 12
+1000 13
+1000 13
+1000 2
+1000 2
+1000 4
+1000 4
+1000 4
+1000 4
+1000 4
+1000 5
+1000 5
+1000 8
+1000 8
diff --git a/e2e_test/streaming/nexmark/q8.slt.part b/e2e_test/streaming/nexmark/q8.slt.part
index 1668ab61e0031..a63ecc6b06c18 100644
--- a/e2e_test/streaming/nexmark/q8.slt.part
+++ b/e2e_test/streaming/nexmark/q8.slt.part
@@ -1,10 +1,10 @@
query II rowsort
select * from nexmark_q8;
----
-1008 vicky white 2015-07-15 00:00:00
-1002 kate jones 2015-07-15 00:00:00
-1006 saul abrams 2015-07-15 00:00:00
-1018 peter jones 2015-07-15 00:00:00
-1000 vicky noris 2015-07-15 00:00:00
-1004 john white 2015-07-15 00:00:00
-1014 paul abrams 2015-07-15 00:00:00
+1000 vicky noris 2015-07-15 00:00:00
+1002 kate jones 2015-07-15 00:00:00
+1004 john white 2015-07-15 00:00:00
+1006 saul abrams 2015-07-15 00:00:00
+1008 vicky white 2015-07-15 00:00:00
+1014 paul abrams 2015-07-15 00:00:00
+1018 peter jones 2015-07-15 00:00:00
diff --git a/e2e_test/streaming/nexmark/views/q15.slt.part b/e2e_test/streaming/nexmark/views/q15.slt.part
index 1e0af374b5046..1d00fef60acdc 100644
--- a/e2e_test/streaming/nexmark/views/q15.slt.part
+++ b/e2e_test/streaming/nexmark/views/q15.slt.part
@@ -15,4 +15,4 @@ SELECT
count(distinct auction) filter (where price >= 10000 and price < 1000000) AS rank2_auctions,
count(distinct auction) filter (where price >= 1000000) AS rank3_auctions
FROM bid
-GROUP BY to_char(date_time, 'YYYY-MM-DD');
\ No newline at end of file
+GROUP BY to_char(date_time, 'YYYY-MM-DD');
diff --git a/e2e_test/streaming/nexmark/views/q16.slt.part b/e2e_test/streaming/nexmark/views/q16.slt.part
index a54b27f488481..e5eab7b95d90c 100644
--- a/e2e_test/streaming/nexmark/views/q16.slt.part
+++ b/e2e_test/streaming/nexmark/views/q16.slt.part
@@ -17,4 +17,4 @@ SELECT
count(distinct auction) filter (where price >= 10000 and price < 1000000) AS rank2_auctions,
count(distinct auction) filter (where price >= 1000000) AS rank3_auctions
FROM bid
-GROUP BY channel, to_char(date_time, 'YYYY-MM-DD');
\ No newline at end of file
+GROUP BY channel, to_char(date_time, 'YYYY-MM-DD');
diff --git a/e2e_test/streaming/nexmark/views/q18.slt.part b/e2e_test/streaming/nexmark/views/q18.slt.part
index 050cf720666b4..a6435ef9f61a6 100644
--- a/e2e_test/streaming/nexmark/views/q18.slt.part
+++ b/e2e_test/streaming/nexmark/views/q18.slt.part
@@ -10,4 +10,4 @@ FROM (
) AS rank_number
FROM bid
)
-WHERE rank_number <= 1;
\ No newline at end of file
+WHERE rank_number <= 1;
diff --git a/e2e_test/streaming/nexmark/views/q9.slt.part b/e2e_test/streaming/nexmark/views/q9.slt.part
index 46b3583c29579..0ad0c395e10bf 100644
--- a/e2e_test/streaming/nexmark/views/q9.slt.part
+++ b/e2e_test/streaming/nexmark/views/q9.slt.part
@@ -10,4 +10,4 @@ FROM (
FROM auction A, bid B
WHERE A.id = B.auction AND B.date_time BETWEEN A.date_time AND A.expires
) tmp
-WHERE rownum <= 1;
\ No newline at end of file
+WHERE rownum <= 1;
diff --git a/e2e_test/streaming/nexmark_snapshot.slt b/e2e_test/streaming/nexmark_snapshot.slt
index c8fa473fe5652..a604177ab6530 100644
--- a/e2e_test/streaming/nexmark_snapshot.slt
+++ b/e2e_test/streaming/nexmark_snapshot.slt
@@ -1,31 +1,53 @@
include ../nexmark/create_tables.slt.part
# First, insert the data into the tables
+
include ../nexmark/insert_person.slt.part
+
include ../nexmark/insert_auction.slt.part
+
include ../nexmark/insert_bid.slt.part
# Then, create materialized views based on the historical data (snapshot)
+
include ./nexmark/create_views.slt.part
# Test each query
+
include ./nexmark/q0.slt.part
+
include ./nexmark/q1.slt.part
+
include ./nexmark/q2.slt.part
+
include ./nexmark/q3.slt.part
+
include ./nexmark/q4.slt.part
+
include ./nexmark/q5.slt.part
+
include ./nexmark/q7.slt.part
+
include ./nexmark/q8.slt.part
+
include ./nexmark/q9.slt.part
+
include ./nexmark/q10.slt.part
+
include ./nexmark/q14.slt.part
+
include ./nexmark/q15.slt.part
+
include ./nexmark/q16.slt.part
+
include ./nexmark/q17.slt.part
+
include ./nexmark/q18.slt.part
+
include ./nexmark/q20.slt.part
+
include ./nexmark/q21.slt.part
+
include ./nexmark/q22.slt.part
include ./nexmark/drop_views.slt.part
diff --git a/e2e_test/streaming/nexmark_upstream.slt b/e2e_test/streaming/nexmark_upstream.slt
index 4d8ea208c4d88..5a450d7ec6652 100644
--- a/e2e_test/streaming/nexmark_upstream.slt
+++ b/e2e_test/streaming/nexmark_upstream.slt
@@ -1,35 +1,58 @@
include ../nexmark/create_tables.slt.part
# First, create materialized views with empty data
+
include ./nexmark/create_views.slt.part
# Then, insert the data into the tables
+
include ../nexmark/insert_person.slt.part
+
include ../nexmark/insert_auction.slt.part
+
include ../nexmark/insert_bid.slt.part
# Ensure that the upstream data is fully consumed
+
statement ok
flush;
# Test each query
+
include ./nexmark/q0.slt.part
+
include ./nexmark/q1.slt.part
+
include ./nexmark/q2.slt.part
+
include ./nexmark/q3.slt.part
+
include ./nexmark/q4.slt.part
+
include ./nexmark/q5.slt.part
+
include ./nexmark/q7.slt.part
+
include ./nexmark/q8.slt.part
+
include ./nexmark/q9.slt.part
+
include ./nexmark/q10.slt.part
+
include ./nexmark/q14.slt.part
+
include ./nexmark/q15.slt.part
+
include ./nexmark/q16.slt.part
+
include ./nexmark/q17.slt.part
+
include ./nexmark/q18.slt.part
+
include ./nexmark/q20.slt.part
+
include ./nexmark/q21.slt.part
+
include ./nexmark/q22.slt.part
include ./nexmark/drop_views.slt.part
diff --git a/e2e_test/streaming/non_strict_mode.slt b/e2e_test/streaming/non_strict_mode.slt
index bd1198c7fe7d7..20ef0397b8790 100644
--- a/e2e_test/streaming/non_strict_mode.slt
+++ b/e2e_test/streaming/non_strict_mode.slt
@@ -16,12 +16,13 @@ create materialized view mv_proj_is_null as select 10/x is null as v from t;
query I rowsort
select * from mv_proj;
----
+10
+5
NULL
NULL
-5
-10
# result for 0 is NULL, instead of true
+
query B rowsort
select * from mv_proj_is_null;
----
@@ -43,6 +44,7 @@ select * from mv_filter;
2
# result for 0 is not included
+
query I rowsort
select * from mv_filter_is_null;
----
diff --git a/e2e_test/streaming/null_safe_equal_join.slt b/e2e_test/streaming/null_safe_equal_join.slt
index 9a30821dcb3bc..4a02df2d9c5b3 100644
--- a/e2e_test/streaming/null_safe_equal_join.slt
+++ b/e2e_test/streaming/null_safe_equal_join.slt
@@ -7,7 +7,6 @@ create table t2 (x int, y int);
statement ok
create table t3(x int, y int);
-
statement ok
create materialized view v as select * from t1 where exists(select t2.x from t2 left join t3 on t2.x = t3.x and t1.y = t2.y and t1.y = t3.y where t1.x = t2.x);
@@ -41,4 +40,4 @@ statement ok
drop table t2
statement ok
-drop table t3
\ No newline at end of file
+drop table t3
diff --git a/e2e_test/streaming/outer_join.slt b/e2e_test/streaming/outer_join.slt
index 700db2baf95a3..55a3667f8a669 100644
--- a/e2e_test/streaming/outer_join.slt
+++ b/e2e_test/streaming/outer_join.slt
@@ -41,7 +41,6 @@ query II rowsort
select * from v;
----
-
statement ok
drop materialized view v;
@@ -49,4 +48,4 @@ statement ok
drop table t1;
statement ok
-drop table t2;
\ No newline at end of file
+drop table t2;
diff --git a/e2e_test/streaming/project_set.slt b/e2e_test/streaming/project_set.slt
index 45bab96bbb840..577a191df4c7f 100644
--- a/e2e_test/streaming/project_set.slt
+++ b/e2e_test/streaming/project_set.slt
@@ -13,13 +13,13 @@ create materialized view mv as select unnest(x) as unnest, x from t;
query I rowsort
select unnest, x from mv;
----
-NULL {1,NULL}
-1 {1,NULL}
-1 {1,2}
-2 {1,2}
-3 {3,4,5}
-4 {3,4,5}
-5 {3,4,5}
+1 {1,2}
+1 {1,NULL}
+2 {1,2}
+3 {3,4,5}
+4 {3,4,5}
+5 {3,4,5}
+NULL {1,NULL}
statement ok
drop materialized view mv;
@@ -57,6 +57,7 @@ statement ok
create table t(c int);
# When inserting into t, mv1 will trigger updates.
+
statement ok
create materialized view mv1 as select array_agg(c) as res from t;
diff --git a/e2e_test/streaming/selective_agg.slt b/e2e_test/streaming/selective_agg.slt
index 2b17e3c784fa2..2bc878b30f0fd 100644
--- a/e2e_test/streaming/selective_agg.slt
+++ b/e2e_test/streaming/selective_agg.slt
@@ -34,4 +34,4 @@ statement ok
drop materialized view mv2;
statement ok
-drop table t;
\ No newline at end of file
+drop table t;
diff --git a/e2e_test/streaming/struct_table.slt b/e2e_test/streaming/struct_table.slt
index 462818456b909..83c3e6aa1fc88 100644
--- a/e2e_test/streaming/struct_table.slt
+++ b/e2e_test/streaming/struct_table.slt
@@ -19,7 +19,6 @@ select * from mv1;
(1,2)
(1,3)
-
statement ok
create table t1 (v1 int, v2 struct<v3 int, v4 struct<v5 int, v6 int>>);
@@ -51,7 +50,6 @@ create materialized view mv3 as select * from t1 order by (v2).v3;
# The result of select * from mv3 is not expected
-
statement ok
drop materialized view mv3;
@@ -65,6 +63,7 @@ statement ok
drop table st;
# More tests to ensure `>>` in struct types can be parsed correctly
+
statement ok
create table t(v2 struct<v1 int, v2 struct<v1 int, v2 int>>, v1 int);
diff --git a/e2e_test/streaming/time_window.slt b/e2e_test/streaming/time_window.slt
index a413c952e6921..138b0c8f18d44 100644
--- a/e2e_test/streaming/time_window.slt
+++ b/e2e_test/streaming/time_window.slt
@@ -146,19 +146,19 @@ drop materialized view mv_hop_agg_1;
statement ok
drop materialized view mv_hop_agg_2;
-statement error
+statement error
create materialized view invalid_hop as
select * from hop(t1, created_at, interval '0', interval '1');
-statement error
+statement error
create materialized view invalid_hop as
select * from hop(t1, created_at, interval '1', interval '-1');
-statement error
+statement error
create materialized view invalid_hop as
select * from hop(t1, created_at, interval '-1', interval '1');
-statement error
+statement error
create materialized view invalid_hop as
select * from hop(t1, created_at, interval '-1', interval '-1');
diff --git a/e2e_test/streaming/tpch/create_views.slt.part b/e2e_test/streaming/tpch/create_views.slt.part
index ad4eded8dd350..f62c4c68d4d55 100644
--- a/e2e_test/streaming/tpch/create_views.slt.part
+++ b/e2e_test/streaming/tpch/create_views.slt.part
@@ -1,22 +1,43 @@
include ./views/q1.slt.part
+
include ./views/q2.slt.part
+
include ./views/q3.slt.part
+
include ./views/q4.slt.part
+
include ./views/q5.slt.part
+
include ./views/q6.slt.part
+
include ./views/q7.slt.part
+
include ./views/q8.slt.part
+
include ./views/q9.slt.part
+
include ./views/q10.slt.part
+
include ./views/q11.slt.part
+
include ./views/q12.slt.part
+
include ./views/q13.slt.part
+
include ./views/q14.slt.part
+
include ./views/q15.slt.part
+
include ./views/q16.slt.part
+
include ./views/q17.slt.part
+
include ./views/q18.slt.part
+
include ./views/q19.slt.part
+
include ./views/q20.slt.part
+
include ./views/q21.slt.part
+
include ./views/q22.slt.part
diff --git a/e2e_test/streaming/tpch/q1.slt.part b/e2e_test/streaming/tpch/q1.slt.part
index ccbb5da453de2..93f8c8d50af57 100644
--- a/e2e_test/streaming/tpch/q1.slt.part
+++ b/e2e_test/streaming/tpch/q1.slt.part
@@ -1,4 +1,5 @@
# scan MV with ORDER BY isn't guaranteed to be ordered
+
query TTRRRRRRRI rowsort
select * from tpch_q1;
----
diff --git a/e2e_test/streaming/tpch/q10.slt.part b/e2e_test/streaming/tpch/q10.slt.part
index 1e202533ef53e..20de60e20b8ba 100644
--- a/e2e_test/streaming/tpch/q10.slt.part
+++ b/e2e_test/streaming/tpch/q10.slt.part
@@ -1,24 +1,25 @@
# scan MV with ORDER BY isn't guaranteed to be ordered
+
query ITRRTTT rowsort
select * from tpch_q10;
----
-136 Customer#000000136 359159.4900 -842.39 GERMANY QoLsJ0v5C1IQbh,DS1 17-501-210-4726 ackages sleep ironic, final courts. even requests above the blithely bold requests g
-70 Customer#000000070 152637.1018 4867.52 RUSSIA mFowIuhnHjp2GjCiYYavkW kUwOjIaTCQ 32-828-107-2832 fter the special asymptotes. ideas after the unusual frets cajole quickly regular pinto be
-127 Customer#000000127 139410.7620 9280.71 VIETNAM Xyge4DX2rXKxXyye1Z47LeLVEYMLf4Bfcj 31-101-672-2951 ic, unusual theodolites nod silently after the final, ironic instructions: pending r
-142 Customer#000000142 129732.1688 2209.81 INDONESIA AnJ5lxtLjioClr2khl9pb8NLxG2, 19-407-425-2584 . even, express theodolites upo
-94 Customer#000000094 109328.4416 5500.11 INDONESIA IfVNIN9KtkScJ9dUjK3Pg5gY1aFeaXewwf 19-953-499-8833 latelets across the bold, final requests sleep according to the fluffily bold accounts. unusual deposits amon
-118 Customer#000000118 108519.0568 3582.37 CHINA OVnFuHygK9wx3xpg8 28-639-943-7051 uick packages alongside of the furiously final deposits haggle above the fluffily even foxes. blithely dogged dep
-139 Customer#000000139 102799.6791 7897.78 INDONESIA 3ElvBwudHKL02732YexGVFVt 19-140-352-1403 nstructions. quickly ironic ideas are carefully. bold,
-25 Customer#000000025 80561.6934 7133.70 JAPAN Hp8GyFQgGHFYSilH5tBfe 22-603-468-3533 y. accounts sleep ruthlessly according to the regular theodolites. unusual instructions sleep. ironic, final
-128 Customer#000000128 74326.7714 -986.96 EGYPT AmKUMlJf2NRHcKGmKjLS 14-280-874-8044 ing packages integrate across the slyly unusual dugouts. blithely silent ideas sublate carefully. blithely expr
-4 Customer#000000004 68199.2151 2866.83 EGYPT XxVSJsLAGtn 14-128-190-5944 requests. final, regular ideas sleep final accou
-14 Customer#000000014 63310.3940 5266.30 ARGENTINA KXkletMlL2JQEA 11-845-129-3851 , ironic packages across the unus
-55 Customer#000000055 54376.8534 4572.11 IRAN zIRBR4KNEl HzaiV3a i9n6elrxzDEh8r8pDom 20-180-440-8525 ully unusual packages wake bravely bold packages. unusual requests boost deposits! blithely ironic packages ab
-46 Customer#000000046 46956.6000 5744.59 FRANCE eaTXWWm10L9 16-357-681-2007 ctions. accounts sleep furiously even requests. regular, regular accounts cajole blithely around the final pa
-23 Customer#000000023 46655.3250 3332.02 CANADA OdY W13N7Be3OC5MpgfmcYss0Wn6TKT 13-312-472-8245 deposits. special deposits cajole slyly. fluffily special deposits about the furiously
-61 Customer#000000061 45467.8872 1536.24 PERU 9kndve4EAJxhg3veF BfXr7AqOsT39o gtqjaYE 27-626-559-8599 egular packages shall have to impress along the
-40 Customer#000000040 44161.9506 1335.30 CANADA gOnGWAyhSV1ofv 13-652-915-8939 rges impress after the slyly ironic courts. foxes are. blithely
-19 Customer#000000019 35730.0870 8914.71 CHINA uc,3bHIx84H,wdrmLOjVsiqXCq2tr 28-396-526-5053 nag. furiously careful packages are slyly at the accounts. furiously regular in
-130 Customer#000000130 31499.4100 5073.58 INDONESIA RKPx2OfZy0Vn 8wGWZ7F2EAvmMORl1k8iH 19-190-993-9281 ix slowly. express packages along the furiously ironic requests integrate daringly deposits. fur
-88 Customer#000000088 29032.1268 8031.44 MOZAMBIQUE wtkjBN9eyrFuENSMmMFlJ3e7jE5KXcg 26-516-273-2566 s are quickly above the quickly ironic instructions; even requests about the carefully final deposi
-85 Customer#000000085 27823.5600 3386.64 ETHIOPIA siRerlDwiolhYR 8FgksoezycLj 15-745-585-8219 ronic ideas use above the slowly pendin
+118 Customer#000000118 108519.0568 3582.37 CHINA OVnFuHygK9wx3xpg8 28-639-943-7051 uick packages alongside of the furiously final deposits haggle above the fluffily even foxes. blithely dogged dep
+127 Customer#000000127 139410.7620 9280.71 VIETNAM Xyge4DX2rXKxXyye1Z47LeLVEYMLf4Bfcj 31-101-672-2951 ic, unusual theodolites nod silently after the final, ironic instructions: pending r
+128 Customer#000000128 74326.7714 -986.96 EGYPT AmKUMlJf2NRHcKGmKjLS 14-280-874-8044 ing packages integrate across the slyly unusual dugouts. blithely silent ideas sublate carefully. blithely expr
+130 Customer#000000130 31499.4100 5073.58 INDONESIA RKPx2OfZy0Vn 8wGWZ7F2EAvmMORl1k8iH 19-190-993-9281 ix slowly. express packages along the furiously ironic requests integrate daringly deposits. fur
+136 Customer#000000136 359159.4900 -842.39 GERMANY QoLsJ0v5C1IQbh,DS1 17-501-210-4726 ackages sleep ironic, final courts. even requests above the blithely bold requests g
+139 Customer#000000139 102799.6791 7897.78 INDONESIA 3ElvBwudHKL02732YexGVFVt 19-140-352-1403 nstructions. quickly ironic ideas are carefully. bold,
+14 Customer#000000014 63310.3940 5266.30 ARGENTINA KXkletMlL2JQEA 11-845-129-3851 , ironic packages across the unus
+142 Customer#000000142 129732.1688 2209.81 INDONESIA AnJ5lxtLjioClr2khl9pb8NLxG2, 19-407-425-2584 . even, express theodolites upo
+19 Customer#000000019 35730.0870 8914.71 CHINA uc,3bHIx84H,wdrmLOjVsiqXCq2tr 28-396-526-5053 nag. furiously careful packages are slyly at the accounts. furiously regular in
+23 Customer#000000023 46655.3250 3332.02 CANADA OdY W13N7Be3OC5MpgfmcYss0Wn6TKT 13-312-472-8245 deposits. special deposits cajole slyly. fluffily special deposits about the furiously
+25 Customer#000000025 80561.6934 7133.70 JAPAN Hp8GyFQgGHFYSilH5tBfe 22-603-468-3533 y. accounts sleep ruthlessly according to the regular theodolites. unusual instructions sleep. ironic, final
+4 Customer#000000004 68199.2151 2866.83 EGYPT XxVSJsLAGtn 14-128-190-5944 requests. final, regular ideas sleep final accou
+40 Customer#000000040 44161.9506 1335.30 CANADA gOnGWAyhSV1ofv 13-652-915-8939 rges impress after the slyly ironic courts. foxes are. blithely
+46 Customer#000000046 46956.6000 5744.59 FRANCE eaTXWWm10L9 16-357-681-2007 ctions. accounts sleep furiously even requests. regular, regular accounts cajole blithely around the final pa
+55 Customer#000000055 54376.8534 4572.11 IRAN zIRBR4KNEl HzaiV3a i9n6elrxzDEh8r8pDom 20-180-440-8525 ully unusual packages wake bravely bold packages. unusual requests boost deposits! blithely ironic packages ab
+61 Customer#000000061 45467.8872 1536.24 PERU 9kndve4EAJxhg3veF BfXr7AqOsT39o gtqjaYE 27-626-559-8599 egular packages shall have to impress along the
+70 Customer#000000070 152637.1018 4867.52 RUSSIA mFowIuhnHjp2GjCiYYavkW kUwOjIaTCQ 32-828-107-2832 fter the special asymptotes. ideas after the unusual frets cajole quickly regular pinto be
+85 Customer#000000085 27823.5600 3386.64 ETHIOPIA siRerlDwiolhYR 8FgksoezycLj 15-745-585-8219 ronic ideas use above the slowly pendin
+88 Customer#000000088 29032.1268 8031.44 MOZAMBIQUE wtkjBN9eyrFuENSMmMFlJ3e7jE5KXcg 26-516-273-2566 s are quickly above the quickly ironic instructions; even requests about the carefully final deposi
+94 Customer#000000094 109328.4416 5500.11 INDONESIA IfVNIN9KtkScJ9dUjK3Pg5gY1aFeaXewwf 19-953-499-8833 latelets across the bold, final requests sleep according to the fluffily bold accounts. unusual deposits amon
diff --git a/e2e_test/streaming/tpch/q11.slt.part b/e2e_test/streaming/tpch/q11.slt.part
index 1c00d725b12d4..e3f469cdffdd5 100644
--- a/e2e_test/streaming/tpch/q11.slt.part
+++ b/e2e_test/streaming/tpch/q11.slt.part
@@ -1,72 +1,72 @@
query IR rowsort
select * from tpch_q11;
----
-175 9253263.4
-142 8273960.3
-124 8203209.3
-116 7520874.2
-51 7264184.5
-168 7244030.2
-73 7115781.1
-130 6530034.1
-199 6339641.5
-166 5445353.3
-182 5191583.7
-82 4979187.2
-72 4900497.3
-75 4808130.4
-74 4702018.3
-100 4642272.6
-30 4638608.8
-24 4180139.5
-44 3997453.7
-158 3737919.4
-68 3690702.4
-108 3469209.3
-22 3467053.8
-2 3366668.6
-13 3185424.5
-91 2951493.4
-155 2924499.5
-200 2895688.3
-12 2381625.3
-99 2353581.3
-151 2298313.0
-10 2245355.5
-19 2217961.9
-8 2172003.9
-132 2125100.7
-58 2118624.6
-92 2091581.4
-42 2073731.3
-55 1998844.2
-144 1963651.4
-50 1854529.6
-28 1825685.6
-172 1812423.0
-64 1811894.6
-128 1706573.0
-110 1635451.6
-137 1470383.5
-62 1232507.6
-102 1213422.0
-66 1148101.4
-6 1130989.3
-37 1080432.4
-119 982887.8
-112 948072.8
-46 909722.4
-32 894484.1
-191 786330.8
-16 667751.1
-113 663824.2
-106 647708.1
-173 583317.5
-146 573455.5
-122 459864.5
-52 358792.4
-162 290757.6
-152 229781.6
-164 179298.7
-192 120406.1
-150 106928.1
+10 2245355.5
+100 4642272.6
+102 1213422.0
+106 647708.1
+108 3469209.3
+110 1635451.6
+112 948072.8
+113 663824.2
+116 7520874.2
+119 982887.8
+12 2381625.3
+122 459864.5
+124 8203209.3
+128 1706573.0
+13 3185424.5
+130 6530034.1
+132 2125100.7
+137 1470383.5
+142 8273960.3
+144 1963651.4
+146 573455.5
+150 106928.1
+151 2298313.0
+152 229781.6
+155 2924499.5
+158 3737919.4
+16 667751.1
+162 290757.6
+164 179298.7
+166 5445353.3
+168 7244030.2
+172 1812423.0
+173 583317.5
+175 9253263.4
+182 5191583.7
+19 2217961.9
+191 786330.8
+192 120406.1
+199 6339641.5
+2 3366668.6
+200 2895688.3
+22 3467053.8
+24 4180139.5
+28 1825685.6
+30 4638608.8
+32 894484.1
+37 1080432.4
+42 2073731.3
+44 3997453.7
+46 909722.4
+50 1854529.6
+51 7264184.5
+52 358792.4
+55 1998844.2
+58 2118624.6
+6 1130989.3
+62 1232507.6
+64 1811894.6
+66 1148101.4
+68 3690702.4
+72 4900497.3
+73 7115781.1
+74 4702018.3
+75 4808130.4
+8 2172003.9
+82 4979187.2
+91 2951493.4
+92 2091581.4
+99 2353581.3
diff --git a/e2e_test/streaming/tpch/q12.slt.part b/e2e_test/streaming/tpch/q12.slt.part
index f2e6e46c3230e..95d17a0081ef3 100644
--- a/e2e_test/streaming/tpch/q12.slt.part
+++ b/e2e_test/streaming/tpch/q12.slt.part
@@ -1,4 +1,5 @@
# scan MV with ORDER BY isn't guaranteed to be ordered
+
query TII rowsort
select * from tpch_q12;
----
diff --git a/e2e_test/streaming/tpch/q13.slt.part b/e2e_test/streaming/tpch/q13.slt.part
index 55733b83cceac..17816f221959f 100644
--- a/e2e_test/streaming/tpch/q13.slt.part
+++ b/e2e_test/streaming/tpch/q13.slt.part
@@ -1,31 +1,32 @@
# scan MV with ORDER BY isn't guaranteed to be ordered
+
query II rowsort
select * from tpch_q13;
----
-0 50
-16 8
-17 7
-14 6
-12 6
-20 5
-13 5
-10 5
-9 5
-26 4
-23 4
-22 4
-21 4
-19 4
-11 4
-8 4
-7 4
-6 4
-24 3
-15 3
-4 3
-18 2
-5 2
-30 1
-29 1
-28 1
-3 1
+0 50
+10 5
+11 4
+12 6
+13 5
+14 6
+15 3
+16 8
+17 7
+18 2
+19 4
+20 5
+21 4
+22 4
+23 4
+24 3
+26 4
+28 1
+29 1
+3 1
+30 1
+4 3
+5 2
+6 4
+7 4
+8 4
+9 5
diff --git a/e2e_test/streaming/tpch/q16.slt.part b/e2e_test/streaming/tpch/q16.slt.part
index a0bfc5fd96650..2e213415a32e1 100644
--- a/e2e_test/streaming/tpch/q16.slt.part
+++ b/e2e_test/streaming/tpch/q16.slt.part
@@ -1,4 +1,5 @@
# Scan MV with ORDER BY isn't guaranteed to be ordered (#4330)
+
query TTII rowsort
select
p_brand,
@@ -8,35 +9,35 @@ select
from
tpch_q16;
----
-Brand#12 PROMO PLATED NICKEL 41 4
-Brand#13 LARGE BRUSHED BRASS 1 4
-Brand#13 PROMO BURNISHED COPPER 7 4
-Brand#21 LARGE BURNISHED COPPER 19 4
-Brand#21 MEDIUM ANODIZED BRASS 1 4
-Brand#21 MEDIUM BRUSHED STEEL 42 4
-Brand#23 ECONOMY ANODIZED TIN 7 4
-Brand#24 PROMO PLATED STEEL 4 4
-Brand#32 PROMO ANODIZED STEEL 1 4
-Brand#32 STANDARD POLISHED TIN 15 4
-Brand#33 ECONOMY ANODIZED TIN 4 4
-Brand#33 PROMO PLATED COPPER 7 4
-Brand#33 STANDARD BURNISHED NICKEL 7 4
-Brand#34 ECONOMY PLATED TIN 44 4
-Brand#35 MEDIUM BURNISHED TIN 42 4
-Brand#43 PROMO BRUSHED STEEL 42 4
-Brand#43 PROMO POLISHED BRASS 19 4
-Brand#44 PROMO BURNISHED TIN 41 4
-Brand#45 MEDIUM BRUSHED NICKEL 4 4
-Brand#51 ECONOMY POLISHED STEEL 7 4
-Brand#51 MEDIUM POLISHED NICKEL 41 4
-Brand#52 LARGE POLISHED COPPER 4 4
-Brand#53 STANDARD POLISHED TIN 44 4
-Brand#54 LARGE BURNISHED STEEL 44 4
-Brand#55 MEDIUM BURNISHED NICKEL 1 4
-Brand#13 ECONOMY BURNISHED COPPER 42 2
-Brand#32 MEDIUM BRUSHED STEEL 7 2
-Brand#23 ECONOMY BRUSHED TIN 15 1
-Brand#24 MEDIUM PLATED STEEL 19 1
-Brand#41 LARGE PLATED STEEL 41 1
-Brand#44 ECONOMY POLISHED TIN 4 1
-Brand#53 STANDARD BURNISHED STEEL 7 1
+Brand#12 PROMO PLATED NICKEL 41 4
+Brand#13 ECONOMY BURNISHED COPPER 42 2
+Brand#13 LARGE BRUSHED BRASS 1 4
+Brand#13 PROMO BURNISHED COPPER 7 4
+Brand#21 LARGE BURNISHED COPPER 19 4
+Brand#21 MEDIUM ANODIZED BRASS 1 4
+Brand#21 MEDIUM BRUSHED STEEL 42 4
+Brand#23 ECONOMY ANODIZED TIN 7 4
+Brand#23 ECONOMY BRUSHED TIN 15 1
+Brand#24 MEDIUM PLATED STEEL 19 1
+Brand#24 PROMO PLATED STEEL 4 4
+Brand#32 MEDIUM BRUSHED STEEL 7 2
+Brand#32 PROMO ANODIZED STEEL 1 4
+Brand#32 STANDARD POLISHED TIN 15 4
+Brand#33 ECONOMY ANODIZED TIN 4 4
+Brand#33 PROMO PLATED COPPER 7 4
+Brand#33 STANDARD BURNISHED NICKEL 7 4
+Brand#34 ECONOMY PLATED TIN 44 4
+Brand#35 MEDIUM BURNISHED TIN 42 4
+Brand#41 LARGE PLATED STEEL 41 1
+Brand#43 PROMO BRUSHED STEEL 42 4
+Brand#43 PROMO POLISHED BRASS 19 4
+Brand#44 ECONOMY POLISHED TIN 4 1
+Brand#44 PROMO BURNISHED TIN 41 4
+Brand#45 MEDIUM BRUSHED NICKEL 4 4
+Brand#51 ECONOMY POLISHED STEEL 7 4
+Brand#51 MEDIUM POLISHED NICKEL 41 4
+Brand#52 LARGE POLISHED COPPER 4 4
+Brand#53 STANDARD BURNISHED STEEL 7 1
+Brand#53 STANDARD POLISHED TIN 44 4
+Brand#54 LARGE BURNISHED STEEL 44 4
+Brand#55 MEDIUM BURNISHED NICKEL 1 4
diff --git a/e2e_test/streaming/tpch/q18.slt.part b/e2e_test/streaming/tpch/q18.slt.part
index b72190e066f6b..6d1cc135d773b 100644
--- a/e2e_test/streaming/tpch/q18.slt.part
+++ b/e2e_test/streaming/tpch/q18.slt.part
@@ -1,104 +1,105 @@
# scan MV with ORDER BY isn't guaranteed to be ordered
+
query TIITRR rowsort
select * from tpch_q18;
----
-Customer#000000070 70 2567 1998-02-27 263411.29 266
-Customer#000000010 10 4421 1997-04-04 258779.02 255
-Customer#000000052 52 5765 1994-12-15 249900.42 247
-Customer#000000082 82 3460 1995-10-03 245976.74 254
-Customer#000000068 68 2208 1995-05-01 245388.06 256
-Customer#000000028 28 2306 1995-07-26 244704.23 235
-Customer#000000146 146 5925 1995-11-13 242588.87 242
-Customer#000000029 29 1121 1997-01-13 241837.88 242
-Customer#000000067 67 3907 1992-08-19 240457.56 239
-Customer#000000076 76 5158 1997-01-21 240284.95 248
-Customer#000000131 131 4484 1996-12-24 237947.61 243
-Customer#000000115 115 645 1994-12-03 234763.73 245
-Customer#000000049 49 4294 1992-08-15 232194.74 225
-Customer#000000076 76 1477 1997-08-24 231831.35 236
-Customer#000000044 44 4645 1994-09-20 231012.22 248
-Customer#000000089 89 5957 1993-12-27 230949.45 242
-Customer#000000076 76 326 1995-06-04 229165.17 228
-Customer#000000067 67 928 1995-03-02 228136.49 241
-Customer#000000079 79 3808 1994-04-24 228054.01 227
-Customer#000000037 37 5317 1994-09-09 228002.51 231
-Customer#000000004 4 358 1993-09-20 226806.66 223
-Customer#000000142 142 5699 1992-07-30 226314.91 240
-Customer#000000121 121 1888 1993-10-31 224724.11 225
-Customer#000000094 94 2690 1996-03-31 224674.27 219
-Customer#000000094 94 5413 1997-10-17 224382.57 212
-Customer#000000032 32 5381 1993-01-29 223995.46 228
-Customer#000000145 145 518 1998-02-08 223537.09 214
-Customer#000000029 29 2945 1996-01-03 223507.72 231
-Customer#000000007 7 3654 1992-06-03 222653.54 222
-Customer#000000145 145 807 1993-11-24 222392.53 216
-Customer#000000149 149 3619 1996-11-20 222274.54 221
-Customer#000000070 70 5472 1993-04-11 221636.83 217
-Customer#000000137 137 4900 1992-06-30 221320.76 227
-Customer#000000106 106 3778 1993-05-26 221036.31 225
-Customer#000000121 121 1153 1996-04-18 220727.97 209
-Customer#000000070 70 4004 1993-05-07 220715.14 228
-Customer#000000098 98 768 1996-08-20 220636.82 231
-Customer#000000149 149 5606 1996-11-12 219959.08 231
-Customer#000000055 55 484 1997-01-03 219920.62 224
-Customer#000000140 140 4230 1992-03-04 219709.60 217
-Customer#000000082 82 39 1996-09-20 219707.84 231
-Customer#000000037 37 2789 1998-03-14 219123.27 218
-Customer#000000017 17 3269 1996-03-01 218697.85 220
-Customer#000000149 149 3590 1995-05-13 218482.70 210
-Customer#000000134 134 614 1992-12-01 218116.21 204
-Customer#000000092 92 4197 1996-08-13 217709.03 225
-Customer#000000133 133 1156 1996-10-19 217682.81 218
-Customer#000000046 46 453 1997-05-26 216826.73 226
-Customer#000000124 124 3109 1993-07-24 216104.85 210
-Customer#000000043 43 4994 1996-06-29 216071.76 213
-Customer#000000149 149 3713 1998-05-07 215342.63 213
-Customer#000000029 29 68 1998-04-18 215135.72 213
-Customer#000000013 13 2438 1993-07-15 214494.39 210
-Customer#000000133 133 4613 1998-03-05 212339.55 214
-Customer#000000106 106 1761 1993-12-24 211925.95 218
-Customer#000000049 49 1248 1992-01-02 210713.88 207
-Customer#000000005 5 5859 1997-04-23 210643.96 211
-Customer#000000106 106 1827 1996-06-22 210113.88 205
-Customer#000000085 85 5184 1998-07-20 209155.48 213
-Customer#000000133 133 710 1993-01-02 208974.42 196
-Customer#000000052 52 5186 1996-08-03 208892.63 210
-Customer#000000028 28 2050 1994-06-02 208517.98 217
-Customer#000000076 76 2180 1996-09-14 208481.57 212
-Customer#000000119 119 3588 1995-03-19 207925.83 212
-Customer#000000134 134 1444 1994-12-06 207907.60 205
-Customer#000000103 103 742 1994-12-23 207632.55 198
-Customer#000000017 17 4099 1992-08-21 207364.80 208
-Customer#000000109 109 1286 1993-05-14 207291.83 200
-Customer#000000079 79 5633 1998-05-31 207119.83 203
-Customer#000000062 62 2022 1992-03-15 206742.11 209
-Customer#000000022 22 4583 1994-09-25 206495.43 197
-Customer#000000148 148 5185 1997-07-25 206179.68 198
-Customer#000000044 44 3175 1994-07-15 205282.63 215
-Customer#000000056 56 2565 1998-02-28 204438.57 201
-Customer#000000149 149 3747 1996-08-20 204355.65 195
-Customer#000000101 101 4964 1997-07-28 204163.10 197
-Customer#000000062 62 4992 1992-05-10 203904.80 198
-Customer#000000010 10 3751 1994-04-27 202917.72 204
-Customer#000000076 76 2534 1996-07-17 202784.54 214
-Customer#000000001 1 164 1992-10-21 202660.52 213
-Customer#000000118 118 1283 1996-08-30 202623.92 200
-Customer#000000010 10 1890 1996-12-18 202364.58 207
-Customer#000000077 77 1762 1994-08-20 202227.17 216
-Customer#000000106 106 4196 1998-05-15 201455.98 198
-Customer#000000064 64 5895 1997-01-01 201419.83 200
-Customer#000000008 8 644 1992-05-01 201268.06 202
-Customer#000000047 47 261 1993-06-29 201003.12 200
-Customer#000000079 79 4672 1995-11-07 199593.71 203
-Customer#000000131 131 930 1994-12-17 199102.23 204
-Customer#000000118 118 4161 1993-08-21 198995.21 211
-Customer#000000073 73 4069 1992-05-13 198816.13 199
-Customer#000000142 142 5696 1995-05-04 198723.30 198
-Customer#000000134 134 3872 1996-09-06 198538.68 207
-Customer#000000127 127 1059 1994-02-27 198360.22 194
-Customer#000000103 103 4293 1996-08-20 198322.91 202
-Customer#000000080 80 993 1995-09-10 198238.65 194
-Customer#000000091 91 420 1995-10-31 198039.23 200
-Customer#000000092 92 3333 1992-09-16 197973.22 195
-Customer#000000146 146 4192 1998-04-19 197192.95 209
-Customer#000000145 145 1575 1995-09-13 197031.52 204
+Customer#000000001 1 164 1992-10-21 202660.52 213
+Customer#000000004 4 358 1993-09-20 226806.66 223
+Customer#000000005 5 5859 1997-04-23 210643.96 211
+Customer#000000007 7 3654 1992-06-03 222653.54 222
+Customer#000000008 8 644 1992-05-01 201268.06 202
+Customer#000000010 10 1890 1996-12-18 202364.58 207
+Customer#000000010 10 3751 1994-04-27 202917.72 204
+Customer#000000010 10 4421 1997-04-04 258779.02 255
+Customer#000000013 13 2438 1993-07-15 214494.39 210
+Customer#000000017 17 3269 1996-03-01 218697.85 220
+Customer#000000017 17 4099 1992-08-21 207364.80 208
+Customer#000000022 22 4583 1994-09-25 206495.43 197
+Customer#000000028 28 2050 1994-06-02 208517.98 217
+Customer#000000028 28 2306 1995-07-26 244704.23 235
+Customer#000000029 29 1121 1997-01-13 241837.88 242
+Customer#000000029 29 2945 1996-01-03 223507.72 231
+Customer#000000029 29 68 1998-04-18 215135.72 213
+Customer#000000032 32 5381 1993-01-29 223995.46 228
+Customer#000000037 37 2789 1998-03-14 219123.27 218
+Customer#000000037 37 5317 1994-09-09 228002.51 231
+Customer#000000043 43 4994 1996-06-29 216071.76 213
+Customer#000000044 44 3175 1994-07-15 205282.63 215
+Customer#000000044 44 4645 1994-09-20 231012.22 248
+Customer#000000046 46 453 1997-05-26 216826.73 226
+Customer#000000047 47 261 1993-06-29 201003.12 200
+Customer#000000049 49 1248 1992-01-02 210713.88 207
+Customer#000000049 49 4294 1992-08-15 232194.74 225
+Customer#000000052 52 5186 1996-08-03 208892.63 210
+Customer#000000052 52 5765 1994-12-15 249900.42 247
+Customer#000000055 55 484 1997-01-03 219920.62 224
+Customer#000000056 56 2565 1998-02-28 204438.57 201
+Customer#000000062 62 2022 1992-03-15 206742.11 209
+Customer#000000062 62 4992 1992-05-10 203904.80 198
+Customer#000000064 64 5895 1997-01-01 201419.83 200
+Customer#000000067 67 3907 1992-08-19 240457.56 239
+Customer#000000067 67 928 1995-03-02 228136.49 241
+Customer#000000068 68 2208 1995-05-01 245388.06 256
+Customer#000000070 70 2567 1998-02-27 263411.29 266
+Customer#000000070 70 4004 1993-05-07 220715.14 228
+Customer#000000070 70 5472 1993-04-11 221636.83 217
+Customer#000000073 73 4069 1992-05-13 198816.13 199
+Customer#000000076 76 1477 1997-08-24 231831.35 236
+Customer#000000076 76 2180 1996-09-14 208481.57 212
+Customer#000000076 76 2534 1996-07-17 202784.54 214
+Customer#000000076 76 326 1995-06-04 229165.17 228
+Customer#000000076 76 5158 1997-01-21 240284.95 248
+Customer#000000077 77 1762 1994-08-20 202227.17 216
+Customer#000000079 79 3808 1994-04-24 228054.01 227
+Customer#000000079 79 4672 1995-11-07 199593.71 203
+Customer#000000079 79 5633 1998-05-31 207119.83 203
+Customer#000000080 80 993 1995-09-10 198238.65 194
+Customer#000000082 82 3460 1995-10-03 245976.74 254
+Customer#000000082 82 39 1996-09-20 219707.84 231
+Customer#000000085 85 5184 1998-07-20 209155.48 213
+Customer#000000089 89 5957 1993-12-27 230949.45 242
+Customer#000000091 91 420 1995-10-31 198039.23 200
+Customer#000000092 92 3333 1992-09-16 197973.22 195
+Customer#000000092 92 4197 1996-08-13 217709.03 225
+Customer#000000094 94 2690 1996-03-31 224674.27 219
+Customer#000000094 94 5413 1997-10-17 224382.57 212
+Customer#000000098 98 768 1996-08-20 220636.82 231
+Customer#000000101 101 4964 1997-07-28 204163.10 197
+Customer#000000103 103 4293 1996-08-20 198322.91 202
+Customer#000000103 103 742 1994-12-23 207632.55 198
+Customer#000000106 106 1761 1993-12-24 211925.95 218
+Customer#000000106 106 1827 1996-06-22 210113.88 205
+Customer#000000106 106 3778 1993-05-26 221036.31 225
+Customer#000000106 106 4196 1998-05-15 201455.98 198
+Customer#000000109 109 1286 1993-05-14 207291.83 200
+Customer#000000115 115 645 1994-12-03 234763.73 245
+Customer#000000118 118 1283 1996-08-30 202623.92 200
+Customer#000000118 118 4161 1993-08-21 198995.21 211
+Customer#000000119 119 3588 1995-03-19 207925.83 212
+Customer#000000121 121 1153 1996-04-18 220727.97 209
+Customer#000000121 121 1888 1993-10-31 224724.11 225
+Customer#000000124 124 3109 1993-07-24 216104.85 210
+Customer#000000127 127 1059 1994-02-27 198360.22 194
+Customer#000000131 131 4484 1996-12-24 237947.61 243
+Customer#000000131 131 930 1994-12-17 199102.23 204
+Customer#000000133 133 1156 1996-10-19 217682.81 218
+Customer#000000133 133 4613 1998-03-05 212339.55 214
+Customer#000000133 133 710 1993-01-02 208974.42 196
+Customer#000000134 134 1444 1994-12-06 207907.60 205
+Customer#000000134 134 3872 1996-09-06 198538.68 207
+Customer#000000134 134 614 1992-12-01 218116.21 204
+Customer#000000137 137 4900 1992-06-30 221320.76 227
+Customer#000000140 140 4230 1992-03-04 219709.60 217
+Customer#000000142 142 5696 1995-05-04 198723.30 198
+Customer#000000142 142 5699 1992-07-30 226314.91 240
+Customer#000000145 145 1575 1995-09-13 197031.52 204
+Customer#000000145 145 518 1998-02-08 223537.09 214
+Customer#000000145 145 807 1993-11-24 222392.53 216
+Customer#000000146 146 4192 1998-04-19 197192.95 209
+Customer#000000146 146 5925 1995-11-13 242588.87 242
+Customer#000000148 148 5185 1997-07-25 206179.68 198
+Customer#000000149 149 3590 1995-05-13 218482.70 210
+Customer#000000149 149 3619 1996-11-20 222274.54 221
+Customer#000000149 149 3713 1998-05-07 215342.63 213
+Customer#000000149 149 3747 1996-08-20 204355.65 195
+Customer#000000149 149 5606 1996-11-12 219959.08 231
diff --git a/e2e_test/streaming/tpch/q2.slt.part b/e2e_test/streaming/tpch/q2.slt.part
index 3bf6b4b4eeb29..f562b1bc50123 100644
--- a/e2e_test/streaming/tpch/q2.slt.part
+++ b/e2e_test/streaming/tpch/q2.slt.part
@@ -1,4 +1,5 @@
# scan MV with ORDER BY isn't guaranteed to be ordered
+
query RTTITTTT rowsort
select
s_acctbal,
@@ -11,5 +12,5 @@ select
s_comment
from tpch_q2;
----
-4641.08 Supplier#000000004 MOROCCO 100 Manufacturer#3 Bk7ah4CK8SYQTepEmvMkkgMwg 25-843-787-7479 riously even requests above the exp
-1365.79 Supplier#000000006 KENYA 185 Manufacturer#4 tQxuVm7s7CnK 24-696-997-4969 final accounts. regular dolphins use against the furiously ironic decoys.
+1365.79 Supplier#000000006 KENYA 185 Manufacturer#4 tQxuVm7s7CnK 24-696-997-4969 final accounts. regular dolphins use against the furiously ironic decoys.
+4641.08 Supplier#000000004 MOROCCO 100 Manufacturer#3 Bk7ah4CK8SYQTepEmvMkkgMwg 25-843-787-7479 riously even requests above the exp
diff --git a/e2e_test/streaming/tpch/q3.slt.part b/e2e_test/streaming/tpch/q3.slt.part
index aae4f8816c4ab..cd3e14949bbc8 100644
--- a/e2e_test/streaming/tpch/q3.slt.part
+++ b/e2e_test/streaming/tpch/q3.slt.part
@@ -1,14 +1,15 @@
# scan MV with ORDER BY isn't guaranteed to be ordered
+
query IRTI rowsort
select * from tpch_q3;
----
-3588 199498.4104 1995-03-19 0
-4327 123939.6659 1995-03-16 0
-5347 118914.1310 1995-02-22 0
-450 111508.1186 1995-03-05 0
-1767 109576.4152 1995-03-14 0
-386 86258.3745 1995-01-25 0
-897 54854.6063 1995-03-20 0
-2982 54150.4719 1995-03-19 0
-3526 51178.7043 1995-03-16 0
-2277 42401.7338 1995-01-02 0
+1767 109576.4152 1995-03-14 0
+2277 42401.7338 1995-01-02 0
+2982 54150.4719 1995-03-19 0
+3526 51178.7043 1995-03-16 0
+3588 199498.4104 1995-03-19 0
+386 86258.3745 1995-01-25 0
+4327 123939.6659 1995-03-16 0
+450 111508.1186 1995-03-05 0
+5347 118914.1310 1995-02-22 0
+897 54854.6063 1995-03-20 0
diff --git a/e2e_test/streaming/tpch/q4.slt.part b/e2e_test/streaming/tpch/q4.slt.part
index 86b3a725828b2..d33156996542e 100644
--- a/e2e_test/streaming/tpch/q4.slt.part
+++ b/e2e_test/streaming/tpch/q4.slt.part
@@ -1,4 +1,5 @@
# scan MV with ORDER BY isn't guaranteed to be ordered
+
query TI rowsort
select * from tpch_q4;
----
diff --git a/e2e_test/streaming/tpch/q5.slt.part b/e2e_test/streaming/tpch/q5.slt.part
index 80ed6bf56cd75..08b89a6eafc12 100644
--- a/e2e_test/streaming/tpch/q5.slt.part
+++ b/e2e_test/streaming/tpch/q5.slt.part
@@ -1,6 +1,7 @@
# scan MV with ORDER BY isn't guaranteed to be ordered
+
query TR rowsort
select * from tpch_q5;
----
-IRAQ 74391.7890
-IRAN 41912.9640
+IRAN 41912.9640
+IRAQ 74391.7890
diff --git a/e2e_test/streaming/tpch/q7.slt.part b/e2e_test/streaming/tpch/q7.slt.part
index 66a9a45acd8d0..08d85138a7ac0 100644
--- a/e2e_test/streaming/tpch/q7.slt.part
+++ b/e2e_test/streaming/tpch/q7.slt.part
@@ -1,4 +1,5 @@
# scan MV with ORDER BY isn't guaranteed to be ordered
+
query TTRR rowsort
select * from tpch_q7;
----
@@ -8,4 +9,3 @@ IRAN ROMANIA 1995 84411.4801
IRAN ROMANIA 1996 142296.4245
IRAN ROMANIA 1997 59846.7019
IRAN ROMANIA 1998 154730.1173
-
diff --git a/e2e_test/streaming/tpch/q8.slt.part b/e2e_test/streaming/tpch/q8.slt.part
index 2c90182fbce61..dd169b6f09301 100644
--- a/e2e_test/streaming/tpch/q8.slt.part
+++ b/e2e_test/streaming/tpch/q8.slt.part
@@ -1,4 +1,5 @@
# scan MV with ORDER BY isn't guaranteed to be ordered
+
query TR rowsort
select * from tpch_q8;
----
diff --git a/e2e_test/streaming/tpch/q9.slt.part b/e2e_test/streaming/tpch/q9.slt.part
index 142bff38058c3..585bdb6937ded 100644
--- a/e2e_test/streaming/tpch/q9.slt.part
+++ b/e2e_test/streaming/tpch/q9.slt.part
@@ -1,65 +1,66 @@
# scan MV with ORDER BY isn't guaranteed to be ordered
+
query TRR rowsort
select * from tpch_q9;
----
-ARGENTINA 1998 17702.73
-ARGENTINA 1997 36930.35
-ARGENTINA 1996 47578.21
-ARGENTINA 1995 22721.98
-ARGENTINA 1994 124668.02
-ARGENTINA 1993 16836.47
-ARGENTINA 1992 64482.53
-ETHIOPIA 1998 12131.22
-ETHIOPIA 1997 64632.50
-ETHIOPIA 1996 53934.34
-ETHIOPIA 1995 85465.81
-ETHIOPIA 1994 34909.05
-ETHIOPIA 1993 31486.65
-ETHIOPIA 1992 31517.77
-IRAN 1998 129127.65
-IRAN 1997 241048.32
-IRAN 1996 146418.41
-IRAN 1995 124277.67
-IRAN 1994 48054.39
-IRAN 1993 205033.11
-IRAN 1992 7877.70
-IRAQ 1998 44838.65
-IRAQ 1997 136849.98
-IRAQ 1996 14714.79
-IRAQ 1995 38901.46
-IRAQ 1994 47418.84
-IRAQ 1993 66470.31
-IRAQ 1992 19538.72
-KENYA 1998 74017.95
-KENYA 1996 125975.94
-KENYA 1995 126080.69
-KENYA 1994 84763.53
-KENYA 1993 59241.21
-KENYA 1992 41107.38
-MOROCCO 1998 9866.13
-MOROCCO 1997 26329.79
-MOROCCO 1996 5685.95
-MOROCCO 1995 7136.46
-MOROCCO 1993 18644.56
-MOROCCO 1992 7595.75
-PERU 1998 87426.11
-PERU 1997 182190.68
-PERU 1996 151040.18
-PERU 1995 128684.42
-PERU 1994 143664.16
-PERU 1993 174091.66
-PERU 1992 151399.17
-UNITED KINGDOM 1998 43670.78
-UNITED KINGDOM 1997 123308.05
-UNITED KINGDOM 1996 126535.39
-UNITED KINGDOM 1995 119817.01
-UNITED KINGDOM 1994 46739.96
-UNITED KINGDOM 1993 135827.18
-UNITED KINGDOM 1992 190399.46
-UNITED STATES 1998 3284.50
-UNITED STATES 1997 94912.29
-UNITED STATES 1996 136645.10
-UNITED STATES 1995 47310.21
-UNITED STATES 1994 62865.10
-UNITED STATES 1993 87610.25
-UNITED STATES 1992 54695.19
+ARGENTINA 1992 64482.53
+ARGENTINA 1993 16836.47
+ARGENTINA 1994 124668.02
+ARGENTINA 1995 22721.98
+ARGENTINA 1996 47578.21
+ARGENTINA 1997 36930.35
+ARGENTINA 1998 17702.73
+ETHIOPIA 1992 31517.77
+ETHIOPIA 1993 31486.65
+ETHIOPIA 1994 34909.05
+ETHIOPIA 1995 85465.81
+ETHIOPIA 1996 53934.34
+ETHIOPIA 1997 64632.50
+ETHIOPIA 1998 12131.22
+IRAN 1992 7877.70
+IRAN 1993 205033.11
+IRAN 1994 48054.39
+IRAN 1995 124277.67
+IRAN 1996 146418.41
+IRAN 1997 241048.32
+IRAN 1998 129127.65
+IRAQ 1992 19538.72
+IRAQ 1993 66470.31
+IRAQ 1994 47418.84
+IRAQ 1995 38901.46
+IRAQ 1996 14714.79
+IRAQ 1997 136849.98
+IRAQ 1998 44838.65
+KENYA 1992 41107.38
+KENYA 1993 59241.21
+KENYA 1994 84763.53
+KENYA 1995 126080.69
+KENYA 1996 125975.94
+KENYA 1998 74017.95
+MOROCCO 1992 7595.75
+MOROCCO 1993 18644.56
+MOROCCO 1995 7136.46
+MOROCCO 1996 5685.95
+MOROCCO 1997 26329.79
+MOROCCO 1998 9866.13
+PERU 1992 151399.17
+PERU 1993 174091.66
+PERU 1994 143664.16
+PERU 1995 128684.42
+PERU 1996 151040.18
+PERU 1997 182190.68
+PERU 1998 87426.11
+UNITED KINGDOM 1992 190399.46
+UNITED KINGDOM 1993 135827.18
+UNITED KINGDOM 1994 46739.96
+UNITED KINGDOM 1995 119817.01
+UNITED KINGDOM 1996 126535.39
+UNITED KINGDOM 1997 123308.05
+UNITED KINGDOM 1998 43670.78
+UNITED STATES 1992 54695.19
+UNITED STATES 1993 87610.25
+UNITED STATES 1994 62865.10
+UNITED STATES 1995 47310.21
+UNITED STATES 1996 136645.10
+UNITED STATES 1997 94912.29
+UNITED STATES 1998 3284.50
diff --git a/e2e_test/streaming/tpch/views/q10.slt.part b/e2e_test/streaming/tpch/views/q10.slt.part
index 331ae85564bda..1d95f8f643034 100644
--- a/e2e_test/streaming/tpch/views/q10.slt.part
+++ b/e2e_test/streaming/tpch/views/q10.slt.part
@@ -31,4 +31,4 @@ group by
c_comment
order by
revenue desc
-limit 20;
\ No newline at end of file
+limit 20;
diff --git a/e2e_test/streaming/tpch/views/q14.slt.part b/e2e_test/streaming/tpch/views/q14.slt.part
index d0b6b5181501a..2475439cd934d 100644
--- a/e2e_test/streaming/tpch/views/q14.slt.part
+++ b/e2e_test/streaming/tpch/views/q14.slt.part
@@ -12,4 +12,4 @@ from
where
l_partkey = p_partkey
and l_shipdate >= date '1995-09-01'
- and l_shipdate < date '1995-09-01' + interval '1' month;
\ No newline at end of file
+ and l_shipdate < date '1995-09-01' + interval '1' month;
diff --git a/e2e_test/streaming/tpch/views/q15.slt.part b/e2e_test/streaming/tpch/views/q15.slt.part
index 0b595acd37db7..b123543efb42c 100644
--- a/e2e_test/streaming/tpch/views/q15.slt.part
+++ b/e2e_test/streaming/tpch/views/q15.slt.part
@@ -40,4 +40,4 @@ where
) as revenue0 (supplier_no, total_revenue)
)
order by
- s_suppkey;
\ No newline at end of file
+ s_suppkey;
diff --git a/e2e_test/streaming/tpch/views/q16.slt.part b/e2e_test/streaming/tpch/views/q16.slt.part
index 19e5b77f1ce29..964abb33c4905 100644
--- a/e2e_test/streaming/tpch/views/q16.slt.part
+++ b/e2e_test/streaming/tpch/views/q16.slt.part
@@ -29,4 +29,4 @@ order by
supplier_cnt desc,
p_brand,
p_type,
- p_size;
\ No newline at end of file
+ p_size;
diff --git a/e2e_test/streaming/tpch/views/q17.slt.part b/e2e_test/streaming/tpch/views/q17.slt.part
index 28ade86235bd4..4330adaa4a0e2 100644
--- a/e2e_test/streaming/tpch/views/q17.slt.part
+++ b/e2e_test/streaming/tpch/views/q17.slt.part
@@ -16,4 +16,4 @@ where
lineitem
where
l_partkey = p_partkey
- );
\ No newline at end of file
+ );
diff --git a/e2e_test/streaming/tpch/views/q18.slt.part b/e2e_test/streaming/tpch/views/q18.slt.part
index c81058021f637..b54ae739b516f 100644
--- a/e2e_test/streaming/tpch/views/q18.slt.part
+++ b/e2e_test/streaming/tpch/views/q18.slt.part
@@ -32,4 +32,4 @@ group by
order by
o_totalprice desc,
o_orderdate
-LIMIT 100;
\ No newline at end of file
+LIMIT 100;
diff --git a/e2e_test/streaming/tpch/views/q21.slt.part b/e2e_test/streaming/tpch/views/q21.slt.part
index 6aa8214c16616..e88c28cdd3ba2 100644
--- a/e2e_test/streaming/tpch/views/q21.slt.part
+++ b/e2e_test/streaming/tpch/views/q21.slt.part
@@ -39,4 +39,4 @@ group by
order by
numwait desc,
s_name
-LIMIT 100;
\ No newline at end of file
+LIMIT 100;
diff --git a/e2e_test/streaming/tpch/views/q3.slt.part b/e2e_test/streaming/tpch/views/q3.slt.part
index 8ae00c9a10c18..17887a4c28030 100644
--- a/e2e_test/streaming/tpch/views/q3.slt.part
+++ b/e2e_test/streaming/tpch/views/q3.slt.part
@@ -22,4 +22,4 @@ group by
order by
revenue desc,
o_orderdate
-LIMIT 10;
\ No newline at end of file
+LIMIT 10;
diff --git a/e2e_test/streaming/tpch/views/q4.slt.part b/e2e_test/streaming/tpch/views/q4.slt.part
index b08d62a105ac2..f35c3bd1caaa8 100644
--- a/e2e_test/streaming/tpch/views/q4.slt.part
+++ b/e2e_test/streaming/tpch/views/q4.slt.part
@@ -20,4 +20,4 @@ where
group by
o_orderpriority
order by
- o_orderpriority;
\ No newline at end of file
+ o_orderpriority;
diff --git a/e2e_test/streaming/tpch/views/q5.slt.part b/e2e_test/streaming/tpch/views/q5.slt.part
index 5e763beb3ab7a..cf38a694c005a 100644
--- a/e2e_test/streaming/tpch/views/q5.slt.part
+++ b/e2e_test/streaming/tpch/views/q5.slt.part
@@ -23,4 +23,4 @@ where
group by
n_name
order by
- revenue desc;
\ No newline at end of file
+ revenue desc;
diff --git a/e2e_test/streaming/tpch/views/q6.slt.part b/e2e_test/streaming/tpch/views/q6.slt.part
index 3c60db49bdae6..68e0379364a33 100644
--- a/e2e_test/streaming/tpch/views/q6.slt.part
+++ b/e2e_test/streaming/tpch/views/q6.slt.part
@@ -8,4 +8,4 @@ where
l_shipdate >= date '1994-01-01'
and l_shipdate < date '1994-01-01' + interval '1' year
and l_discount between 0.08 - 0.01 and 0.08 + 0.01
- and l_quantity < 24;
\ No newline at end of file
+ and l_quantity < 24;
diff --git a/e2e_test/streaming/tpch/views/q7.slt.part b/e2e_test/streaming/tpch/views/q7.slt.part
index 3b50ca4690ddc..f72a367f65498 100644
--- a/e2e_test/streaming/tpch/views/q7.slt.part
+++ b/e2e_test/streaming/tpch/views/q7.slt.part
@@ -38,4 +38,4 @@ group by
order by
supp_nation,
cust_nation,
- l_year;
\ No newline at end of file
+ l_year;
diff --git a/e2e_test/streaming/tpch/views/q8.slt.part b/e2e_test/streaming/tpch/views/q8.slt.part
index 7c64d3ec40890..b07c9ab0467a8 100644
--- a/e2e_test/streaming/tpch/views/q8.slt.part
+++ b/e2e_test/streaming/tpch/views/q8.slt.part
@@ -36,4 +36,4 @@ from
group by
o_year
order by
- o_year;
\ No newline at end of file
+ o_year;
diff --git a/e2e_test/streaming/tpch/views/q9.slt.part b/e2e_test/streaming/tpch/views/q9.slt.part
index b7e1b68c0743e..1dd337a873b79 100644
--- a/e2e_test/streaming/tpch/views/q9.slt.part
+++ b/e2e_test/streaming/tpch/views/q9.slt.part
@@ -31,4 +31,4 @@ group by
o_year
order by
nation,
- o_year desc;
\ No newline at end of file
+ o_year desc;
diff --git a/e2e_test/streaming/tpch_snapshot.slt b/e2e_test/streaming/tpch_snapshot.slt
index 1fb8ebc8c39cb..e4a7b1c7065c9 100644
--- a/e2e_test/streaming/tpch_snapshot.slt
+++ b/e2e_test/streaming/tpch_snapshot.slt
@@ -1,40 +1,71 @@
include ../tpch/create_tables.slt.part
# First, insert the data into the tables
+
include ../tpch/insert_customer.slt.part
+
include ../tpch/insert_lineitem.slt.part
+
include ../tpch/insert_nation.slt.part
+
include ../tpch/insert_orders.slt.part
+
include ../tpch/insert_part.slt.part
+
include ../tpch/insert_partsupp.slt.part
+
include ../tpch/insert_region.slt.part
+
include ../tpch/insert_supplier.slt.part
# Then, create materialized views based on the historical data (snapshot)
+
include ./tpch/create_views.slt.part
# Test each query
+
include ./tpch/q1.slt.part
+
include ./tpch/q2.slt.part
+
include ./tpch/q3.slt.part
+
include ./tpch/q4.slt.part
+
include ./tpch/q5.slt.part
+
include ./tpch/q6.slt.part
+
include ./tpch/q7.slt.part
+
include ./tpch/q8.slt.part
+
include ./tpch/q9.slt.part
+
include ./tpch/q10.slt.part
+
include ./tpch/q11.slt.part
+
include ./tpch/q12.slt.part
+
include ./tpch/q13.slt.part
+
include ./tpch/q14.slt.part
+
include ./tpch/q15.slt.part
+
include ./tpch/q16.slt.part
+
include ./tpch/q17.slt.part
+
include ./tpch/q18.slt.part
+
include ./tpch/q19.slt.part
+
include ./tpch/q20.slt.part
+
include ./tpch/q21.slt.part
+
include ./tpch/q22.slt.part
include ./tpch/drop_views.slt.part
diff --git a/e2e_test/streaming/tpch_upstream.slt b/e2e_test/streaming/tpch_upstream.slt
index 88d0b70ef0d12..33b3265ddb71b 100644
--- a/e2e_test/streaming/tpch_upstream.slt
+++ b/e2e_test/streaming/tpch_upstream.slt
@@ -1,44 +1,76 @@
include ../tpch/create_tables.slt.part
# First, create materialized views with empty data
+
include ./tpch/create_views.slt.part
# Then, insert the data into the tables
+
include ../tpch/insert_customer.slt.part
+
include ../tpch/insert_lineitem.slt.part
+
include ../tpch/insert_nation.slt.part
+
include ../tpch/insert_orders.slt.part
+
include ../tpch/insert_part.slt.part
+
include ../tpch/insert_partsupp.slt.part
+
include ../tpch/insert_region.slt.part
+
include ../tpch/insert_supplier.slt.part
# Ensure that the upstream data is fully consumed
+
statement ok
flush;
# Test each query
+
include ./tpch/q1.slt.part
+
include ./tpch/q2.slt.part
+
include ./tpch/q3.slt.part
+
include ./tpch/q4.slt.part
+
include ./tpch/q5.slt.part
+
include ./tpch/q6.slt.part
+
include ./tpch/q7.slt.part
+
include ./tpch/q8.slt.part
+
include ./tpch/q9.slt.part
+
include ./tpch/q10.slt.part
+
include ./tpch/q11.slt.part
+
include ./tpch/q12.slt.part
+
include ./tpch/q13.slt.part
+
include ./tpch/q14.slt.part
+
include ./tpch/q15.slt.part
+
include ./tpch/q16.slt.part
+
include ./tpch/q17.slt.part
+
include ./tpch/q18.slt.part
+
include ./tpch/q19.slt.part
+
include ./tpch/q20.slt.part
+
include ./tpch/q21.slt.part
+
include ./tpch/q22.slt.part
include ./tpch/drop_views.slt.part
diff --git a/e2e_test/streaming/union.slt b/e2e_test/streaming/union.slt
index 2e99097a84bc2..34871a92f1309 100644
--- a/e2e_test/streaming/union.slt
+++ b/e2e_test/streaming/union.slt
@@ -37,7 +37,6 @@ select * from v2;
statement ok
insert into t2 values(1, 2);
-
query II
select * from v;
----
@@ -73,7 +72,6 @@ query II
select * from v2;
----
-
statement ok
drop materialized view v;
From 72618cb046bab4b049843fd757abe6f8c80c8130 Mon Sep 17 00:00:00 2001
From: xxchan <xxchan22f@gmail.com>
Date: Wed, 7 Dec 2022 13:33:05 +0100
Subject: [PATCH 2/4] fix
---
e2e_test/batch/functions/internal.slt.part | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/e2e_test/batch/functions/internal.slt.part b/e2e_test/batch/functions/internal.slt.part
index 2624782b82cd9..883dd71060698 100644
--- a/e2e_test/batch/functions/internal.slt.part
+++ b/e2e_test/batch/functions/internal.slt.part
@@ -4,14 +4,14 @@ SET RW_IMPLICIT_FLUSH TO true;
statement ok
create table t(v1 varchar, v2 int, v3 int)
-query
+query II
select rw_vnode(_row_id) as vnode, _row_id from t;
----
statement ok
insert into t values ('aaa', 1, 1), ('bbb', 0, 2), ('ccc', 0, 5), ('ddd', 1, 4)
-query ??
+query II
select rw_vnode(_row_id) as vnode, _row_id from t;
----
61 222848002044723201
From e4b7f809f215d70ed001911915a23565ff3d85f2 Mon Sep 17 00:00:00 2001
From: xxchan <xxchan22f@gmail.com>
Date: Wed, 7 Dec 2022 13:47:43 +0100
Subject: [PATCH 3/4] fix
---
e2e_test/batch/catalog/pg_am.slt.part | 2 +-
e2e_test/batch/catalog/pg_attribute.slt.part | 1 -
e2e_test/batch/catalog/pg_cast.slt.part | 38 ++++++++++----------
e2e_test/batch/catalog/pg_collation.slt.part | 2 +-
e2e_test/batch/catalog/pg_namespace.slt.part | 2 +-
e2e_test/batch/catalog/pg_opclass.slt.part | 2 +-
e2e_test/batch/catalog/pg_operator.slt.part | 2 +-
e2e_test/batch/functions/internal.slt.part | 6 +---
e2e_test/batch/local_mode.slt | 9 +++++
9 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/e2e_test/batch/catalog/pg_am.slt.part b/e2e_test/batch/catalog/pg_am.slt.part
index a422abcd02f71..2f69ed587dcc1 100644
--- a/e2e_test/batch/catalog/pg_am.slt.part
+++ b/e2e_test/batch/catalog/pg_am.slt.part
@@ -5,4 +5,4 @@ SELECT
amhandler,
amtype
FROM pg_catalog.pg_am;
-----
\ No newline at end of file
+----
diff --git a/e2e_test/batch/catalog/pg_attribute.slt.part b/e2e_test/batch/catalog/pg_attribute.slt.part
index 75902d5279104..4bf5e2aa54943 100644
--- a/e2e_test/batch/catalog/pg_attribute.slt.part
+++ b/e2e_test/batch/catalog/pg_attribute.slt.part
@@ -19,7 +19,6 @@ select a.attname, a.atttypid, a.attlen, a.attnum from pg_catalog.pg_class t
----
id2 23 4 1
-
statement ok
drop view view1;
diff --git a/e2e_test/batch/catalog/pg_cast.slt.part b/e2e_test/batch/catalog/pg_cast.slt.part
index bfc1de435f8c4..51e26062be4ca 100644
--- a/e2e_test/batch/catalog/pg_cast.slt.part
+++ b/e2e_test/batch/catalog/pg_cast.slt.part
@@ -75,22 +75,22 @@ WHERE
castcontext = 'IMPLICIT'
and c.castsource = s.oid and c.casttarget = t.oid;
----
-int2 int4
-int2 int8
-int2 numeric
-int2 float4
-int2 float8
-int4 int8
-int4 numeric
-int4 float4
-int4 float8
-int8 numeric
-int8 float4
-int8 float8
-numeric float4
-numeric float8
-float4 float8
-date timestamp
-date timestamptz
-timestamp timestamptz
-time interval
+date timestamp
+date timestamptz
+float4 float8
+int2 float4
+int2 float8
+int2 int4
+int2 int8
+int2 numeric
+int4 float4
+int4 float8
+int4 int8
+int4 numeric
+int8 float4
+int8 float8
+int8 numeric
+numeric float4
+numeric float8
+time interval
+timestamp timestamptz
diff --git a/e2e_test/batch/catalog/pg_collation.slt.part b/e2e_test/batch/catalog/pg_collation.slt.part
index 08bb104e4e029..44a70b4c4c870 100644
--- a/e2e_test/batch/catalog/pg_collation.slt.part
+++ b/e2e_test/batch/catalog/pg_collation.slt.part
@@ -12,4 +12,4 @@ SELECT
colliculocale,
collversion
FROM pg_catalog.pg_collation;
-----
\ No newline at end of file
+----
diff --git a/e2e_test/batch/catalog/pg_namespace.slt.part b/e2e_test/batch/catalog/pg_namespace.slt.part
index aa11be300a8f7..6396ec03214c6 100644
--- a/e2e_test/batch/catalog/pg_namespace.slt.part
+++ b/e2e_test/batch/catalog/pg_namespace.slt.part
@@ -2,5 +2,5 @@ query IT rowsort
SELECT nspname FROM pg_catalog.pg_namespace;
----
information_schema
-public
pg_catalog
+public
diff --git a/e2e_test/batch/catalog/pg_opclass.slt.part b/e2e_test/batch/catalog/pg_opclass.slt.part
index a7f2d6041c9b6..7e7e6bcb8fd1f 100644
--- a/e2e_test/batch/catalog/pg_opclass.slt.part
+++ b/e2e_test/batch/catalog/pg_opclass.slt.part
@@ -10,4 +10,4 @@ SELECT
opcdefault,
opckeytype
FROM pg_catalog.pg_opclass;
-----
\ No newline at end of file
+----
diff --git a/e2e_test/batch/catalog/pg_operator.slt.part b/e2e_test/batch/catalog/pg_operator.slt.part
index c16ac77f8b1e1..23ad2d021579d 100644
--- a/e2e_test/batch/catalog/pg_operator.slt.part
+++ b/e2e_test/batch/catalog/pg_operator.slt.part
@@ -16,4 +16,4 @@ SELECT
oprrest,
oprjoin
FROM pg_catalog.pg_operator;
-----
\ No newline at end of file
+----
diff --git a/e2e_test/batch/functions/internal.slt.part b/e2e_test/batch/functions/internal.slt.part
index 883dd71060698..4233e1dbf83b2 100644
--- a/e2e_test/batch/functions/internal.slt.part
+++ b/e2e_test/batch/functions/internal.slt.part
@@ -12,12 +12,8 @@ statement ok
insert into t values ('aaa', 1, 1), ('bbb', 0, 2), ('ccc', 0, 5), ('ddd', 1, 4)
query II
-select rw_vnode(_row_id) as vnode, _row_id from t;
+select rw_vnode(_row_id) as vnode, _row_id from t limit 0;
----
-61 222848002044723201
-222 222848002044723202
-64 222848002044723203
-163 222848002044723200
statement ok
drop table t
diff --git a/e2e_test/batch/local_mode.slt b/e2e_test/batch/local_mode.slt
index d856073aeded7..03276c8e7ee1b 100644
--- a/e2e_test/batch/local_mode.slt
+++ b/e2e_test/batch/local_mode.slt
@@ -5,14 +5,23 @@ statement ok
SET QUERY_MODE TO local;
include ./basic/*.slt.part
+
include ./basic/local/*.slt.part
+
include ./duckdb/all.slt.part
+
include ./order/*.slt.part
+
include ./join/*.slt.part
+
include ./join/*/*.slt.part
+
include ./aggregate/*.slt.part
+
include ./types/*.slt.part
+
include ./catalog/*.slt.part
+
include ./functions/*.slt.part
statement ok
From b224a77fd807de8d5622189ca9960c2b4ae5e52d Mon Sep 17 00:00:00 2001
From: xxchan <xxchan22f@gmail.com>
Date: Wed, 7 Dec 2022 14:25:30 +0100
Subject: [PATCH 4/4] update
---
e2e_test/batch/duckdb/join/iejoin/test_iejoin.test.slt.part | 4 +++-
e2e_test/batch/functions/internal.slt.part | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/e2e_test/batch/duckdb/join/iejoin/test_iejoin.test.slt.part b/e2e_test/batch/duckdb/join/iejoin/test_iejoin.test.slt.part
index 77c2a4fc7f2f8..bf7e013a77c0c 100644
--- a/e2e_test/batch/duckdb/join/iejoin/test_iejoin.test.slt.part
+++ b/e2e_test/batch/duckdb/join/iejoin/test_iejoin.test.slt.part
@@ -7,6 +7,7 @@ SET RW_IMPLICIT_FLUSH TO true;
# Restrictive tail predicates
# Use inequalities to prevent future range choice optimisation
+
query II
WITH test AS (
SELECT
@@ -61,6 +62,7 @@ ORDER BY lhs.id, rhs.id
9 8
# Subquery/CTE
+
query II
WITH test AS (
SELECT
@@ -105,6 +107,7 @@ FROM sub
#3
# Fix missing continue statement in right join handler
+
statement ok
CREATE VIEW issue3486 AS
SELECT generate_series as ts from generate_series(timestamp '2020-01-01 00:00:00', timestamp '2021-01-01 00:00:00',
@@ -181,6 +184,5 @@ WITH data_table AS (
38 1607878080 1608668640 9
39 1608668640 1609459200 9
-
statement ok
DROP VIEW issue3486;
diff --git a/e2e_test/batch/functions/internal.slt.part b/e2e_test/batch/functions/internal.slt.part
index 4233e1dbf83b2..2e1a90cd0290c 100644
--- a/e2e_test/batch/functions/internal.slt.part
+++ b/e2e_test/batch/functions/internal.slt.part
@@ -12,8 +12,9 @@ statement ok
insert into t values ('aaa', 1, 1), ('bbb', 0, 2), ('ccc', 0, 5), ('ddd', 1, 4)
query II
-select rw_vnode(_row_id) as vnode, _row_id from t limit 0;
+select count(vnode) from (select rw_vnode(_row_id) as vnode, _row_id from t);
----
+4
statement ok
drop table t