Changeset: 1a91c4fb4a63 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1a91c4fb4a63
Branch: mtest
Log Message:

merged


diffs (truncated from 968 to 300 lines):

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
@@ -28,190 +28,339 @@ INSERT INTO splitted VALUES (TIMESTAMP '
 statement ok
 INSERT INTO splitted VALUES (TIMESTAMP '2020-01-01 00:00:00', 5), (NULL, 6)
 
-query T rowsort
+query T nosort
 plan select 1 from splitted where stamp = TIMESTAMP '2020-01-01 00:00:00'
 ----
-) [ tinyint "1" ]
 project (
-| ) [ "splitted"."stamp" = timestamp(7) "2020-01-01 00:00:00.000000" ]
 | select (
 | | table(sys.third_decade) [ "splitted"."stamp" ] COUNT 
+| ) [ "splitted"."stamp" = timestamp(7) "2020-01-01 00:00:00.000000" ]
+) [ tinyint "1" ]
 
-query T rowsort
+query T nosort
 plan select 1 from splitted where stamp IN (TIMESTAMP '2000-01-01 00:00:00', 
TIMESTAMP '2000-02-01 00:00:00')
 ----
-) [ tinyint "1" ]
 project (
-| ) [ "splitted"."stamp" in (timestamp(7) "2000-01-01 00:00:00.000000" as 
"%2"."%2", timestamp(7) "2000-02-01 00:00:00.000000" as "%3"."%3") ]
 | select (
 | | table(sys.first_decade) [ "splitted"."stamp" ] COUNT 
+| ) [ "splitted"."stamp" in (timestamp(7) "2000-01-01 00:00:00.000000" as 
"%2"."%2", timestamp(7) "2000-02-01 00:00:00.000000" as "%3"."%3") ]
+) [ tinyint "1" ]
 
-query T rowsort
+query T nosort
 plan select 1 from splitted where stamp IN (TIMESTAMP '2000-01-01 00:00:00', 
TIMESTAMP '2010-01-01 00:00:00')
 ----
