Changeset: 78ab307bbad7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=78ab307bbad7
Modified Files:
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.test
sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.test
sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.test
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.test
sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.test
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/large_join.Bug-3809.test
sql/test/BugTracker-2015/Tests/quantile_function_resolution.Bug-3773.test
sql/test/BugTracker-2015/Tests/schema_view.Bug-3708.test
Branch: mtest
Log Message:
Converting more plan statements
diffs (truncated from 919 to 300 lines):
diff --git a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.test
b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.test
--- a/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.test
+++ b/sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.test
@@ -4,15 +4,15 @@ create table cm_tmp(i int)
query T nosort
PLAN copy into cm_tmp from '/file1','/file2'
----
-)
insert(
-| ) [ int "NULL" ]
| table(sys.cm_tmp) [ "cm_tmp"."i", "cm_tmp"."%TID%" NOT NULL ] COUNT
| union (
-| | ) [ "cm_tmp"."i" ] COUNT
+| | table (sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar
"NULL", varchar "null", varchar "/file1", bigint "-1", bigint "0", int "0", int
"0", varchar "NULL", int "0", int "1"),
| | ) [ "cm_tmp"."i" ] COUNT ,
-| | table (sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar
"NULL", varchar "null", varchar "/file1", bigint "-1", bigint "0", int "0", int
"0", varchar "NULL", int "0", int "1"),
| | table (sys.copyfrom(table(cm_tmp), varchar "|", varchar "\n", varchar
"NULL", varchar "null", varchar "/file2", bigint "-1", bigint "0", int "0", int
"0", varchar "NULL", int "0", int "1"),
+| | ) [ "cm_tmp"."i" ] COUNT
+| ) [ int "NULL" ]
+)
statement error
plan copy into cm_tmp from E'\\file1',E'\\file2'
diff --git
a/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.test
b/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.test
--- a/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.test
+++ b/sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.test
@@ -41,20 +41,20 @@ 16 values hashing to 2cdd4950dea01e559cb
query T nosort
PLAN select a,b from sorted group by a,b
----
-) [ "sorted"."a", "sorted"."b" ]
project (
-| ) [ "sorted"."a", "sorted"."b" ] [ "sorted"."a", "sorted"."b" ]
| group by (
| | table(sys.sorted) [ "sorted"."a", "sorted"."b" ] COUNT
+| ) [ "sorted"."a", "sorted"."b" ] [ "sorted"."a", "sorted"."b" ]
+) [ "sorted"."a", "sorted"."b" ]
query T nosort
PLAN select a,b from sorted group by b,a
----
-) [ "sorted"."a", "sorted"."b" ]
project (
-| ) [ "sorted"."b", "sorted"."a" ] [ "sorted"."b", "sorted"."a" ]
| group by (
| | table(sys.sorted) [ "sorted"."a", "sorted"."b" ] COUNT
+| ) [ "sorted"."b", "sorted"."a" ] [ "sorted"."b", "sorted"."a" ]
+) [ "sorted"."a", "sorted"."b" ]
statement ok
drop table unsorted
diff --git
a/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.test
b/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.test
---
a/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.test
+++
b/sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.test
@@ -63,7 +63,20 @@ 33
query T nosort
PLAN select * from t2606a union select * from t2606b order by a
----
-14 values hashing to daeac8965118e8392b779bd3907f99f1
+project (
+| distinct union (
+| | project (
+| | | group by (
+| | | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
+| | | ) [ "t2606a"."a" ] [ "t2606a"."a" ]
+| | ) [ "t2606a"."a" as "%1"."a" ],
+| | project (
+| | | group by (
+| | | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
+| | | ) [ "t2606b"."a" ] [ "t2606b"."a" ]
+| | ) [ "t2606b"."a" as "%2"."a" ]
+| ) [ "%1"."a" as "%5"."a" ]
+) [ "%5"."a" ] [ "%5"."a" ASC ]
query I rowsort
select * from t2606a union select * from t2606b order by a
@@ -81,7 +94,20 @@ 33
query T nosort
PLAN ( select * from t2606a union select * from t2606b ) order by a
----
-14 values hashing to daeac8965118e8392b779bd3907f99f1
+project (
+| distinct union (
+| | project (
+| | | group by (
+| | | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
+| | | ) [ "t2606a"."a" ] [ "t2606a"."a" ]
+| | ) [ "t2606a"."a" as "%1"."a" ],
+| | project (
+| | | group by (
+| | | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
+| | | ) [ "t2606b"."a" ] [ "t2606b"."a" ]
+| | ) [ "t2606b"."a" as "%2"."a" ]
+| ) [ "%1"."a" as "%5"."a" ]
+) [ "%5"."a" ] [ "%5"."a" ASC ]
query I rowsort
( select * from t2606a union select * from t2606b ) order by a
@@ -99,7 +125,20 @@ 33
query T nosort
PLAN ( select * from t2606a ) union ( select * from t2606b ) order by a
----
-14 values hashing to daeac8965118e8392b779bd3907f99f1
+project (
+| distinct union (
+| | project (
+| | | group by (
+| | | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
+| | | ) [ "t2606a"."a" ] [ "t2606a"."a" ]
+| | ) [ "t2606a"."a" as "%1"."a" ],
+| | project (
+| | | group by (
+| | | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
+| | | ) [ "t2606b"."a" ] [ "t2606b"."a" ]
+| | ) [ "t2606b"."a" as "%2"."a" ]
+| ) [ "%1"."a" as "%5"."a" ]
+) [ "%5"."a" ] [ "%5"."a" ASC ]
query I rowsort
( select * from t2606a ) union ( select * from t2606b ) order by a
@@ -117,7 +156,16 @@ 33
query T nosort
PLAN select * from t2606a except select * from t2606b order by a
----
-10 values hashing to ce8dbba93922ade12cff307efa6ea298
+project (
+| distinct except (
+| | project (
+| | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
+| | ) [ "t2606a"."a" as "%1"."a" ],
+| | project (
+| | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
+| | ) [ "t2606b"."a" as "%2"."a" ]
+| ) [ "%1"."a" as "%5"."a" ]
+) [ "%5"."a" ] [ "%5"."a" ASC ]
query I rowsort
select * from t2606a except select * from t2606b order by a
@@ -129,7 +177,16 @@ 13
query T nosort
PLAN ( select * from t2606a except select * from t2606b ) order by a
----
-10 values hashing to ce8dbba93922ade12cff307efa6ea298
+project (
+| distinct except (
+| | project (
+| | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
+| | ) [ "t2606a"."a" as "%1"."a" ],
+| | project (
+| | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
+| | ) [ "t2606b"."a" as "%2"."a" ]
+| ) [ "%1"."a" as "%5"."a" ]
+) [ "%5"."a" ] [ "%5"."a" ASC ]
query I rowsort
( select * from t2606a except select * from t2606b ) order by a
@@ -141,7 +198,16 @@ 13
query T nosort
PLAN ( select * from t2606a ) except ( select * from t2606b ) order by a
----
-10 values hashing to ce8dbba93922ade12cff307efa6ea298
+project (
+| distinct except (
+| | project (
+| | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
+| | ) [ "t2606a"."a" as "%1"."a" ],
+| | project (
+| | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
+| | ) [ "t2606b"."a" as "%2"."a" ]
+| ) [ "%1"."a" as "%5"."a" ]
+) [ "%5"."a" ] [ "%5"."a" ASC ]
query I rowsort
( select * from t2606a ) except ( select * from t2606b ) order by a
@@ -153,7 +219,16 @@ 13
query T nosort
PLAN select * from t2606a intersect select * from t2606b order by a
----
-10 values hashing to 63ad92b1bdf7d574a4182454b4743d4c
+project (
+| distinct intersect (
+| | project (
+| | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
+| | ) [ "t2606a"."a" as "%1"."a" ],
+| | project (
+| | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
+| | ) [ "t2606b"."a" as "%2"."a" ]
+| ) [ "%1"."a" as "%5"."a" ]
+) [ "%5"."a" ] [ "%5"."a" ASC ]
query I rowsort
select * from t2606a intersect select * from t2606b order by a
@@ -165,7 +240,16 @@ 23
query T nosort
PLAN ( select * from t2606a intersect select * from t2606b ) order by a
----
-10 values hashing to 63ad92b1bdf7d574a4182454b4743d4c
+project (
+| distinct intersect (
+| | project (
+| | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
+| | ) [ "t2606a"."a" as "%1"."a" ],
+| | project (
+| | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
+| | ) [ "t2606b"."a" as "%2"."a" ]
+| ) [ "%1"."a" as "%5"."a" ]
+) [ "%5"."a" ] [ "%5"."a" ASC ]
query I rowsort
( select * from t2606a intersect select * from t2606b ) order by a
@@ -177,7 +261,16 @@ 23
query T nosort
PLAN ( select * from t2606a ) intersect ( select * from t2606b ) order by a
----
-10 values hashing to 63ad92b1bdf7d574a4182454b4743d4c
+project (
+| distinct intersect (
+| | project (
+| | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
+| | ) [ "t2606a"."a" as "%1"."a" ],
+| | project (
+| | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
+| | ) [ "t2606b"."a" as "%2"."a" ]
+| ) [ "%1"."a" as "%5"."a" ]
+) [ "%5"."a" ] [ "%5"."a" ASC ]
query I rowsort
( select * from t2606a ) intersect ( select * from t2606b ) order by a
@@ -189,7 +282,20 @@ 23
query T nosort
PLAN select * from (select * from t2606a union select * from t2606b) as t
order by a
----
-14 values hashing to 505a9f7a11606a1ebb11b32ffb0b8885
+project (
+| distinct union (
+| | project (
+| | | group by (
+| | | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
+| | | ) [ "t2606a"."a" ] [ "t2606a"."a" ]
+| | ) [ "t2606a"."a" as "%1"."a" ],
+| | project (
+| | | group by (
+| | | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
+| | | ) [ "t2606b"."a" ] [ "t2606b"."a" ]
+| | ) [ "t2606b"."a" as "%2"."a" ]
+| ) [ "%1"."a" as "t"."a" ]
+) [ "t"."a" ] [ "t"."a" ASC ]
query I rowsort
select * from (select * from t2606a union select * from t2606b) as t
order by a
@@ -207,7 +313,16 @@ 33
query T nosort
PLAN select * from (select * from t2606a except select * from t2606b) as t
order by a
----
-10 values hashing to ad52b2acba9062d16c5fe7bf78e2c78f
+project (
+| distinct except (
+| | project (
+| | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
+| | ) [ "t2606a"."a" as "%1"."a" ],
+| | project (
+| | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
+| | ) [ "t2606b"."a" as "%2"."a" ]
+| ) [ "%1"."a" as "t"."a" ]
+) [ "t"."a" ] [ "t"."a" ASC ]
query I rowsort
select * from (select * from t2606a except select * from t2606b) as t
order by a
@@ -219,7 +334,16 @@ 13
query T nosort
PLAN select * from (select * from t2606a intersect select * from t2606b) as t
order by a
----
-10 values hashing to 51b0458644ce540d9a91beb880f56519
+project (
+| distinct intersect (
+| | project (
+| | | table(sys.t2606a) [ "t2606a"."a" ] COUNT
+| | ) [ "t2606a"."a" as "%1"."a" ],
+| | project (
+| | | table(sys.t2606b) [ "t2606b"."a" ] COUNT
+| | ) [ "t2606b"."a" as "%2"."a" ]
+| ) [ "%1"."a" as "t"."a" ]
+) [ "t"."a" ] [ "t"."a" ASC ]
query I rowsort
select * from (select * from t2606a intersect select * from t2606b) as t
order by a
diff --git a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.test
b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.test
--- a/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.test
+++ b/sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.test
@@ -11,11 +11,11 @@ query T nosort
PLAN
SELECT a as d, MIN(b), (2 * (MIN(b) / (SELECT 2))) as f FROM dbg GROUP BY d
----
-) [ "d", "%1"."%1", sys.sql_mul(sys.sql_div("%1"."%1", tinyint "2" as
"%2"."%2"), tinyint "2") as "f" ]
project (
-| ) [ "dbg"."a" as "d" ] [ "d", sys.min no nil ("dbg"."b") as "%1"."%1" ]
| group by (
| | table(sys.dbg) [ "dbg"."a", "dbg"."b" ] COUNT
+| ) [ "dbg"."a" as "d" ] [ "d", sys.min no nil ("dbg"."b") as "%1"."%1" ]
+) [ "d", "%1"."%1", sys.sql_mul(sys.sql_div("%1"."%1", tinyint "2" as
"%2"."%2"), tinyint "2") as "f" ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
