Changeset: 0d06b71194e5 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d06b71194e5
Added Files:
sql/test/merge-partitions/Tests/mergepart32.test
Modified Files:
sql/test/Users/Tests/sessioncontrol.test
sql/test/analytics/Tests/analytics00.test
sql/test/merge-partitions/Tests/mergepart01.test
sql/test/merge-partitions/Tests/mergepart30.test
sql/test/merge-partitions/Tests/mergepart31.test
Branch: mtest
Log Message:
Converted recent test changes
diffs (truncated from 532 to 300 lines):
diff --git a/sql/test/Users/Tests/sessioncontrol.test
b/sql/test/Users/Tests/sessioncontrol.test
--- a/sql/test/Users/Tests/sessioncontrol.test
+++ b/sql/test/Users/Tests/sessioncontrol.test
@@ -27,7 +27,7 @@ call setmemorylimit(8000)
statement ok
select sessionid, s."username", s."optimizer", s.sessiontimeout,
s.querytimeout, s.workerlimit, s.memorylimit from sessions as s
-statement ok
+statement error
call setoptimizer('')
statement error
@@ -47,7 +47,7 @@ select sessionid, s."username", s."optim
----
0
monetdb
-(empty)
+minimal_pipe
5000
123
12
diff --git a/sql/test/analytics/Tests/analytics00.test
b/sql/test/analytics/Tests/analytics00.test
--- a/sql/test/analytics/Tests/analytics00.test
+++ b/sql/test/analytics/Tests/analytics00.test
@@ -1153,7 +1153,7 @@ project (
| | | | table(sys.myorders) [ "myorders"."o_totalprice" NOT NULL,
"myorders"."o_orderdate" NOT NULL ] COUNT
| | | ) [ "myorders"."o_totalprice" NOT NULL, sys.day("myorders"."o_orderdate"
NOT NULL) NOT NULL as "%1"."%1" ]
| | ) [ "myorders"."o_totalprice" NOT NULL, "%1"."%1" NOT NULL ] [ "%1"."%1"
ASC NOT NULL ]
-| ) [ "%1"."%1" NOT NULL, boolean "false" as "%2"."%2",
sys.max("myorders"."o_totalprice" NOT NULL, "%2"."%2", sys.diff("%1"."%1" NOT
NULL), int "1", sys.window_bound("%1"."%1" ASC NOT NULL, int "1", int "0", int
"0", int "2"), sys.window_bound("%1"."%1" ASC NOT NULL, int "1", int "5", int
"0", int "0")) as "%3"."%3" ]
+| ) [ "%1"."%1" NOT NULL, boolean "false" as "%2"."%2",
sys.max("myorders"."o_totalprice" NOT NULL, "%2"."%2" NOT NULL,
sys.diff("%1"."%1" NOT NULL), int "1", sys.window_bound("%1"."%1" ASC NOT NULL,
int "1", int "0", int "0", int "2"), sys.window_bound("%1"."%1" ASC NOT NULL,
int "1", int "5", int "0", int "0")) as "%3"."%3" ]
) [ "%3"."%3" ]
query R rowsort
@@ -1172,7 +1172,7 @@ project (
| | | | table(sys.myorders) [ "myorders"."o_totalprice" NOT NULL,
"myorders"."o_orderdate" NOT NULL ] COUNT
| | | ) [ "myorders"."o_totalprice" NOT NULL,
sys.year("myorders"."o_orderdate" NOT NULL) NOT NULL as "%1"."%1" ]
| | ) [ "myorders"."o_totalprice" NOT NULL, "%1"."%1" NOT NULL ] [ "%1"."%1"
ASC NOT NULL ]
-| ) [ "%1"."%1" NOT NULL, boolean "false" as "%2"."%2", sys.diff("%1"."%1" NOT
NULL) as "%3"."%3", sys.count("myorders"."o_totalprice" NOT NULL, boolean
"true", "%2"."%2", sys.diff("%1"."%1" NOT NULL) as "%3"."%3", int "2",
sys.window_bound("%3"."%3", int "2", int "0", int "0", tinyint "2"),
sys.window_bound("%3"."%3", int "2", int "3", int "0", bigint
"9223372036854775807")) as "%4"."%4" ]
+| ) [ "%1"."%1" NOT NULL, boolean "false" as "%2"."%2", sys.diff("%1"."%1" NOT
NULL) as "%3"."%3", sys.count("myorders"."o_totalprice" NOT NULL, boolean
"true", "%2"."%2" NOT NULL, sys.diff("%1"."%1" NOT NULL) as "%3"."%3", int "2",
sys.window_bound("%3"."%3", int "2", int "0", int "0", tinyint "2"),
sys.window_bound("%3"."%3", int "2", int "3", int "0", bigint
"9223372036854775807")) as "%4"."%4" ]
) [ "%4"."%4" ]
query I rowsort
diff --git a/sql/test/merge-partitions/Tests/mergepart01.test
b/sql/test/merge-partitions/Tests/mergepart01.test
--- a/sql/test/merge-partitions/Tests/mergepart01.test
+++ b/sql/test/merge-partitions/Tests/mergepart01.test
@@ -60,10 +60,10 @@ ALTER TABLE testme ADD TABLE subtable2 A
statement error
ALTER TABLE testme ADD TABLE subtable2 AS PARTITION FROM 7 TO 9
-statement ok
+statement error
ALTER TABLE testme ADD TABLE subtable2 AS PARTITION FROM 5 TO 5
-statement ok
+statement error
ALTER TABLE testme DROP TABLE subtable2
statement error
diff --git a/sql/test/merge-partitions/Tests/mergepart30.test
b/sql/test/merge-partitions/Tests/mergepart30.test
--- a/sql/test/merge-partitions/Tests/mergepart30.test
+++ b/sql/test/merge-partitions/Tests/mergepart30.test
@@ -32,6 +32,15 @@ statement ok
CREATE TABLE another2 (a int)
statement ok
+CREATE TABLE another3 (a int)
+
+statement ok
+CREATE TABLE another4 (a int)
+
+statement ok
+CREATE TABLE another5 (a int)
+
+statement ok
ALTER TABLE table1 ADD TABLE another1 AS PARTITION FROM RANGE MINVALUE TO
RANGE MAXVALUE WITH NULL VALUES
statement ok
@@ -149,12 +158,218 @@ statement ok
ALTER TABLE table1 DROP TABLE another2
statement ok
+ALTER TABLE table1 ADD TABLE another1 AS PARTITION FROM RANGE MINVALUE TO 10
+
+statement ok
+ALTER TABLE table1 ADD TABLE another2 AS PARTITION FOR NULL VALUES
+
+query I rowsort
+SELECT a FROM table1
+----
+2
+3
+NULL
+NULL
+
+query I rowsort
+SELECT a FROM another1
+----
+2
+3
+
+query I rowsort
+SELECT a FROM another2
+----
+NULL
+NULL
+
+statement ok
+ALTER TABLE table1 DROP TABLE another1
+
+statement ok
+ALTER TABLE table1 DROP TABLE another2
+
+statement ok
+ALTER TABLE table1 ADD TABLE another1 AS PARTITION FROM RANGE MINVALUE TO 10
WITH NULL VALUES
+
+statement error
+ALTER TABLE table1 ADD TABLE another2 AS PARTITION FROM 0 to 5
+
+query I rowsort
+SELECT a FROM table1
+----
+2
+3
+
+query I rowsort
+SELECT a FROM another1
+----
+2
+3
+
+query I rowsort
+SELECT a FROM another2
+----
+NULL
+NULL
+
+statement ok
+ALTER TABLE table1 DROP TABLE another1
+
+statement error
+ALTER TABLE table1 DROP TABLE another2
+
+statement ok
+ALTER TABLE table1 ADD TABLE another1 AS PARTITION FROM RANGE MINVALUE TO
RANGE MAXVALUE
+
+statement error
+ALTER TABLE table1 ADD TABLE another2 AS PARTITION FROM 0 to 5
+
+statement error
+ALTER TABLE table1 ADD TABLE another2 AS PARTITION FROM RANGE MINVALUE to 2
+
+statement error
+ALTER TABLE table1 ADD TABLE another2 AS PARTITION FROM 2 to RANGE MAXVALUE
+
+query I rowsort
+SELECT a FROM table1
+----
+2
+3
+
+query I rowsort
+SELECT a FROM another1
+----
+2
+3
+
+query I rowsort
+SELECT a FROM another2
+----
+NULL
+NULL
+
+statement ok
+ALTER TABLE table1 DROP TABLE another1
+
+statement error
+ALTER TABLE table1 DROP TABLE another2
+
+statement ok
+TRUNCATE another1
+
+statement ok
+TRUNCATE another2
+
+statement ok
+ALTER TABLE table1 ADD TABLE another1 AS PARTITION FROM RANGE MINVALUE TO 2
+
+statement error
+ALTER TABLE table1 ADD TABLE another2 AS PARTITION FROM RANGE MINVALUE TO 1
+
+statement error
+ALTER TABLE table1 ADD TABLE another2 AS PARTITION FROM 0 TO 1
+
+statement ok
+ALTER TABLE table1 DROP TABLE another1
+
+statement error
+ALTER TABLE table1 DROP TABLE another2
+
+statement ok
+ALTER TABLE table1 ADD TABLE another1 AS PARTITION FROM 2 TO RANGE MAXVALUE
+
+statement error
+ALTER TABLE table1 ADD TABLE another2 AS PARTITION FROM 10 TO RANGE MAXVALUE
+
+statement error
+ALTER TABLE table1 ADD TABLE another2 AS PARTITION FROM 1 TO 3
+
+statement ok
+ALTER TABLE table1 DROP TABLE another1
+
+statement error
+ALTER TABLE table1 DROP TABLE another2
+
+statement ok
+ALTER TABLE table1 ADD TABLE another1 AS PARTITION FROM RANGE MINVALUE TO 0
+
+statement ok
+ALTER TABLE table1 ADD TABLE another2 AS PARTITION FROM 10 TO RANGE MAXVALUE
+
+statement ok
+ALTER TABLE table1 ADD TABLE another3 AS PARTITION FROM 0 TO 10
+
+statement ok
+ALTER TABLE table1 ADD TABLE another4 AS PARTITION FOR NULL VALUES
+
+statement error
+ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM -100 TO -1
+
+statement error
+ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM RANGE MINVALUE TO -1
+
+statement error
+ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM RANGE MINVALUE TO 0
+
+statement error
+ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM RANGE MINVALUE TO
RANGE MAXVALUE
+
+statement error
+ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 0 TO 0
+
+statement error
+ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 10 TO 10
+
+statement error
+ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 10 TO 11
+
+statement error
+ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 10 TO RANGE MAXVALUE
+
+statement error
+ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 20 TO RANGE MAXVALUE
+
+statement error
+ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 9 TO 10
+
+statement error
+ALTER TABLE table1 ADD TABLE another5 AS PARTITION FROM 9 TO 10 WITH NULL
VALUES
+
+statement error
+ALTER TABLE table1 ADD TABLE another5 AS PARTITION FOR NULL VALUES
+
+statement ok
+ALTER TABLE table1 DROP TABLE another1
+
+statement ok
+ALTER TABLE table1 DROP TABLE another2
+
+statement ok
+ALTER TABLE table1 DROP TABLE another3
+
+statement ok
+ALTER TABLE table1 DROP TABLE another4
+
+statement error
+ALTER TABLE table1 DROP TABLE another5
+
+statement ok
DROP TABLE another1
statement ok
DROP TABLE another2
statement ok
+DROP TABLE another3
+
+statement ok
+DROP TABLE another4
+
+statement ok
+DROP TABLE another5
+
+statement ok
DROP TABLE table1
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
@@ -591,6 +591,132 @@ select 1 from splitted2 where stamp in (
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