-12 values hashing to 5c1ec7bdd7279fe4a4ef02d73eb8f9fb
+union (
+| project (
+| | select (
+| | | table(sys.first_decade) [ "first_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" ],
+| project (
+| | select (
+| | | 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" ]
 
-query T rowsort
+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')
 ----
-19 values hashing to 99881046b2ef3066f8f90935ab4d362e
+union (
+| union (
+| | project (
+| | | select (
+| | | | table(sys.first_decade) [ "first_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" ],
+| | project (
+| | | select (
+| | | | 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" ],
+| 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" ]
 
-query T rowsort
+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'
 ----
-) [ tinyint "1" ]
 project (
-| ) [ timestamp(7) "2020-01-01 00:00:00.000000" <= "splitted"."stamp" <= 
timestamp(7) "2020-10-01 00:00:00.000000" BETWEEN  ]
 | select (
 | | table(sys.third_decade) [ "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" ]
 
-query T rowsort
+query T nosort
 plan select 1 from splitted where stamp NOT BETWEEN TIMESTAMP '2020-01-01 
00:00:00' AND TIMESTAMP '2020-10-01 00:00:00'
 ----
-12 values hashing to 93453669000224337f720e3e3fdd8424
+union (
+| project (
+| | select (
+| | | table(sys.first_decade) [ "first_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" ],
+| project (
+| | select (
+| | | 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" ]
 
-query T rowsort
+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'
 ----
-12 values hashing to 4f4473eeeca476407fca9b3d01c3b00e
+union (
+| project (
+| | select (
+| | | table(sys.second_decade) [ "second_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" ],
+| project (
+| | select (
+| | | 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" ]
 
-query T rowsort
+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'
 ----
-19 values hashing to 0c79cf044970ff44d9befdb810b7511d
+union (
+| union (
+| | project (
+| | | select (
+| | | | table(sys.first_decade) [ "first_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" ],
+| | project (
+| | | select (
+| | | | 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" ],
+| 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" ]
 
-query T rowsort
+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'
 ----
-) [ tinyint "1" ]
 project (
-| ) [ boolean "false" ]
 | select (
 | |  [ boolean "true" ]
+| ) [ boolean "false" ]
+) [ tinyint "1" ]
 
 query TI rowsort
 select * from splitted where stamp NOT BETWEEN TIMESTAMP '2000-02-01 00:00:00' 
AND TIMESTAMP '2020-03-01 00:00:00'
 ----
 
-query T rowsort
+query T nosort
 plan select 1 from splitted where stamp > TIMESTAMP '2010-03-01 00:00:00'
 ----
-12 values hashing to 47a8f085d081078291b2a40f4fa2d3ac
+union (
+| project (
+| | select (
+| | | table(sys.second_decade) [ "second_decade"."stamp" as "splitted"."stamp" 
] COUNT 
+| | ) [ "splitted"."stamp" > timestamp(7) "2010-03-01 00:00:00.000000" ]
+| ) [ tinyint "1" ],
+| project (
+| | select (
+| | | 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" ]
 
-query T rowsort
+query T nosort
 plan select 1 from splitted where stamp <= TIMESTAMP '2009-01-01 00:00:00'
 ----
-) [ tinyint "1" ]
 project (
-| ) [ "splitted"."stamp" <= timestamp(7) "2009-01-01 00:00:00.000000" ]
 | select (
 | | table(sys.first_decade) [ "splitted"."stamp" ] COUNT 
+| ) [ "splitted"."stamp" <= timestamp(7) "2009-01-01 00:00:00.000000" ]
+) [ tinyint "1" ]
 
-query T rowsort
+query T nosort
 plan select 1 from splitted where stamp >= TIMESTAMP '2010-01-01 00:00:00' AND 
stamp < TIMESTAMP '2019-01-01 00:00:00'
 ----
-) [ tinyint "1" ]
 project (
-| ) [ timestamp(7) "2010-01-01 00:00:00.000000" <= "splitted"."stamp" < 
timestamp(7) "2019-01-01 00:00:00.000000" BETWEEN  ]
 | select (
 | | table(sys.second_decade) [ "splitted"."stamp" ] COUNT 
+| ) [ timestamp(7) "2010-01-01 00:00:00.000000" <= "splitted"."stamp" < 
timestamp(7) "2019-01-01 00:00:00.000000" BETWEEN  ]
+) [ tinyint "1" ]
 
-query T rowsort
+query T nosort
 plan select 1 from splitted where stamp <= TIMESTAMP '2020-10-01 00:00:00'
 ----
-19 values hashing to 5c04b35ccbd2617b0f97f43ba897187e
+union (
+| union (
+| | project (
+| | | select (
+| | | | table(sys.first_decade) [ "first_decade"."stamp" as "splitted"."stamp" 
] COUNT 
+| | | ) [ "splitted"."stamp" <= timestamp(7) "2020-10-01 00:00:00.000000" ]
+| | ) [ tinyint "1" ],
+| | project (
+| | | select (
+| | | | 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" ],
+| 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" ]
 
-query T rowsort
+query T nosort
 plan select 1 from splitted where stamp < TIMESTAMP '2000-01-01 00:00:00'
 ----
-) [ tinyint "1" ]
 project (
-| ) [ boolean "false" ]
 | select (
 | |  [ boolean "true" ]
+| ) [ boolean "false" ]
+) [ tinyint "1" ]
 
-query T rowsort
+query T nosort
 plan select 1 from splitted where stamp <= TIMESTAMP '2000-01-01 00:00:00'
 ----
-) [ tinyint "1" ]
 project (
-| ) [ "splitted"."stamp" <= timestamp(7) "2000-01-01 00:00:00.000000" ]
 | select (
 | | table(sys.first_decade) [ "splitted"."stamp" ] COUNT 
+| ) [ "splitted"."stamp" <= timestamp(7) "2000-01-01 00:00:00.000000" ]
+) [ tinyint "1" ]
 
-query T rowsort
+query T nosort
 plan select 1 from splitted where stamp is null
 ----
-) [ tinyint "1" ]
 project (
-| ) [ "splitted"."stamp" * = timestamp(7) "NULL" ]
 | select (
 | | table(sys.third_decade) [ "splitted"."stamp" ] COUNT 
+| ) [ "splitted"."stamp" * = timestamp(7) "NULL" ]
+) [ tinyint "1" ]
 
-query T rowsort
+query T nosort
 plan select 1 from splitted where stamp is null and stamp < TIMESTAMP 
'2008-01-01 00:00:00'
 ----
-) [ tinyint "1" ]
 project (
-| ) [ boolean "false" ]
 | select (
 | |  [ boolean "true" ]
+| ) [ boolean "false" ]
+) [ tinyint "1" ]
 
-query T rowsort
+query T nosort
 plan select 1 from splitted where stamp > TIMESTAMP '2020-01-01 00:00:00' and 
stamp <= TIMESTAMP '2020-01-01 00:00:00'
 ----
-) [ tinyint "1" ]
 project (
-| ) [ timestamp(7) "2020-01-01 00:00:00.000000" < "splitted"."stamp" <= 
timestamp(7) "2020-01-01 00:00:00.000000" BETWEEN  ]
 | select (
 | | table(sys.third_decade) [ "splitted"."stamp" ] COUNT 
+| ) [ timestamp(7) "2020-01-01 00:00:00.000000" < "splitted"."stamp" <= 
timestamp(7) "2020-01-01 00:00:00.000000" BETWEEN  ]
+) [ tinyint "1" ]
 
-query T rowsort
+query T nosort
 plan select 1 from splitted where stamp >= TIMESTAMP '2000-01-01 00:00:00' and 
stamp < TIMESTAMP '2020-01-01 00:00:00'
 ----
-12 values hashing to 72d7507e7d12f402b333d6dc1e51e58c
+union (
+| project (
+| | select (
+| | | table(sys.first_decade) [ "first_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  ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to