Changeset: 21a6165cca92 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=21a6165cca92
Added Files:
sql/test/subquery/Tests/subquery7.test
sql/test/subquery/Tests/subquery8.test
Modified Files:
sql/test/BugTracker-2015/Tests/crash.Bug-3736.test
sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.test
sql/test/BugTracker-2015/Tests/quantile_function_resolution.Bug-3773.test
sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.test
sql/test/Tests/keys.test
sql/test/merge-partitions/Tests/mergepart31.test
sql/test/mergetables/Tests/part-elim.test
sql/test/miscellaneous/Tests/simple_plans.test
sql/test/miscellaneous/Tests/simple_selects.test
Branch: mtest
Log Message:
Updated tests output
diffs (truncated from 406 to 300 lines):
diff --git a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.test
b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.test
--- a/sql/test/BugTracker-2015/Tests/crash.Bug-3736.test
+++ b/sql/test/BugTracker-2015/Tests/crash.Bug-3736.test
@@ -132,9 +132,9 @@ single project (
| | | | | | ) [ "o"."open_auction_id" NOT NULL ] [ "o"."open_auction_id" NOT
NULL ],
| | | | | | table(sys.bidder) [ "bidder"."id" NOT NULL HASHCOL as "b3a"."id",
"bidder"."open_auction_id" NOT NULL as "b3a"."open_auction_id", "bidder"."date"
NOT NULL as "b3a"."date", "bidder"."time" NOT NULL as "b3a"."time",
"bidder"."personref" NOT NULL as "b3a"."personref", "bidder"."increase" NOT
NULL as "b3a"."increase", "bidder"."%TID%" NOT NULL as "b3a"."%TID%" ] COUNT
| | | | | ) [ "b3a"."open_auction_id" NOT NULL = "o"."open_auction_id" NOT
NULL ]
-| | | | ) [ "o"."open_auction_id" NOT NULL ] [ sys.min no nil ("b3a"."id" NOT
NULL HASHCOL ) NOT NULL as "%1"."%1", "o"."open_auction_id" NOT NULL ]
-| | | ) [ "b3"."id" NOT NULL HASHCOL = "%1"."%1" NOT NULL ]
-| | ) [ "b3"."id" NOT NULL HASHCOL , "b3"."open_auction_id" NOT NULL,
"b3"."date" NOT NULL, "b3"."time" NOT NULL, "b3"."personref" NOT NULL,
"b3"."increase" NOT NULL, "b3"."%TID%" NOT NULL, "%1"."%1" NOT NULL,
"o"."open_auction_id" NOT NULL as "%5"."%5" ]
+| | | | ) [ "o"."open_auction_id" NOT NULL ] [ sys.min no nil ("b3a"."id" NOT
NULL HASHCOL ) as "%1"."%1", "o"."open_auction_id" NOT NULL ]
+| | | ) [ "b3"."id" NOT NULL HASHCOL = "%1"."%1" ]
+| | ) [ "b3"."id" NOT NULL HASHCOL , "b3"."open_auction_id" NOT NULL,
"b3"."date" NOT NULL, "b3"."time" NOT NULL, "b3"."personref" NOT NULL,
"b3"."increase" NOT NULL, "b3"."%TID%" NOT NULL, "%1"."%1",
"o"."open_auction_id" NOT NULL as "%5"."%5" ]
| ) [ "o"."open_auction_id" NOT NULL * = "%5"."%5" NOT NULL ]
) [ "o"."id" NOT NULL HASHCOL , "o"."open_auction_id" NOT NULL, "o"."initial"
NOT NULL, "o"."reserve" NOT NULL, "o"."aktuell" NOT NULL, "o"."privacy" NOT
NULL, "o"."itemref" NOT NULL, "o"."seller" NOT NULL, "o"."quantity" NOT NULL,
"o"."type" NOT NULL, "o"."start" NOT NULL, "o"."ende" NOT NULL, "o"."%TID%" NOT
NULL, "b"."id" NOT NULL HASHCOL , "b"."open_auction_id" NOT NULL, "b"."date"
NOT NULL, "b"."time" NOT NULL, "b"."personref" NOT NULL, "b"."increase" NOT
NULL, "b"."%TID%" NOT NULL, "b3"."increase" NOT NULL as "%2"."%2" ]
project (
@@ -153,11 +153,11 @@ project (
| | | | | | | ) [ "o"."open_auction_id" NOT NULL ] [ "o"."open_auction_id" NOT
NULL ],
| | | | | | | table(sys.bidder) [ "bidder"."id" NOT NULL HASHCOL as
"b2a"."id", "bidder"."open_auction_id" NOT NULL as "b2a"."open_auction_id" ]
COUNT
| | | | | | ) [ "b2a"."open_auction_id" NOT NULL = "o"."open_auction_id" NOT
NULL ]
-| | | | | ) [ "o"."open_auction_id" NOT NULL ] [ sys.max no nil ("b2a"."id"
NOT NULL HASHCOL ) NOT NULL as "%3"."%3", "o"."open_auction_id" NOT NULL ]
-| | | | ) [ "b2"."id" NOT NULL HASHCOL = "%3"."%3" NOT NULL ]
+| | | | | ) [ "o"."open_auction_id" NOT NULL ] [ sys.max no nil ("b2a"."id"
NOT NULL HASHCOL ) as "%3"."%3", "o"."open_auction_id" NOT NULL ]
+| | | | ) [ "b2"."id" NOT NULL HASHCOL = "%3"."%3" ]
| | | ) [ "b2"."increase" NOT NULL, "o"."open_auction_id" NOT NULL as
"%6"."%6" ]
| | ) [ "o"."open_auction_id" NOT NULL * = "%6"."%6" NOT NULL ]
-| ) [ sys.sql_mul("%2"."%2" NOT NULL, double "2") <= "b2"."increase" NOT NULL ]
+| ) [ sys.sql_mul("%2"."%2" NOT NULL, double "2") NOT NULL <= "b2"."increase"
NOT NULL ]
) [ "b"."id" NOT NULL HASHCOL , "b"."open_auction_id" NOT NULL, "b"."date" NOT
NULL, "b"."time" NOT NULL, "b"."personref" NOT NULL, "b"."increase" NOT NULL ]
query ITTTTR rowsort
diff --git
a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.test
b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.test
--- a/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.test
+++ b/sql/test/BugTracker-2015/Tests/crash_in_reduce_groupby.Bug-3818.test
@@ -28,8 +28,8 @@ GROUP BY cods, elrik, ether, jaelen, sor
project (
| group by (
| | table(sys.t2a) [ "t2a"."tib0" ] COUNT
-| ) [ tinyint "0" as "sora" ] [ tinyint "0" as "cods", tinyint "0" as "elrik",
tinyint "0" as "ether", tinyint "0" as "jaelen", "sora", sys.min no nil
("t2a"."tib0") as "%1"."%1" ]
-) [ "cods", "elrik", "ether", "jaelen", "sora", "%1"."%1" ]
+| ) [ tinyint "0" as "sora" ] [ tinyint "0" as "cods", tinyint "0" as "elrik",
tinyint "0" as "ether", tinyint "0" as "jaelen", "sora" NOT NULL, sys.min no
nil ("t2a"."tib0") as "%1"."%1" ]
+) [ "cods" NOT NULL, "elrik" NOT NULL, "ether" NOT NULL, "jaelen" NOT NULL,
"sora" NOT NULL, "%1"."%1" ]
statement ok
drop table t2a
diff --git
a/sql/test/BugTracker-2015/Tests/quantile_function_resolution.Bug-3773.test
b/sql/test/BugTracker-2015/Tests/quantile_function_resolution.Bug-3773.test
--- a/sql/test/BugTracker-2015/Tests/quantile_function_resolution.Bug-3773.test
+++ b/sql/test/BugTracker-2015/Tests/quantile_function_resolution.Bug-3773.test
@@ -12,7 +12,7 @@ project (
| | project (
| | | table(sys.x) [ "x"."y" ] COUNT
| | ) [ "x"."y", double "0" as "%2"."%2" ]
-| ) [ ] [ sys.quantile no nil (decimal(18,3)["x"."y"] as "x"."y", "%2"."%2")
as "%1"."%1" ]
+| ) [ ] [ sys.quantile no nil (decimal(18,3)["x"."y"] as "x"."y", "%2"."%2"
NOT NULL) as "%1"."%1" ]
) [ "%1"."%1" ]
query T nosort
@@ -23,7 +23,7 @@ project (
| | project (
| | | table(sys.x) [ "x"."y" ] COUNT
| | ) [ "x"."y", double "0" as "%2"."%2" ]
-| ) [ ] [ sys.quantile no nil (decimal(18,3)["x"."y"] as "x"."y", "%2"."%2")
as "%1"."%1" ]
+| ) [ ] [ sys.quantile no nil (decimal(18,3)["x"."y"] as "x"."y", "%2"."%2"
NOT NULL) as "%1"."%1" ]
) [ "%1"."%1" ]
statement ok
diff --git
a/sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.test
b/sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.test
---
a/sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.test
+++
b/sql/test/BugTracker-2016/Tests/memory-consumption-query-PLAN-25joins.Bug-3972.test
@@ -185,7 +185,7 @@ top N (
| | | | ) [ "a3"."t3pkcol" HASHCOL = "table1"."t1cold113" ],
| | | | table(sys.table12) [ "table12"."t12cola1" ] COUNT
| | | ) [ "table12"."t12cola1" = "table1"."t1cola1" ]
-| | ) [ (((((((((((((((char["table1"."t1cold1"] as "table1"."t1cold1") FILTER
ilike (char "%a%", char "")) or ((char["table1"."t1cola1"] as
"table1"."t1cola1") FILTER ilike (char "%a%", char ""))) or
((char["table1"."t1colb1"] as "table1"."t1colb1") FILTER ilike (char "%a%",
char ""))) or ((char["table1"."t1cola11"] as "table1"."t1cola11") FILTER ilike
(char "%business%", char ""))) or ("table1"."t1colc91" >= timestamp(7)
"2016-03-21 05:00:00.000000")) or ("table1"."t1cola101" = tinyint "1")) or
((char["table1"."t1cola12"] as "table1"."t1cola12") FILTER ilike (char
"%Vijay%", char ""))) or ((char["table2"."t2cola1"] as "table2"."t2cola1") !
FILTER ilike (char "%gmail%", char ""), (char["table2"."t2cola1"] as
"table2"."t2cola1") ! FILTER ilike (char "%yahoo%", char ""))) or
((char["table2"."t2cola1"] as "table2"."t2cola1") FILTER ilike (char
"%efequitygroup.com%", char ""))) or ("table4"."t4cola1" = clob "Customer")) or
("table4"."t4cola2" ! * = clob "NULL")) or ("table2"."t2cola81"
>= date "2009-08-31")) or ((("table5"."t5cola1" = clob "BAT") or
>((char["table5"."t5cola2"] as "table5"."t5cola2") FILTER ilike (char
>"%AUSTRALIA%", char ""))) or ((char["table5"."t5cola2"] as
>"table5"."t5cola2") FILTER ilike (char "%Monet%", char ""),
>"table5"."t5cola3" = clob "Facebook", "table5"."t5cola5" = clob "new",
>"table5"."t5cola81" > date "2015-07-30"))) or ((("table10"."t10cola1" != clob
>"Completed", "table9"."t9cola1" = clob "Tasks", "table9"."t9cola91" >=
>timestamp(7) "2012-01-01 04:32:27.000000", "table10"."t10cola91" <=
>timestamp(7) "2013-01-01 04:32:27.000000") or ("table9"."t9cola1" = clob
>"Events", timestamp(7) "2012-01-01 04:32:27.000000" <= "table11"."t11cola91"
><= timestamp(7) "2013-01-01 04:32:27.000000" BETWEEN )) or
>("table9"."t9cola1" = clob "Calls", timestamp(7) "2012-01-01 04:32:27.000000"
><= "table10"."t10cola91" <= timestamp(7) "2013-01-01 04:32:27.000000" BETWEEN
>)), "table1"."t1cold111" in (bigint "15842000014793046" as "%2"."%2", bigint
>"1584200001770
1488" as "%3"."%3", bigint "15842000000024019" as "%4"."%4", bigint
"15842000000074007" as "%5"."%5", bigint "15842000009358096" as "%6"."%6",
bigint "15842000010487625" as "%7"."%7", bigint "15842000006731919" as
"%10"."%10", bigint "15842000002590112" as "%11"."%11", bigint
"15842000000019001" as "%12"."%12", bigint "15842000014923682" as "%13"."%13",
bigint "15842000027547249" as "%14"."%14")) or ("table12"."t12cola1" in
(clob[bigint "15842000280111951"], clob[bigint "15842000280163015"])) ]
+| | ) [ (((((((((((((((char["table1"."t1cold1"] as "table1"."t1cold1") FILTER
ilike (char "%a%", char "")) or ((char["table1"."t1cola1"] as
"table1"."t1cola1") FILTER ilike (char "%a%", char ""))) or
((char["table1"."t1colb1"] as "table1"."t1colb1") FILTER ilike (char "%a%",
char ""))) or ((char["table1"."t1cola11"] as "table1"."t1cola11") FILTER ilike
(char "%business%", char ""))) or ("table1"."t1colc91" >= timestamp(7)
"2016-03-21 05:00:00.000000")) or ("table1"."t1cola101" = tinyint "1")) or
((char["table1"."t1cola12"] as "table1"."t1cola12") FILTER ilike (char
"%Vijay%", char ""))) or ((char["table2"."t2cola1"] as "table2"."t2cola1") !
FILTER ilike (char "%gmail%", char ""), (char["table2"."t2cola1"] as
"table2"."t2cola1") ! FILTER ilike (char "%yahoo%", char ""))) or
((char["table2"."t2cola1"] as "table2"."t2cola1") FILTER ilike (char
"%efequitygroup.com%", char ""))) or ("table4"."t4cola1" = clob "Customer")) or
("table4"."t4cola2" ! * = clob "NULL")) or ("table2"."t2cola81"
>= date "2009-08-31")) or ((("table5"."t5cola1" = clob "BAT") or
>((char["table5"."t5cola2"] as "table5"."t5cola2") FILTER ilike (char
>"%AUSTRALIA%", char ""))) or ((char["table5"."t5cola2"] as
>"table5"."t5cola2") FILTER ilike (char "%Monet%", char ""),
>"table5"."t5cola3" = clob "Facebook", "table5"."t5cola5" = clob "new",
>"table5"."t5cola81" > date "2015-07-30"))) or ((("table10"."t10cola1" != clob
>"Completed", "table9"."t9cola1" = clob "Tasks", "table9"."t9cola91" >=
>timestamp(7) "2012-01-01 04:32:27.000000", "table10"."t10cola91" <=
>timestamp(7) "2013-01-01 04:32:27.000000") or ("table9"."t9cola1" = clob
>"Events", timestamp(7) "2012-01-01 04:32:27.000000" <= "table11"."t11cola91"
><= timestamp(7) "2013-01-01 04:32:27.000000" BETWEEN )) or
>("table9"."t9cola1" = clob "Calls", timestamp(7) "2012-01-01 04:32:27.000000"
><= "table10"."t10cola91" <= timestamp(7) "2013-01-01 04:32:27.000000" BETWEEN
>)), "table1"."t1cold111" in (bigint "15842000014793046" as "%2"."%2", bigint
>"1584200001770
1488" as "%3"."%3", bigint "15842000000024019" as "%4"."%4", bigint
"15842000000074007" as "%5"."%5", bigint "15842000009358096" as "%6"."%6",
bigint "15842000010487625" as "%7"."%7", bigint "15842000006731919" as
"%10"."%10", bigint "15842000002590112" as "%11"."%11", bigint
"15842000000019001" as "%12"."%12", bigint "15842000014923682" as "%13"."%13",
bigint "15842000027547249" as "%14"."%14")) or ("table12"."t12cola1" in
(clob[bigint "15842000280111951"] NOT NULL, clob[bigint "15842000280163015"]
NOT NULL)) ]
| ) [ "table1"."t1pkcol" NOT NULL HASHCOL , "table1"."t1cola82",
"table2"."t2cola10", "table1"."t1cola1", "table1"."t1cola91", "a1"."t3cola1" ]
[ "table2"."t2cola82" NULLS LAST ]
) [ bigint "10", bigint "0" ]
diff --git a/sql/test/Tests/keys.test b/sql/test/Tests/keys.test
--- a/sql/test/Tests/keys.test
+++ b/sql/test/Tests/keys.test
@@ -60,8 +60,8 @@ plan select count(distinct b) from dummy
project (
| group by (
| | table(sys.dummyme) [ "dummyme"."b" ] COUNT
-| ) [ ] [ sys.count unique no nil ("dummyme"."b") as "%1"."%1" ]
-) [ "%1"."%1" ]
+| ) [ ] [ sys.count unique no nil ("dummyme"."b") NOT NULL as "%1"."%1" ]
+) [ "%1"."%1" NOT NULL ]
query T nosort
PLAN select count(distinct a + 1) from dummyme
@@ -70,9 +70,9 @@ project (
| group by (
| | project (
| | | table(sys.dummyme) [ "dummyme"."a" NOT NULL HASHCOL ] COUNT
-| | ) [ bigint["dummyme"."a" NOT NULL HASHCOL ] NOT NULL as "%3"."%3",
sys.sql_add("%3"."%3" NOT NULL, bigint "1") as "%2"."%2" ]
-| ) [ ] [ sys.count unique no nil ("%2"."%2") as "%1"."%1" ]
-) [ "%1"."%1" ]
+| | ) [ bigint["dummyme"."a" NOT NULL HASHCOL ] NOT NULL as "%3"."%3",
sys.sql_add("%3"."%3" NOT NULL, bigint "1") NOT NULL as "%2"."%2" ]
+| ) [ ] [ sys.count unique no nil ("%2"."%2" NOT NULL) NOT NULL as "%1"."%1"
]
+) [ "%1"."%1" NOT NULL ]
query T nosort
PLAN select count(distinct a + b) from dummyme
@@ -82,8 +82,8 @@ project (
| | project (
| | | table(sys.dummyme) [ "dummyme"."a" NOT NULL HASHCOL , "dummyme"."b" ]
COUNT
| | ) [ bigint["dummyme"."a" NOT NULL HASHCOL ] NOT NULL as "%3"."%3",
bigint["dummyme"."b"] as "%4"."%4", sys.sql_add("%3"."%3" NOT NULL, "%4"."%4")
as "%2"."%2" ]
-| ) [ ] [ sys.count unique no nil ("%2"."%2") as "%1"."%1" ]
-) [ "%1"."%1" ]
+| ) [ ] [ sys.count unique no nil ("%2"."%2") NOT NULL as "%1"."%1" ]
+) [ "%1"."%1" NOT NULL ]
query T nosort
PLAN select count(distinct abs(a)) from dummyme
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
@@ -60,7 +60,7 @@ union (
| | | table(sys.second_decade) [ "second_decade"."stamp" as "splitted"."stamp"
] COUNT
| | ) [ "splitted"."stamp" in (timestamp(7) "2000-01-01 00:00:00.000000" as
"%2"."%2", timestamp(7) "2010-01-01 00:00:00.000000" as "%3"."%3") ]
| ) [ tinyint "1" ]
-) [ "%6"."%6" ]
+) [ "%6"."%6" NOT NULL ]
query T nosort
plan select 1 from splitted where stamp IN (TIMESTAMP '2000-02-01 00:00:00',
TIMESTAMP '2010-02-01 00:00:00', TIMESTAMP '2020-02-01 00:00:00')
@@ -77,13 +77,13 @@ union (
| | | | table(sys.second_decade) [ "second_decade"."stamp" as
"splitted"."stamp" ] COUNT
| | | ) [ "splitted"."stamp" in (timestamp(7) "2000-02-01 00:00:00.000000" as
"%2"."%2", timestamp(7) "2010-02-01 00:00:00.000000" as "%3"."%3", timestamp(7)
"2020-02-01 00:00:00.000000" as "%4"."%4") ]
| | ) [ tinyint "1" ]
-| ) [ "%11"."%11" ],
+| ) [ "%11"."%11" NOT NULL ],
| project (
| | select (
| | | table(sys.third_decade) [ "third_decade"."stamp" as "splitted"."stamp" ]
COUNT
| | ) [ "splitted"."stamp" in (timestamp(7) "2000-02-01 00:00:00.000000" as
"%2"."%2", timestamp(7) "2010-02-01 00:00:00.000000" as "%3"."%3", timestamp(7)
"2020-02-01 00:00:00.000000" as "%4"."%4") ]
| ) [ tinyint "1" ]
-) [ "%10"."%10" ]
+) [ "%10"."%10" NOT NULL ]
query T nosort
plan select 1 from splitted where stamp BETWEEN TIMESTAMP '2020-01-01
00:00:00' AND TIMESTAMP '2020-10-01 00:00:00'
@@ -108,7 +108,7 @@ union (
| | | table(sys.second_decade) [ "second_decade"."stamp" as "splitted"."stamp"
] COUNT
| | ) [ timestamp(7) "2020-01-01 00:00:00.000000" ! <= "splitted"."stamp" ! <=
timestamp(7) "2020-10-01 00:00:00.000000" BETWEEN ]
| ) [ tinyint "1" ]
-) [ "%3"."%3" ]
+) [ "%3"."%3" NOT NULL ]
query T nosort
plan select 1 from splitted where stamp BETWEEN TIMESTAMP '2010-01-01
00:00:00' AND TIMESTAMP '2020-03-01 00:00:00'
@@ -124,7 +124,7 @@ union (
| | | table(sys.third_decade) [ "third_decade"."stamp" as "splitted"."stamp" ]
COUNT
| | ) [ timestamp(7) "2010-01-01 00:00:00.000000" <= "splitted"."stamp" <=
timestamp(7) "2020-03-01 00:00:00.000000" BETWEEN ]
| ) [ tinyint "1" ]
-) [ "%3"."%3" ]
+) [ "%3"."%3" NOT NULL ]
query T nosort
plan select 1 from splitted where stamp BETWEEN TIMESTAMP '2000-02-01
00:00:00' AND TIMESTAMP '2020-03-01 00:00:00'
@@ -141,13 +141,13 @@ union (
| | | | table(sys.second_decade) [ "second_decade"."stamp" as
"splitted"."stamp" ] COUNT
| | | ) [ timestamp(7) "2000-02-01 00:00:00.000000" <= "splitted"."stamp" <=
timestamp(7) "2020-03-01 00:00:00.000000" BETWEEN ]
| | ) [ tinyint "1" ]
-| ) [ "%5"."%5" ],
+| ) [ "%5"."%5" NOT NULL ],
| project (
| | select (
| | | table(sys.third_decade) [ "third_decade"."stamp" as "splitted"."stamp" ]
COUNT
| | ) [ timestamp(7) "2000-02-01 00:00:00.000000" <= "splitted"."stamp" <=
timestamp(7) "2020-03-01 00:00:00.000000" BETWEEN ]
| ) [ tinyint "1" ]
-) [ "%4"."%4" ]
+) [ "%4"."%4" NOT NULL ]
query T nosort
plan select 1 from splitted where stamp NOT BETWEEN TIMESTAMP '2000-02-01
00:00:00' AND TIMESTAMP '2020-03-01 00:00:00'
@@ -176,7 +176,7 @@ union (
| | | table(sys.third_decade) [ "third_decade"."stamp" as "splitted"."stamp" ]
COUNT
| | ) [ "splitted"."stamp" > timestamp(7) "2010-03-01 00:00:00.000000" ]
| ) [ tinyint "1" ]
-) [ "%3"."%3" ]
+) [ "%3"."%3" NOT NULL ]
query T nosort
plan select 1 from splitted where stamp <= TIMESTAMP '2009-01-01 00:00:00'
@@ -211,13 +211,13 @@ union (
| | | | table(sys.second_decade) [ "second_decade"."stamp" as
"splitted"."stamp" ] COUNT
| | | ) [ "splitted"."stamp" <= timestamp(7) "2020-10-01 00:00:00.000000" ]
| | ) [ tinyint "1" ]
-| ) [ "%5"."%5" ],
+| ) [ "%5"."%5" NOT NULL ],
| project (
| | select (
| | | table(sys.third_decade) [ "third_decade"."stamp" as "splitted"."stamp" ]
COUNT
| | ) [ "splitted"."stamp" <= timestamp(7) "2020-10-01 00:00:00.000000" ]
| ) [ tinyint "1" ]
-) [ "%4"."%4" ]
+) [ "%4"."%4" NOT NULL ]
query T nosort
plan select 1 from splitted where stamp < TIMESTAMP '2000-01-01 00:00:00'
@@ -278,7 +278,7 @@ union (
| | | table(sys.second_decade) [ "second_decade"."stamp" as "splitted"."stamp"
] COUNT
| | ) [ timestamp(7) "2000-01-01 00:00:00.000000" <= "splitted"."stamp" <
timestamp(7) "2020-01-01 00:00:00.000000" BETWEEN ]
| ) [ tinyint "1" ]
-) [ "%3"."%3" ]
+) [ "%3"."%3" NOT NULL ]
query T nosort
plan select 1 from splitted where stamp > TIMESTAMP '2010-01-01 00:00:00' and
stamp < TIMESTAMP '2020-01-01 00:00:00'
@@ -312,7 +312,7 @@ union (
| | | table(sys.second_decade) [ "second_decade"."stamp" as "splitted"."stamp"
] COUNT
| | ) [ timestamp(7) "2001-01-02 00:00:00.000000" < "splitted"."stamp" <
timestamp(7) "2015-01-01 00:00:00.000000" BETWEEN ]
| ) [ tinyint "1" ]
-) [ "%3"."%3" ]
+) [ "%3"."%3" NOT NULL ]
query T nosort
plan select 1 from splitted where stamp > TIMESTAMP '2010-01-01 00:00:00' and
stamp < TIMESTAMP '2010-01-01 00:00:00'
@@ -337,7 +337,7 @@ union (
| | | table(sys.second_decade) [ "second_decade"."stamp" as "splitted"."stamp"
] COUNT
| | ) [ timestamp(7) "2009-01-01 00:00:00.000000" < "splitted"."stamp" <=
timestamp(7) "2010-01-01 00:00:00.000000" BETWEEN ]
| ) [ tinyint "1" ]
-) [ "%3"."%3" ]
+) [ "%3"."%3" NOT NULL ]
query T nosort
plan select 1 from splitted where stamp > TIMESTAMP '2009-01-01 00:00:00' and
stamp <= TIMESTAMP '2020-01-01 00:00:00'
@@ -354,13 +354,13 @@ union (
| | | | table(sys.second_decade) [ "second_decade"."stamp" as
"splitted"."stamp" ] COUNT
| | | ) [ timestamp(7) "2009-01-01 00:00:00.000000" < "splitted"."stamp" <=
timestamp(7) "2020-01-01 00:00:00.000000" BETWEEN ]
| | ) [ tinyint "1" ]
-| ) [ "%5"."%5" ],
+| ) [ "%5"."%5" NOT NULL ],
| project (
| | select (
| | | table(sys.third_decade) [ "third_decade"."stamp" as "splitted"."stamp" ]
COUNT
| | ) [ timestamp(7) "2009-01-01 00:00:00.000000" < "splitted"."stamp" <=
timestamp(7) "2020-01-01 00:00:00.000000" BETWEEN ]
| ) [ tinyint "1" ]
-) [ "%4"."%4" ]
+) [ "%4"."%4" NOT NULL ]
statement ok
CREATE TABLE fourth_decade (stamp TIMESTAMP, val INT)
@@ -394,7 +394,7 @@ union (
| | | table(sys.fourth_decade) [ "fourth_decade"."stamp" as "splitted"."stamp"
] COUNT
| | ) [ timestamp(7) "1999-01-01 00:00:00.000000" < "splitted"."stamp" <=
timestamp(7) "2001-01-01 00:00:00.000000" BETWEEN ]
| ) [ tinyint "1" ]
-) [ "%3"."%3" ]
+) [ "%3"."%3" NOT NULL ]
query T nosort
plan select 1 from splitted where stamp = TIMESTAMP '2010-01-01 00:00:00'
@@ -484,13 +484,13 @@ union (
| | | | table(sys.second_decade2) [ "second_decade2"."val" as
"splitted2"."val" ] COUNT
| | | ) [ "splitted2"."val" = int "1" ]
| | ) [ tinyint "1" ]
-| ) [ "%5"."%5" ],
+| ) [ "%5"."%5" NOT NULL ],
| project (
| | select (
| | | table(sys.third_decade2) [ "third_decade2"."val" as "splitted2"."val" ]
COUNT
| | ) [ "splitted2"."val" = int "1" ]
| ) [ tinyint "1" ]
-) [ "%4"."%4" ]
+) [ "%4"."%4" NOT NULL ]
query T nosort
plan select 1 from splitted2 where stamp is null
diff --git a/sql/test/mergetables/Tests/part-elim.test
b/sql/test/mergetables/Tests/part-elim.test
--- a/sql/test/mergetables/Tests/part-elim.test
+++ b/sql/test/mergetables/Tests/part-elim.test
@@ -106,12 +106,12 @@ union (
| project (
| | select (
| | | table(sys.mt1) [ "mt1"."id" as "test"."id", "mt1"."posx" as
"test"."posx" ] COUNT
-| | ) [ bigint "1" <= "test"."id" <= bigint[sys.sql_mul(smallint "1000",
tinyint "10")] BETWEEN ]
+| | ) [ bigint "1" <= "test"."id" <= bigint[sys.sql_mul(smallint "1000",
tinyint "10") NOT NULL] NOT NULL BETWEEN ]
| ) [ "test"."id", "test"."posx" ],
| project (
| | select (
| | | table(sys.mt2) [ "mt2"."id" as "test"."id", "mt2"."posx" as
"test"."posx" ] COUNT
-| | ) [ bigint "1" <= "test"."id" <= bigint[sys.sql_mul(smallint "1000",
tinyint "10")] BETWEEN ]
+| | ) [ bigint "1" <= "test"."id" <= bigint[sys.sql_mul(smallint "1000",
tinyint "10") NOT NULL] NOT NULL BETWEEN ]
| ) [ "test"."id", "test"."posx" ]
) [ "test"."id", "test"."posx" ]
@@ -122,12 +122,12 @@ union (
| project (
| | select (
| | | table(sys.mt1) [ "mt1"."id" as "test"."id", "mt1"."posx" as
"test"."posx" ] COUNT
-| | ) [ bigint "1" <= "test"."id" <= bigint[sys.sql_mul(tinyint "100", tinyint
"10")] BETWEEN ]
+| | ) [ bigint "1" <= "test"."id" <= bigint[sys.sql_mul(tinyint "100", tinyint
"10") NOT NULL] NOT NULL BETWEEN ]
| ) [ "test"."id", "test"."posx" ],
| project (
| | select (
| | | table(sys.mt2) [ "mt2"."id" as "test"."id", "mt2"."posx" as
"test"."posx" ] COUNT
-| | ) [ bigint "1" <= "test"."id" <= bigint[sys.sql_mul(tinyint "100", tinyint
"10")] BETWEEN ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
