Changeset: f6bc73fbbe7c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f6bc73fbbe7c
Branch: mtest
Log Message:
merged
diffs (truncated from 4027 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
@@ -1,8 +1,8 @@
statement ok
create table cm_tmp(i int)
-query T rowsort
-plan copy into cm_tmp from '/file1','/file2'
+query T nosort
+PLAN copy into cm_tmp from '/file1','/file2'
----
)
insert(
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
@@ -38,8 +38,8 @@ select * from sorted
----
16 values hashing to 2cdd4950dea01e559cbfccc9f0aafd12
-query T rowsort
-plan select a,b from sorted group by a,b
+query T nosort
+PLAN select a,b from sorted group by a,b
----
) [ "sorted"."a", "sorted"."b" ]
project (
@@ -47,8 +47,8 @@ project (
| group by (
| | table(sys.sorted) [ "sorted"."a", "sorted"."b" ] COUNT
-query T rowsort
-plan select a,b from sorted group by b,a
+query T nosort
+PLAN select a,b from sorted group by b,a
----
) [ "sorted"."a", "sorted"."b" ]
project (
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
@@ -60,8 +60,8 @@ 31
32
33
-query T rowsort
-plan select * from t2606a union select * from t2606b order by a
+query T nosort
+PLAN select * from t2606a union select * from t2606b order by a
----
14 values hashing to daeac8965118e8392b779bd3907f99f1
@@ -78,8 +78,8 @@ 31
32
33
-query T rowsort
-plan ( select * from t2606a union select * from t2606b ) order by a
+query T nosort
+PLAN ( select * from t2606a union select * from t2606b ) order by a
----
14 values hashing to daeac8965118e8392b779bd3907f99f1
@@ -96,8 +96,8 @@ 31
32
33
-query T rowsort
-plan ( select * from t2606a ) union ( select * from t2606b ) order by a
+query T nosort
+PLAN ( select * from t2606a ) union ( select * from t2606b ) order by a
----
14 values hashing to daeac8965118e8392b779bd3907f99f1
@@ -114,8 +114,8 @@ 31
32
33
-query T rowsort
-plan select * from t2606a except select * from t2606b order by a
+query T nosort
+PLAN select * from t2606a except select * from t2606b order by a
----
10 values hashing to ce8dbba93922ade12cff307efa6ea298
@@ -126,8 +126,8 @@ 11
12
13
-query T rowsort
-plan ( select * from t2606a except select * from t2606b ) order by a
+query T nosort
+PLAN ( select * from t2606a except select * from t2606b ) order by a
----
10 values hashing to ce8dbba93922ade12cff307efa6ea298
@@ -138,8 +138,8 @@ 11
12
13
-query T rowsort
-plan ( select * from t2606a ) except ( select * from t2606b ) order by a
+query T nosort
+PLAN ( select * from t2606a ) except ( select * from t2606b ) order by a
----
10 values hashing to ce8dbba93922ade12cff307efa6ea298
@@ -150,8 +150,8 @@ 11
12
13
-query T rowsort
-plan select * from t2606a intersect select * from t2606b order by a
+query T nosort
+PLAN select * from t2606a intersect select * from t2606b order by a
----
10 values hashing to 63ad92b1bdf7d574a4182454b4743d4c
@@ -162,8 +162,8 @@ 21
22
23
-query T rowsort
-plan ( select * from t2606a intersect select * from t2606b ) order by a
+query T nosort
+PLAN ( select * from t2606a intersect select * from t2606b ) order by a
----
10 values hashing to 63ad92b1bdf7d574a4182454b4743d4c
@@ -174,8 +174,8 @@ 21
22
23
-query T rowsort
-plan ( select * from t2606a ) intersect ( select * from t2606b ) order by a
+query T nosort
+PLAN ( select * from t2606a ) intersect ( select * from t2606b ) order by a
----
10 values hashing to 63ad92b1bdf7d574a4182454b4743d4c
@@ -186,8 +186,8 @@ 21
22
23
-query T rowsort
-plan select * from (select * from t2606a union select * from t2606b) as t
order by a
+query T nosort
+PLAN select * from (select * from t2606a union select * from t2606b) as t
order by a
----
14 values hashing to 505a9f7a11606a1ebb11b32ffb0b8885
@@ -204,8 +204,8 @@ 31
32
33
-query T rowsort
-plan select * from (select * from t2606a except select * from t2606b) as t
order by a
+query T nosort
+PLAN select * from (select * from t2606a except select * from t2606b) as t
order by a
----
10 values hashing to ad52b2acba9062d16c5fe7bf78e2c78f
@@ -216,8 +216,8 @@ 11
12
13
-query T rowsort
-plan select * from (select * from t2606a intersect select * from t2606b) as t
order by a
+query T nosort
+PLAN select * from (select * from t2606a intersect select * from t2606b) as t
order by a
----
10 values hashing to 51b0458644ce540d9a91beb880f56519
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
@@ -7,8 +7,8 @@ CREATE TABLE dbg (a INT, b INT)
statement ok
INSERT INTO dbg (a,b) VALUES (10,10)
-query T rowsort
-plan
+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" ]
@@ -42,8 +42,8 @@ CREATE TABLE dbg (a INT, b INT)
statement ok
INSERT INTO dbg (a,b) VALUES (10,10)
-query T rowsort
-plan
+query T nosort
+PLAN
SELECT a as d, MIN(b) as e, (2 * (MIN(b) / (SELECT 2))) as f FROM dbg GROUP BY
d
----
) [ "d", "%1"."%1" as "e", sys.sql_mul(sys.sql_div("%1"."%1", tinyint "2" as
"%2"."%2"), tinyint "2") as "f" ]
diff --git a/sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.test
b/sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.test
--- a/sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.test
+++ b/sql/test/BugTracker-2013/Tests/rangejoin_optimizer.Bug-3411.test
@@ -1,8 +1,8 @@
statement ok
CREATE TABLE t4311 ( "a" INT, "b" INT)
-query T rowsort
-plan
+query T nosort
+PLAN
SELECT t2.a
FROM t4311 t1, t4311 t2
WHERE t2.a between t1.a and t1.b
@@ -14,8 +14,8 @@ project (
| | table(sys.t4311) [ "t4311"."a" as "t1"."a", "t4311"."b" as "t1"."b" ]
COUNT
| | table(sys.t4311) [ "t4311"."a" as "t2"."a" ] COUNT ,
-query T rowsort
-plan
+query T nosort
+PLAN
SELECT t2.a
FROM t4311 t1, t4311 t2
WHERE t2.a >= t1.a
@@ -28,8 +28,8 @@ project (
| | table(sys.t4311) [ "t4311"."a" as "t1"."a", "t4311"."b" as "t1"."b" ]
COUNT
| | table(sys.t4311) [ "t4311"."a" as "t2"."a" ] COUNT ,
-query T rowsort
-plan
+query T nosort
+PLAN
SELECT t2.a
FROM t4311 t1, t4311 t2
WHERE t1.a <= t2.a
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
@@ -107,8 +107,8 @@ INSERT INTO bidder (id, open_auction_id,
statement error
Select b.* FROM open_auctions o, b bidder WHERE (select b3.INCREASE from
bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id =
b.open_auction_id order by date, time
-query T rowsort
-plan
+query T nosort
+PLAN
Select b.* FROM open_auctions o, bidder b WHERE (select b3.INCREASE from
bidder b3 where b3.id = (select min (b3a.id) from bidder b3a where
b3a.open_auction_id = o.open_auction_id)) * 2 <= (Select b2.INCREASE from
bidder b2 where b2.id = (SELECT MAX (b2a.id) from bidder b2a where
b2a.open_auction_id = o.open_auction_id)) AND o.open_auction_id =
b.open_auction_id
----
48 values hashing to 28b8c78f394dfc5c67e28fc0f774b60d
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
@@ -20,7 +20,7 @@ SELECT 0 AS cods, 0 AS elrik, 0 AS ether
GROUP BY cods, elrik, ether, jaelen, sora
----
-query T rowsort
+query T nosort
PLAN SELECT 0 AS cods, 0 AS elrik, 0 AS ether, 0 AS jaelen, 0 AS sora,
MIN(tib0)
FROM t2a
GROUP BY cods, elrik, ether, jaelen, sora
diff --git a/sql/test/BugTracker-2015/Tests/large_join.Bug-3809.test
b/sql/test/BugTracker-2015/Tests/large_join.Bug-3809.test
--- a/sql/test/BugTracker-2015/Tests/large_join.Bug-3809.test
+++ b/sql/test/BugTracker-2015/Tests/large_join.Bug-3809.test
@@ -2113,8 +2113,8 @@ INSERT INTO t64 VALUES(9,8,'table t64 ro
statement ok
INSERT INTO t64 VALUES(10,3,'table t64 row 10')
-query T rowsort
-plan
+query T nosort
+PLAN
SELECT
x20,x47,x38,x18,x10,x22,x37,x3,x63,x8,x30,x43,x54,x9,x21,x25,x2,x61,x55,x32,x52,x29,x50,x12
FROM
t9,t20,t63,t54,t32,t22,t52,t25,t47,t29,t12,t18,t10,t21,t43,t37,t2,t61,t55,t3,t38,t50,t30,t8
WHERE b3=a18
@@ -2174,8 +2174,8 @@ SELECT x20,x47,x38,x18,x10,x22,x37,x3,x6
----
24 values hashing to ef038bbcaf888cf0dd371df925faeb98
-query T rowsort
-plan
+query T nosort
+PLAN
SELECT
x20,x47,x38,x18,x10,x22,x37,x3,x63,x8,x30,x43,x54,x9,x21,x25,x2,x61,x55,x32,x52,x29,x50,x12
FROM
t2,t9,t20,t63,t54,t32,t22,t52,t25,t47,t29,t12,t18,t10,t21,t43,t37,t61,t55,t3,t38,t50,t30,t8
WHERE b3=a18
@@ -2235,8 +2235,8 @@ SELECT x20,x47,x38,x18,x10,x22,x37,x3,x6
----
24 values hashing to ef038bbcaf888cf0dd371df925faeb98
-query T rowsort
-plan
+query T nosort
+PLAN
SELECT
x20,x47,x38,x18,x10,x22,x37,x3,x63,x8,x30,x43,x54,x9,x21,x25,x2,x61,x55,x32,x52,x29,x50,x12
FROM
t61,t9,t20,t63,t54,t32,t22,t52,t25,t47,t29,t12,t18,t10,t21,t43,t37,t2,t55,t3,t38,t50,t30,t8
WHERE b3=a18
@@ -2296,8 +2296,8 @@ SELECT x20,x47,x38,x18,x10,x22,x37,x3,x6
----
24 values hashing to ef038bbcaf888cf0dd371df925faeb98
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
