Changeset: fdcfc9ab7e9e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fdcfc9ab7e9e
Modified Files:
sql/test/merge-partitions/Tests/mergepart31.test
Branch: balanced_union
Log Message:
Fix plans of merge table tests
diffs (292 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
@@ -49,7 +49,7 @@ project (
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')
----
-union (
+munion (
| project (
| | select (
| | | table("sys"."first_decade") [ "first_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
@@ -65,25 +65,23 @@ union (
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')
----
-union (
-| union (
-| | project (
-| | | select (
-| | | | table("sys"."first_decade") [ "first_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
-| | | ) [ ("splitted"."stamp" UNIQUE) in (timestamp(7) "2000-02-01
00:00:00.000000", timestamp(7) "2010-02-01 00:00:00.000000", timestamp(7)
"2020-02-01 00:00:00.000000") ]
-| | ) [ tinyint(1) "1" ],
-| | project (
-| | | select (
-| | | | table("sys"."second_decade") [ "second_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
-| | | ) [ ("splitted"."stamp" UNIQUE) in (timestamp(7) "2000-02-01
00:00:00.000000", timestamp(7) "2010-02-01 00:00:00.000000", timestamp(7)
"2020-02-01 00:00:00.000000") ]
-| | ) [ tinyint(1) "1" ]
-| ) [ "%7"."%7" NOT NULL ],
+munion (
+| project (
+| | select (
+| | | table("sys"."first_decade") [ "first_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
+| | ) [ ("splitted"."stamp" UNIQUE) in (timestamp(7) "2000-02-01
00:00:00.000000", timestamp(7) "2010-02-01 00:00:00.000000", timestamp(7)
"2020-02-01 00:00:00.000000") ]
+| ) [ tinyint(1) "1" ],
+| project (
+| | select (
+| | | table("sys"."second_decade") [ "second_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
+| | ) [ ("splitted"."stamp" UNIQUE) in (timestamp(7) "2000-02-01
00:00:00.000000", timestamp(7) "2010-02-01 00:00:00.000000", timestamp(7)
"2020-02-01 00:00:00.000000") ]
+| ) [ tinyint(1) "1" ],
| project (
| | select (
| | | table("sys"."third_decade") [ "third_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
| | ) [ ("splitted"."stamp" UNIQUE) in (timestamp(7) "2000-02-01
00:00:00.000000", timestamp(7) "2010-02-01 00:00:00.000000", timestamp(7)
"2020-02-01 00:00:00.000000") ]
| ) [ tinyint(1) "1" ]
-) [ "%6"."%6" NOT NULL ]
+) [ "%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'
@@ -97,7 +95,7 @@ project (
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'
----
-union (
+munion (
| project (
| | select (
| | | table("sys"."first_decade") [ "first_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
@@ -113,7 +111,7 @@ union (
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'
----
-union (
+munion (
| project (
| | select (
| | | table("sys"."second_decade") [ "second_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
@@ -129,25 +127,23 @@ union (
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'
----
-union (
-| union (
-| | project (
-| | | select (
-| | | | table("sys"."first_decade") [ "first_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
-| | | ) [ (timestamp(7) "2000-02-01 00:00:00.000000") <= ("splitted"."stamp"
UNIQUE) <= (timestamp(7) "2020-03-01 00:00:00.000000") ]
-| | ) [ tinyint(1) "1" ],
-| | project (
-| | | select (
-| | | | table("sys"."second_decade") [ "second_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
-| | | ) [ (timestamp(7) "2000-02-01 00:00:00.000000") <= ("splitted"."stamp"
UNIQUE) <= (timestamp(7) "2020-03-01 00:00:00.000000") ]
-| | ) [ tinyint(1) "1" ]
-| ) [ "%6"."%6" NOT NULL ],
+munion (
+| project (
+| | select (
+| | | table("sys"."first_decade") [ "first_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
+| | ) [ (timestamp(7) "2000-02-01 00:00:00.000000") <= ("splitted"."stamp"
UNIQUE) <= (timestamp(7) "2020-03-01 00:00:00.000000") ]
+| ) [ tinyint(1) "1" ],
+| project (
+| | select (
+| | | table("sys"."second_decade") [ "second_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
+| | ) [ (timestamp(7) "2000-02-01 00:00:00.000000") <= ("splitted"."stamp"
UNIQUE) <= (timestamp(7) "2020-03-01 00:00:00.000000") ]
+| ) [ tinyint(1) "1" ],
| project (
| | select (
| | | table("sys"."third_decade") [ "third_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
| | ) [ (timestamp(7) "2000-02-01 00:00:00.000000") <= ("splitted"."stamp"
UNIQUE) <= (timestamp(7) "2020-03-01 00:00:00.000000") ]
| ) [ tinyint(1) "1" ]
-) [ "%5"."%5" NOT NULL ]
+) [ "%7"."%7" 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'
@@ -165,7 +161,7 @@ select * from splitted where stamp NOT B
query T nosort
plan select 1 from splitted where stamp > TIMESTAMP '2010-03-01 00:00:00'
----
-union (
+munion (
| project (
| | select (
| | | table("sys"."second_decade") [ "second_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
@@ -199,25 +195,23 @@ project (
query T nosort
plan select 1 from splitted where stamp <= TIMESTAMP '2020-10-01 00:00:00'
----
-union (
-| union (
-| | project (
-| | | select (
-| | | | table("sys"."first_decade") [ "first_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
-| | | ) [ ("splitted"."stamp" UNIQUE) <= (timestamp(7) "2020-10-01
00:00:00.000000") ]
-| | ) [ tinyint(1) "1" ],
-| | project (
-| | | select (
-| | | | table("sys"."second_decade") [ "second_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
-| | | ) [ ("splitted"."stamp" UNIQUE) <= (timestamp(7) "2020-10-01
00:00:00.000000") ]
-| | ) [ tinyint(1) "1" ]
-| ) [ "%6"."%6" NOT NULL ],
+munion (
+| project (
+| | select (
+| | | table("sys"."first_decade") [ "first_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
+| | ) [ ("splitted"."stamp" UNIQUE) <= (timestamp(7) "2020-10-01
00:00:00.000000") ]
+| ) [ tinyint(1) "1" ],
+| project (
+| | select (
+| | | table("sys"."second_decade") [ "second_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
+| | ) [ ("splitted"."stamp" UNIQUE) <= (timestamp(7) "2020-10-01
00:00:00.000000") ]
+| ) [ tinyint(1) "1" ],
| project (
| | select (
| | | table("sys"."third_decade") [ "third_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
| | ) [ ("splitted"."stamp" UNIQUE) <= (timestamp(7) "2020-10-01
00:00:00.000000") ]
| ) [ tinyint(1) "1" ]
-) [ "%5"."%5" NOT NULL ]
+) [ "%7"."%7" NOT NULL ]
query T nosort
plan select 1 from splitted where stamp < TIMESTAMP '2000-01-01 00:00:00'
@@ -267,7 +261,7 @@ project (
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'
----
-union (
+munion (
| project (
| | select (
| | | table("sys"."first_decade") [ "first_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
@@ -301,7 +295,7 @@ project (
query T nosort
plan select 1 from splitted where stamp > TIMESTAMP '2001-01-02 00:00:00' and
stamp < TIMESTAMP '2015-01-01 00:00:00'
----
-union (
+munion (
| project (
| | select (
| | | table("sys"."first_decade") [ "first_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
@@ -326,7 +320,7 @@ project (
query T nosort
plan select 1 from splitted where stamp > TIMESTAMP '2009-01-01 00:00:00' and
stamp <= TIMESTAMP '2010-01-01 00:00:00'
----
-union (
+munion (
| project (
| | select (
| | | table("sys"."first_decade") [ "first_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
@@ -342,25 +336,23 @@ union (
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'
----
-union (
-| union (
-| | project (
-| | | select (
-| | | | table("sys"."first_decade") [ "first_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
-| | | ) [ (timestamp(7) "2009-01-01 00:00:00.000000") < ("splitted"."stamp"
UNIQUE) <= (timestamp(7) "2020-01-01 00:00:00.000000") ]
-| | ) [ tinyint(1) "1" ],
-| | project (
-| | | select (
-| | | | table("sys"."second_decade") [ "second_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
-| | | ) [ (timestamp(7) "2009-01-01 00:00:00.000000") < ("splitted"."stamp"
UNIQUE) <= (timestamp(7) "2020-01-01 00:00:00.000000") ]
-| | ) [ tinyint(1) "1" ]
-| ) [ "%6"."%6" NOT NULL ],
+munion (
+| project (
+| | select (
+| | | table("sys"."first_decade") [ "first_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
+| | ) [ (timestamp(7) "2009-01-01 00:00:00.000000") < ("splitted"."stamp"
UNIQUE) <= (timestamp(7) "2020-01-01 00:00:00.000000") ]
+| ) [ tinyint(1) "1" ],
+| project (
+| | select (
+| | | table("sys"."second_decade") [ "second_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
+| | ) [ (timestamp(7) "2009-01-01 00:00:00.000000") < ("splitted"."stamp"
UNIQUE) <= (timestamp(7) "2020-01-01 00:00:00.000000") ]
+| ) [ tinyint(1) "1" ],
| project (
| | select (
| | | table("sys"."third_decade") [ "third_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
| | ) [ (timestamp(7) "2009-01-01 00:00:00.000000") < ("splitted"."stamp"
UNIQUE) <= (timestamp(7) "2020-01-01 00:00:00.000000") ]
| ) [ tinyint(1) "1" ]
-) [ "%5"."%5" NOT NULL ]
+) [ "%7"."%7" NOT NULL ]
statement ok
CREATE TABLE fourth_decade (stamp TIMESTAMP, val INT)
@@ -383,7 +375,7 @@ project (
query T nosort
plan select 1 from splitted where stamp > TIMESTAMP '1999-01-01 00:00:00' and
stamp <= TIMESTAMP '2001-01-01 00:00:00'
----
-union (
+munion (
| project (
| | select (
| | | table("sys"."first_decade") [ "first_decade"."stamp" UNIQUE as
"splitted"."stamp" ]
@@ -472,25 +464,23 @@ project (
query T nosort
plan select 1 from splitted2 where val = 1
----
-union (
-| union (
-| | project (
-| | | select (
-| | | | table("sys"."first_decade2") [ "first_decade2"."val" UNIQUE as
"splitted2"."val" ]
-| | | ) [ ("splitted2"."val" UNIQUE) = (int(31) "1") ]
-| | ) [ tinyint(1) "1" ],
-| | project (
-| | | select (
-| | | | table("sys"."second_decade2") [ "second_decade2"."val" UNIQUE as
"splitted2"."val" ]
-| | | ) [ ("splitted2"."val" UNIQUE) = (int(31) "1") ]
-| | ) [ tinyint(1) "1" ]
-| ) [ "%6"."%6" NOT NULL ],
+munion (
+| project (
+| | select (
+| | | table("sys"."first_decade2") [ "first_decade2"."val" UNIQUE as
"splitted2"."val" ]
+| | ) [ ("splitted2"."val" UNIQUE) = (int(31) "1") ]
+| ) [ tinyint(1) "1" ],
+| project (
+| | select (
+| | | table("sys"."second_decade2") [ "second_decade2"."val" UNIQUE as
"splitted2"."val" ]
+| | ) [ ("splitted2"."val" UNIQUE) = (int(31) "1") ]
+| ) [ tinyint(1) "1" ],
| project (
| | select (
| | | table("sys"."third_decade2") [ "third_decade2"."val" UNIQUE as
"splitted2"."val" ]
| | ) [ ("splitted2"."val" UNIQUE) = (int(31) "1") ]
| ) [ tinyint(1) "1" ]
-) [ "%5"."%5" NOT NULL ]
+) [ "%7"."%7" NOT NULL ]
query T nosort
plan select 1 from splitted2 where stamp is null
@@ -638,7 +628,7 @@ analyze sys.another2
query T nosort
plan select 1 from table1 where a = 10 or a = 11
----
-union (
+munion (
| project (
| | select (
| | | table("sys"."another1") [ "another1"."a" NOT NULL as "table1"."a" ]
@@ -654,7 +644,7 @@ union (
query T nosort
plan select 1 from table1 where a >= 10
----
-union (
+munion (
| project (
| | table("sys"."another1") [ "another1"."a" NOT NULL as "table1"."a" ]
| ) [ tinyint(1) "1" ],
@@ -689,7 +679,7 @@ project (
query T nosort
plan select 1 from table1 where a = 10 or b = 11
----
-union (
+munion (
| project (
| | select (
| | | table("sys"."another1") [ "another1"."a" NOT NULL as "table1"."a",
"another1"."b" NOT NULL UNIQUE as "table1"."b" ]
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
