Changeset: 667515a22bd3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/667515a22bd3
Modified Files:
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.test
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.test
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.test
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.test
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-3join-query.stable.out
sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-3join-query.stable.out.32bit
sql/test/SQLancer/Tests/sqlancer10.test
sql/test/SQLancer/Tests/sqlancer17.test
sql/test/analytics/Tests/analytics00.test
sql/test/astro/Tests/astro.test
sql/test/merge-partitions/Tests/mergepart31.test
sql/test/mergetables/Tests/mergequery.test
sql/test/mergetables/Tests/part-elim.test
sql/test/miscellaneous/Tests/select_groupby.sql
sql/test/miscellaneous/Tests/select_groupby.stable.err
sql/test/miscellaneous/Tests/select_groupby.stable.out
sql/test/out2in/Tests/out2in.test
sql/test/prepare/Tests/prepared-select-with-error-causes-hang.Bug-6761.stable.out
sql/test/remote/Tests/partition_elim.test
Branch: properties
Log Message:
More approvals
diffs (truncated from 1322 to 300 lines):
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.test
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.test
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.test
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-query.test
@@ -13,7 +13,7 @@ query T nosort
----
project (
| table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ]
-) [ "fk"."id" NOT NULL HASHCOL ] [ "fk"."id" ASC NOT NULL HASHCOL ]
+) [ "fk"."id" NOT NULL UNIQUE HASHCOL ] [ "fk"."id" ASC NOT NULL UNIQUE
HASHCOL ]
query T nosort
plan select id , v1 from fk left outer join pk1 on fk.fk1 = pk1.pk1 order
by id
@@ -47,7 +47,7 @@ query T nosort
----
project (
| table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ]
-) [ "fk"."id" NOT NULL HASHCOL ] [ "fk"."id" ASC NOT NULL HASHCOL ]
+) [ "fk"."id" NOT NULL UNIQUE HASHCOL ] [ "fk"."id" ASC NOT NULL UNIQUE
HASHCOL ]
query T nosort
plan select id , v1 from pk1 right outer join fk on fk.fk1 = pk1.pk1 order
by id
@@ -81,7 +81,7 @@ query T nosort
----
project (
| table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ]
-) [ "fk"."id" HASHCOL ] [ "fk"."id" ASC HASHCOL ]
+) [ "fk"."id" NOT NULL UNIQUE HASHCOL ] [ "fk"."id" ASC NOT NULL UNIQUE
HASHCOL ]
query T nosort
plan select id , v1 from pk1 full outer join fk on fk.fk1 = pk1.pk1 order
by id
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.test
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.test
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.test
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-1join-view.test
@@ -14,8 +14,8 @@ query T nosort
project (
| project (
| | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ]
-| ) [ "fk"."id" NOT NULL HASHCOL as "v1"."id" ]
-) [ "v1"."id" NOT NULL HASHCOL ] [ "v1"."id" ASC NOT NULL HASHCOL ]
+| ) [ "fk"."id" NOT NULL UNIQUE HASHCOL as "v1"."id" ]
+) [ "v1"."id" NOT NULL UNIQUE HASHCOL ] [ "v1"."id" ASC NOT NULL UNIQUE
HASHCOL ]
query T nosort
plan select id , v1 from v1 order by id
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.test
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.test
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.test
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-query.test
@@ -13,7 +13,7 @@ query T nosort
----
project (
| table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL , "fk"."%fk_fk1_fkey"
JOINIDX "sys"."fk"."fk_fk1_fkey", "fk"."%fk_fk2_fkey" JOINIDX
"sys"."fk"."fk_fk2_fkey" ]
-) [ "fk"."id" NOT NULL HASHCOL ] [ "fk"."id" ASC NOT NULL HASHCOL ]
+) [ "fk"."id" NOT NULL UNIQUE HASHCOL ] [ "fk"."id" ASC NOT NULL UNIQUE
HASHCOL ]
query T nosort
plan select id , v1 from fk left outer join pk1 on fk.fk1 = pk1.pk1 left
outer join pk2 on fk.fk2 = pk2.pk2 order by id
@@ -50,7 +50,7 @@ query T nosort
----
project (
| table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL , "fk"."%fk_fk1_fkey"
JOINIDX "sys"."fk"."fk_fk1_fkey", "fk"."%fk_fk2_fkey" JOINIDX
"sys"."fk"."fk_fk2_fkey" ]
-) [ "fk"."id" NOT NULL HASHCOL ] [ "fk"."id" ASC NOT NULL HASHCOL ]
+) [ "fk"."id" NOT NULL UNIQUE HASHCOL ] [ "fk"."id" ASC NOT NULL UNIQUE
HASHCOL ]
query T nosort
plan select id , v1 from pk2 right outer join (pk1 right outer join fk on
fk.fk1 = pk1.pk1) on fk.fk2 = pk2.pk2 order by id
@@ -87,7 +87,7 @@ query T nosort
----
project (
| table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL , "fk"."%fk_fk1_fkey"
JOINIDX "sys"."fk"."fk_fk1_fkey", "fk"."%fk_fk2_fkey" JOINIDX
"sys"."fk"."fk_fk2_fkey" ]
-) [ "fk"."id" HASHCOL ] [ "fk"."id" ASC HASHCOL ]
+) [ "fk"."id" NOT NULL UNIQUE HASHCOL ] [ "fk"."id" ASC NOT NULL UNIQUE
HASHCOL ]
query T nosort
plan select id , v1 from pk2 full outer join (pk1 full outer join fk on
fk.fk1 = pk1.pk1) on fk.fk2 = pk2.pk2 order by id
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.test
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.test
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.test
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-2join-view.test
@@ -14,8 +14,8 @@ query T nosort
project (
| project (
| | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ]
-| ) [ "fk"."id" NOT NULL HASHCOL as "v2"."id" ]
-) [ "v2"."id" NOT NULL HASHCOL ] [ "v2"."id" ASC NOT NULL HASHCOL ]
+| ) [ "fk"."id" NOT NULL UNIQUE HASHCOL as "v2"."id" ]
+) [ "v2"."id" NOT NULL UNIQUE HASHCOL ] [ "v2"."id" ASC NOT NULL UNIQUE
HASHCOL ]
query T nosort
plan select id , v2 from v2 order by id
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-3join-query.stable.out
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-3join-query.stable.out
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-3join-query.stable.out
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-3join-query.stable.out
@@ -17,7 +17,7 @@ project (
| select (
| | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ,
"fk"."%fk_fk1_fkey" JOINIDX "sys"."fk"."fk_fk1_fkey" ]
| ) [ ("fk"."%fk_fk1_fkey") ! * = (oid(63) NULL) ]
-) [ "fk"."id" NOT NULL HASHCOL ] [ "fk"."id" ASC NOT NULL HASHCOL ]
+) [ "fk"."id" NOT NULL UNIQUE HASHCOL ] [ "fk"."id" ASC NOT NULL UNIQUE
HASHCOL ]
% .plan # table_name
% rel # name
% clob # type
@@ -36,8 +36,8 @@ project (
project (
| select (
| | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ,
"fk"."%fk_fk1_fkey" JOINIDX "sys"."fk"."fk_fk1_fkey", "fk"."%fk_fk2_fkey"
JOINIDX "sys"."fk"."fk_fk2_fkey" ]
-| ) [ ("fk"."%fk_fk1_fkey") ! * = (oid(63) NULL), ("fk"."%fk_fk2_fkey") ! * =
(oid(63) NULL) ]
-) [ "fk"."id" NOT NULL HASHCOL ] [ "fk"."id" ASC NOT NULL HASHCOL ]
+| ) [ ("fk"."%fk_fk2_fkey") ! * = (oid(63) NULL), ("fk"."%fk_fk1_fkey") ! * =
(oid(63) NULL) ]
+) [ "fk"."id" NOT NULL UNIQUE HASHCOL ] [ "fk"."id" ASC NOT NULL UNIQUE
HASHCOL ]
% .plan # table_name
% rel # name
% clob # type
diff --git
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-3join-query.stable.out.32bit
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-3join-query.stable.out.32bit
---
a/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-3join-query.stable.out.32bit
+++
b/sql/test/FeatureRequests/Tests/foreign_key_outer_join_dead_code_elimination-plan-3join-query.stable.out.32bit
@@ -17,7 +17,7 @@ project (
| select (
| | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ,
"fk"."%fk_fk1_fkey" JOINIDX "sys"."fk"."fk_fk1_fkey" ]
| ) [ ("fk"."%fk_fk1_fkey") ! * = (oid(31) NULL) ]
-) [ "fk"."id" NOT NULL HASHCOL ] [ "fk"."id" ASC NOT NULL HASHCOL ]
+) [ "fk"."id" NOT NULL UNIQUE HASHCOL ] [ "fk"."id" ASC NOT NULL UNIQUE
HASHCOL ]
% .plan # table_name
% rel # name
% clob # type
@@ -36,8 +36,8 @@ project (
project (
| select (
| | table("sys"."fk") [ "fk"."id" NOT NULL UNIQUE HASHCOL ,
"fk"."%fk_fk1_fkey" JOINIDX "sys"."fk"."fk_fk1_fkey", "fk"."%fk_fk2_fkey"
JOINIDX "sys"."fk"."fk_fk2_fkey" ]
-| ) [ ("fk"."%fk_fk1_fkey") ! * = (oid(31) NULL), ("fk"."%fk_fk2_fkey") ! * =
(oid(31) NULL) ]
-) [ "fk"."id" NOT NULL HASHCOL ] [ "fk"."id" ASC NOT NULL HASHCOL ]
+| ) [ ("fk"."%fk_fk2_fkey") ! * = (oid(31) NULL), ("fk"."%fk_fk1_fkey") ! * =
(oid(31) NULL) ]
+) [ "fk"."id" NOT NULL UNIQUE HASHCOL ] [ "fk"."id" ASC NOT NULL UNIQUE
HASHCOL ]
% .plan # table_name
% rel # name
% clob # type
diff --git a/sql/test/SQLancer/Tests/sqlancer10.test
b/sql/test/SQLancer/Tests/sqlancer10.test
--- a/sql/test/SQLancer/Tests/sqlancer10.test
+++ b/sql/test/SQLancer/Tests/sqlancer10.test
@@ -382,7 +382,7 @@ PLAN SELECT (SELECT c0 FROM t0) FROM t0
----
project (
| single left outer join (
-| | table("sys"."t0") [ "t0"."%t0_c3_c0_unique" HASHIDX ],
+| | table("sys"."t0") [ "t0"."%t0_c3_c0_unique" UNIQUE HASHIDX ],
| | project (
| | | table("sys"."t0") [ "t0"."c0" NOT NULL UNIQUE HASHCOL ]
| | ) [ "t0"."c0" NOT NULL UNIQUE HASHCOL as "%1"."%1" ]
diff --git a/sql/test/SQLancer/Tests/sqlancer17.test
b/sql/test/SQLancer/Tests/sqlancer17.test
--- a/sql/test/SQLancer/Tests/sqlancer17.test
+++ b/sql/test/SQLancer/Tests/sqlancer17.test
@@ -55,33 +55,32 @@ SELECT -7 NOT BETWEEN 0.4 AND v19.vc0 FR
----
statement ok
-create or replace view v20(vc0,vc1) as (select sql_max(1, 1), vc0 from
((select 2) intersect all (select 4)) v0(vc0) where 1 not between v0.vc0 and
v0.vc0)
+create or replace view v20(vc0,vc1) as (select sql_max(1, 1), vc0 from
((values (1),(3),(4),(5)) intersect all (values (1),(4),(5),(6))) v0(vc0) where
1 not between v0.vc0 and v0.vc0)
query I rowsort
-SELECT v20.vc0 FROM v20 WHERE 7 > v20.vc0 and v20.vc1 between 3 and 5
+SELECT v20.vc0 FROM v20 WHERE 4 > v20.vc0 and v20.vc1 between 3 and 5
----
+1
+1
-# '7 > v20.vc0' doesn't get pushed, while 'v20.vc1 between 3 and 5' does
query T nosort
-plan SELECT 1 FROM v20 WHERE 7 > v20.vc0 and v20.vc1 between 3 and 5
+plan SELECT 1 FROM v20 WHERE 4 > v20.vc0 and v20.vc1 between 3 and 5
----
project (
-| select (
-| | project (
-| | | intersect (
-| | | | project (
-| | | | | select (
-| | | | | | [ boolean(1) "true" as "%1"."%1" ]
-| | | | | ) [ (tinyint(2) "2") ! <= (tinyint(2) "1") ! <= (tinyint(2) "2"),
(tinyint(3) "3") <= (tinyint(2) "2") <= (tinyint(2) "5") ]
-| | | | ) [ tinyint(2) "2" as "v0"."vc0" ],
-| | | | project (
-| | | | | select (
-| | | | | | [ boolean(1) "true" as "%2"."%2" ]
-| | | | | ) [ (tinyint(3) "4") ! <= (tinyint(2) "1") ! <= (tinyint(3) "4"),
(tinyint(3) "3") <= (tinyint(3) "4") <= (tinyint(2) "5") ]
-| | | | ) [ tinyint(3) "4" as "v0"."vc0" ]
-| | | ) [ "v0"."vc0" NOT NULL ]
-| | ) [ "sys"."sql_max"(tinyint(1) "1", tinyint(1) "1") NOT NULL as
"v20"."vc0" ]
-| ) [ (tinyint(3) "7") > ("v20"."vc0" NOT NULL) ]
+| project (
+| | intersect (
+| | | project (
+| | | | select (
+| | | | | [ [ tinyint(3) "1", tinyint(3) "3", tinyint(3) "4", tinyint(3) "5"
] as "%1"."%1" ]
+| | | | ) [ ("%1"."%1") ! <= (tinyint(3) "1") ! <= ("%1"."%1"), (tinyint(3)
"3") <= ("%1"."%1") <= (tinyint(3) "5") ]
+| | | ) [ "%1"."%1" NOT NULL as "v0"."vc0" ],
+| | | project (
+| | | | select (
+| | | | | [ [ tinyint(3) "1", tinyint(3) "4", tinyint(3) "5", tinyint(3) "6"
] as "%6"."%6" ]
+| | | | ) [ ("%6"."%6") ! <= (tinyint(3) "1") ! <= ("%6"."%6"), (tinyint(3)
"3") <= ("%6"."%6") <= (tinyint(3) "5") ]
+| | | ) [ "%6"."%6" NOT NULL as "v0"."vc0" ]
+| | ) [ "v0"."vc0" NOT NULL ]
+| ) [ "sys"."sql_max"(tinyint(1) "1", tinyint(1) "1") NOT NULL as "v20"."vc0" ]
) [ tinyint(1) "1" ]
statement ok
diff --git a/sql/test/analytics/Tests/analytics00.test
b/sql/test/analytics/Tests/analytics00.test
--- a/sql/test/analytics/Tests/analytics00.test
+++ b/sql/test/analytics/Tests/analytics00.test
@@ -1869,10 +1869,10 @@ project (
| project (
| | project (
| | | project (
-| | | | table("sys"."myorders") [ "myorders"."o_custkey" NOT NULL,
"myorders"."o_totalprice" NOT NULL, "myorders"."o_orderdate" NOT NULL ]
-| | | ) [ "myorders"."o_custkey" NOT NULL, "myorders"."o_totalprice" NOT NULL,
"sys"."month"("myorders"."o_orderdate" NOT NULL) NOT NULL as "%1"."%1" ]
-| | ) [ "myorders"."o_custkey" NOT NULL, "myorders"."o_totalprice" NOT NULL,
"%1"."%1" NOT NULL ] [ "myorders"."o_custkey" ASC NOT NULL, "%1"."%1" ASC NOT
NULL ]
-| ) [ "%1"."%1" NOT NULL, "sys"."diff"("myorders"."o_custkey" NOT NULL) as
"%2"."%2", "sys"."diff"("%1"."%1" NOT NULL) as "%3"."%3",
"sys"."min"("myorders"."o_totalprice" NOT NULL, "%2"."%2",
"sys"."diff"("%1"."%1" NOT NULL), int(9) "0", "sys"."window_bound"("%2"."%2",
"%3"."%3", int(9) "0", int(9) "0", int(9) "0", bigint(64)
"9223372036854775807"), "sys"."window_bound"("%2"."%2", "%3"."%3", int(9) "0",
int(9) "5", int(9) "0", bigint(64) "0")) as "%4"."%4" ]
+| | | | table("sys"."myorders") [ "myorders"."o_custkey" NOT NULL UNIQUE,
"myorders"."o_totalprice" NOT NULL UNIQUE, "myorders"."o_orderdate" NOT NULL
UNIQUE ]
+| | | ) [ "myorders"."o_custkey" NOT NULL UNIQUE, "myorders"."o_totalprice"
NOT NULL UNIQUE, "sys"."month"("myorders"."o_orderdate" NOT NULL UNIQUE) NOT
NULL as "%1"."%1" ]
+| | ) [ "myorders"."o_custkey" NOT NULL UNIQUE, "myorders"."o_totalprice" NOT
NULL UNIQUE, "%1"."%1" NOT NULL ] [ "myorders"."o_custkey" ASC NOT NULL UNIQUE,
"%1"."%1" ASC NOT NULL ]
+| ) [ "%1"."%1" NOT NULL, "sys"."diff"("myorders"."o_custkey" NOT NULL UNIQUE)
as "%2"."%2", "sys"."diff"("%1"."%1" NOT NULL) as "%3"."%3",
"sys"."min"("myorders"."o_totalprice" NOT NULL UNIQUE, "%2"."%2",
"sys"."diff"("%1"."%1" NOT NULL), int(9) "0", "sys"."window_bound"("%2"."%2",
"%3"."%3", int(9) "0", int(9) "0", int(9) "0", bigint(64)
"9223372036854775807"), "sys"."window_bound"("%2"."%2", "%3"."%3", int(9) "0",
int(9) "5", int(9) "0", bigint(64) "0")) as "%4"."%4" ]
) [ "%4"."%4" ]
query R rowsort
@@ -1888,10 +1888,10 @@ project (
| project (
| | project (
| | | project (
-| | | | table("sys"."myorders") [ "myorders"."o_totalprice" NOT NULL,
"myorders"."o_orderdate" NOT NULL ]
-| | | ) [ "myorders"."o_totalprice" NOT NULL,
"sys"."day"("myorders"."o_orderdate" NOT NULL) NOT NULL as "%1"."%1" ]
-| | ) [ "myorders"."o_totalprice" NOT NULL, "%1"."%1" NOT NULL ] [ "%1"."%1"
ASC NOT NULL ]
-| ) [ "%1"."%1" NOT NULL, boolean(1) "false" as "%2"."%2",
"sys"."max"("myorders"."o_totalprice" NOT NULL, "%2"."%2" NOT NULL,
"sys"."diff"("%1"."%1" NOT NULL), int(9) "1", "sys"."window_bound"("%1"."%1"
ASC NOT NULL, int(9) "1", int(9) "0", int(9) "0", int(32) "2"),
"sys"."window_bound"("%1"."%1" ASC NOT NULL, int(9) "1", int(9) "5", int(9)
"0", int(32) "0")) as "%3"."%3" ]
+| | | | table("sys"."myorders") [ "myorders"."o_totalprice" NOT NULL UNIQUE,
"myorders"."o_orderdate" NOT NULL UNIQUE ]
+| | | ) [ "myorders"."o_totalprice" NOT NULL UNIQUE,
"sys"."day"("myorders"."o_orderdate" NOT NULL UNIQUE) NOT NULL as "%1"."%1" ]
+| | ) [ "myorders"."o_totalprice" NOT NULL UNIQUE, "%1"."%1" NOT NULL ] [
"%1"."%1" ASC NOT NULL ]
+| ) [ "%1"."%1" NOT NULL, boolean(1) "false" as "%2"."%2",
"sys"."max"("myorders"."o_totalprice" NOT NULL UNIQUE, "%2"."%2" NOT NULL,
"sys"."diff"("%1"."%1" NOT NULL), int(9) "1", "sys"."window_bound"("%1"."%1"
ASC NOT NULL, int(9) "1", int(9) "0", int(9) "0", int(32) "2"),
"sys"."window_bound"("%1"."%1" ASC NOT NULL, int(9) "1", int(9) "5", int(9)
"0", int(32) "0")) as "%3"."%3" ]
) [ "%3"."%3" ]
query R rowsort
@@ -1907,11 +1907,11 @@ project (
| project (
| | project (
| | | project (
-| | | | table("sys"."myorders") [ "myorders"."o_totalprice" NOT NULL,
"myorders"."o_orderdate" NOT NULL ]
-| | | ) [ "myorders"."o_totalprice" NOT NULL,
"sys"."year"("myorders"."o_orderdate" NOT NULL) NOT NULL as "%1"."%1" ]
-| | ) [ "myorders"."o_totalprice" NOT NULL, "%1"."%1" NOT NULL ] [ "%1"."%1"
ASC NOT NULL ]
-| ) [ "%1"."%1" NOT NULL, boolean(1) "false" as "%2"."%2",
"sys"."diff"("%1"."%1" NOT NULL) as "%3"."%3",
"sys"."count"("myorders"."o_totalprice" NOT NULL, boolean(1) "true", "%2"."%2"
NOT NULL, "sys"."diff"("%1"."%1" NOT NULL), int(9) "2",
"sys"."window_bound"("%3"."%3", int(9) "2", int(9) "0", int(9) "0", tinyint(2)
"2"), "sys"."window_bound"("%3"."%3", int(9) "2", int(9) "3", int(9) "0",
bigint(64) "9223372036854775807")) as "%4"."%4" ]
-) [ "%4"."%4" ]
+| | | | table("sys"."myorders") [ "myorders"."o_totalprice" NOT NULL UNIQUE,
"myorders"."o_orderdate" NOT NULL UNIQUE ]
+| | | ) [ "myorders"."o_totalprice" NOT NULL UNIQUE,
"sys"."year"("myorders"."o_orderdate" NOT NULL UNIQUE) NOT NULL as "%1"."%1" ]
+| | ) [ "myorders"."o_totalprice" NOT NULL UNIQUE, "%1"."%1" NOT NULL ] [
"%1"."%1" ASC NOT NULL ]
+| ) [ "%1"."%1" NOT NULL, boolean(1) "false" as "%2"."%2",
"sys"."diff"("%1"."%1" NOT NULL) as "%3"."%3",
"sys"."count"("myorders"."o_totalprice" NOT NULL UNIQUE, boolean(1) "true",
"%2"."%2" NOT NULL, "sys"."diff"("%1"."%1" NOT NULL), int(9) "2",
"sys"."window_bound"("%3"."%3", int(9) "2", int(9) "0", int(9) "0", tinyint(2)
"2"), "sys"."window_bound"("%3"."%3", int(9) "2", int(9) "3", int(9) "0",
bigint(64) "9223372036854775807")) NOT NULL as "%4"."%4" ]
+) [ "%4"."%4" NOT NULL ]
query I rowsort
SELECT COUNT(o_totalprice) OVER (ORDER BY EXTRACT(YEAR FROM o_orderdate)
GROUPS BETWEEN 2 PRECEDING AND UNBOUNDED FOLLOWING) FROM myorders
diff --git a/sql/test/astro/Tests/astro.test b/sql/test/astro/Tests/astro.test
--- a/sql/test/astro/Tests/astro.test
+++ b/sql/test/astro/Tests/astro.test
@@ -82,7 +82,7 @@ update(
| | | | ) [ ("cm_flux"."active" NOT NULL) = (boolean(1) "true"),
("cm_flux"."filter" NOT NULL) = (char(1) "g") ]
| | | ) [ "cm_flux"."filter" NOT NULL as "%1"."%1", "cm_flux"."f_datapoints"
NOT NULL as "%2"."%2", "cm_flux"."avg_flux" NOT NULL as "%3"."%3",
"cm_flux"."avg_fluxsq" NOT NULL as "%4"."%4", "cm_flux"."avg_w" NOT NULL as
"%5"."%5", "cm_flux"."avg_wflux" NOT NULL as "%6"."%6", "cm_flux"."avg_wfluxsq"
NOT NULL as "%7"."%7", "cm_flux"."avg_dec_zone_deg" NOT NULL as "%10"."%10",
"cm_flux"."runcat" NOT NULL as "%12"."%12", "cm_flux"."filter" NOT NULL as
"%13"."%13" ]
| | ) [ ("%12"."%12" NOT NULL) = ("fluxz"."runcat" NOT NULL), ("%13"."%13" NOT
NULL) = ("fluxz"."filter" NOT NULL) ]
-| ) [ "fluxz"."%TID%" NOT NULL UNIQUE, "%1"."%1" NOT NULL as "fluxz"."filter",
"%2"."%2" NOT NULL as "fluxz"."f_datapoints", "%3"."%3" NOT NULL as
"fluxz"."avg_flux", "%4"."%4" NOT NULL as "fluxz"."avg_fluxsq", "%5"."%5" NOT
NULL as "fluxz"."avg_w", "%6"."%6" NOT NULL as "fluxz"."avg_wflux", "%7"."%7"
NOT NULL as "fluxz"."avg_wfluxsq", "%10"."%10" NOT NULL as
"fluxz"."avg_dec_zone_deg" ]
+| ) [ "fluxz"."%TID%" NOT NULL, "%1"."%1" as "fluxz"."filter", "%2"."%2" as
"fluxz"."f_datapoints", "%3"."%3" as "fluxz"."avg_flux", "%4"."%4" as
"fluxz"."avg_fluxsq", "%5"."%5" as "fluxz"."avg_w", "%6"."%6" as
"fluxz"."avg_wflux", "%7"."%7" as "fluxz"."avg_wfluxsq", "%10"."%10" as
"fluxz"."avg_dec_zone_deg" ]
) [ "fluxz"."%TID%" NOT NULL UNIQUE, "fluxz"."filter" NOT NULL,
"fluxz"."f_datapoints" NOT NULL, "fluxz"."avg_flux" NOT NULL,
"fluxz"."avg_fluxsq" NOT NULL, "fluxz"."avg_w" NOT NULL, "fluxz"."avg_wflux"
NOT NULL, "fluxz"."avg_wfluxsq" NOT NULL, "fluxz"."avg_dec_zone_deg" NOT NULL ]
statement ok
diff --git a/sql/test/merge-partitions/Tests/mergepart31.test
b/sql/test/merge-partitions/Tests/mergepart31.test
--- a/sql/test/merge-partitions/Tests/mergepart31.test
+++ b/sql/test/merge-partitions/Tests/mergepart31.test
@@ -33,8 +33,8 @@ plan select 1 from splitted where stamp
----
project (
| select (
-| | table("sys"."third_decade") [ "third_decade"."stamp" as "splitted"."stamp"
]
-| ) [ ("splitted"."stamp") = (timestamp(7) "2020-01-01 00:00:00.000000") ]
+| | table("sys"."third_decade") [ "third_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
+| ) [ ("splitted"."stamp" UNIQUE) = (timestamp(7) "2020-01-01
00:00:00.000000") ]
) [ tinyint(1) "1" ]
query T nosort
@@ -42,8 +42,8 @@ plan select 1 from splitted where stamp
----
project (
| select (
-| | table("sys"."first_decade") [ "first_decade"."stamp" as "splitted"."stamp"
]
-| ) [ ("splitted"."stamp") in (timestamp(7) "2000-01-01 00:00:00.000000",
timestamp(7) "2000-02-01 00:00:00.000000") ]
+| | table("sys"."first_decade") [ "first_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
+| ) [ ("splitted"."stamp" UNIQUE) in (timestamp(7) "2000-01-01
00:00:00.000000", timestamp(7) "2000-02-01 00:00:00.000000") ]
) [ tinyint(1) "1" ]
query T nosort
@@ -52,13 +52,13 @@ plan select 1 from splitted where stamp
union (
| project (
| | select (
-| | | table("sys"."first_decade") [ "first_decade"."stamp" as
"splitted"."stamp" ]
-| | ) [ ("splitted"."stamp") in (timestamp(7) "2000-01-01 00:00:00.000000",
timestamp(7) "2010-01-01 00:00:00.000000") ]
+| | | table("sys"."first_decade") [ "first_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
+| | ) [ ("splitted"."stamp" UNIQUE) in (timestamp(7) "2000-01-01
00:00:00.000000", timestamp(7) "2010-01-01 00:00:00.000000") ]
| ) [ tinyint(1) "1" ],
| project (
| | select (
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
