Changeset: 4a1691638461 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a1691638461
Modified Files:
sql/test/merge-partitions/Tests/mergepart23.SQL.py
sql/test/merge-partitions/Tests/mergepart23.stable.err
sql/test/merge-partitions/Tests/mergepart23.stable.out
Branch: Jun2020
Log Message:
Reduced test output
diffs (truncated from 611 to 300 lines):
diff --git a/sql/test/merge-partitions/Tests/mergepart23.SQL.py
b/sql/test/merge-partitions/Tests/mergepart23.SQL.py
--- a/sql/test/merge-partitions/Tests/mergepart23.SQL.py
+++ b/sql/test/merge-partitions/Tests/mergepart23.SQL.py
@@ -29,76 +29,76 @@ def client(input):
sys.stderr.write(err)
-script1 = '''\
-CREATE MERGE TABLE testme (a int, b varchar(32)) PARTITION BY RANGE ON (a);\
-CREATE TABLE subtable1 (a int, b varchar(32));\
-CREATE TABLE subtable2 (a int, b varchar(32));\
-CREATE TABLE subtable3 (a int, b varchar(32));\
-CREATE TABLE subtable4 (a int, b varchar(32));\
-CREATE TABLE subtable5 (a int, b varchar(32));\
-ALTER TABLE testme ADD TABLE subtable1 AS PARTITION FROM 5 TO 10;\
-ALTER TABLE testme ADD TABLE subtable5 AS PARTITION FOR NULL VALUES;\
-CREATE MERGE TABLE anothertest (a int, b varchar(32)) PARTITION BY RANGE USING
(a + 1);\
-ALTER TABLE anothertest ADD TABLE subtable3 AS PARTITION FROM 11 TO 20;\
+script1 = '''
+CREATE MERGE TABLE testme (a int, b varchar(32)) PARTITION BY RANGE ON (a);
+CREATE TABLE subtable1 (a int, b varchar(32));
+CREATE TABLE subtable2 (a int, b varchar(32));
+CREATE TABLE subtable3 (a int, b varchar(32));
+CREATE TABLE subtable4 (a int, b varchar(32));
+CREATE TABLE subtable5 (a int, b varchar(32));
+ALTER TABLE testme ADD TABLE subtable1 AS PARTITION FROM 5 TO 10;
+ALTER TABLE testme ADD TABLE subtable5 AS PARTITION FOR NULL VALUES;
+CREATE MERGE TABLE anothertest (a int, b varchar(32)) PARTITION BY RANGE USING
(a + 1);
+ALTER TABLE anothertest ADD TABLE subtable3 AS PARTITION FROM 11 TO 20;
SELECT "minimum", "maximum" FROM range_partitions;
'''
-script2 = '''\
-SELECT "minimum", "maximum" FROM range_partitions;\
-ALTER TABLE anothertest ADD TABLE subtable1 AS PARTITION FROM 11 TO 20;\
+script2 = '''
+SELECT "minimum", "maximum" FROM range_partitions;
+ALTER TABLE anothertest ADD TABLE subtable1 AS PARTITION FROM 11 TO 20;
--error, subtable1 is part of another table
SELECT "minimum", "maximum" FROM range_partitions;
'''
-script3 = '''\
-SELECT "minimum", "maximum" FROM range_partitions;\
-ALTER TABLE testme ADD TABLE subtable2 AS PARTITION FROM 11 TO 20;\
-ALTER TABLE anothertest ADD TABLE subtable4 AS PARTITION FROM 21 TO 30;\
-INSERT INTO testme VALUES (5, 'one'), (12, 'two'), (13, 'three'), (15,
'four'), (NULL, 'five');\
-INSERT INTO anothertest VALUES (11, 'one'), (12, 'two'), (13, 'three'), (15,
'four');\
-SELECT a,b FROM testme;\
-SELECT a,b FROM anothertest;\
-SELECT "minimum", "maximum" FROM range_partitions;\
-ALTER TABLE testme DROP TABLE subtable1;\
-ALTER TABLE testme DROP TABLE subtable2;\
-ALTER TABLE testme DROP TABLE subtable5;\
-ALTER TABLE anothertest DROP TABLE subtable3;\
-ALTER TABLE anothertest DROP TABLE subtable4;\
-SELECT "minimum", "maximum" FROM range_partitions;\
-DROP TABLE testme;\
-DROP TABLE subtable1;\
-DROP TABLE subtable2;\
-DROP TABLE anothertest;\
-DROP TABLE subtable3;\
-DROP TABLE subtable4;\
+script3 = '''
+SELECT "minimum", "maximum" FROM range_partitions;
+ALTER TABLE testme ADD TABLE subtable2 AS PARTITION FROM 11 TO 20;
+ALTER TABLE anothertest ADD TABLE subtable4 AS PARTITION FROM 21 TO 30;
+INSERT INTO testme VALUES (5, 'one'), (12, 'two'), (13, 'three'), (15,
'four'), (NULL, 'five');
+INSERT INTO anothertest VALUES (11, 'one'), (12, 'two'), (13, 'three'), (15,
'four');
+SELECT a,b FROM testme;
+SELECT a,b FROM anothertest;
+SELECT "minimum", "maximum" FROM range_partitions;
+ALTER TABLE testme DROP TABLE subtable1;
+ALTER TABLE testme DROP TABLE subtable2;
+ALTER TABLE testme DROP TABLE subtable5;
+ALTER TABLE anothertest DROP TABLE subtable3;
+ALTER TABLE anothertest DROP TABLE subtable4;
+SELECT "minimum", "maximum" FROM range_partitions;
+DROP TABLE testme;
+DROP TABLE subtable1;
+DROP TABLE subtable2;
+DROP TABLE anothertest;
+DROP TABLE subtable3;
+DROP TABLE subtable4;
DROP TABLE subtable5;
'''
-script4 = '''\
-CREATE MERGE TABLE upsme (a int, b varchar(32)) PARTITION BY VALUES USING (a +
5);\
-CREATE TABLE subtable1 (a int, b varchar(32));\
-CREATE TABLE subtable2 (a int, b varchar(32));\
-CREATE TABLE subtable3 (a int, b varchar(32));\
-ALTER TABLE upsme ADD TABLE subtable3 AS PARTITION FOR NULL VALUES;\
-INSERT INTO upsme VALUES (NULL, 'one');\
-ALTER TABLE upsme ADD TABLE subtable1 AS PARTITION IN (15, 25, 35);\
-ALTER TABLE upsme ADD TABLE subtable2 AS PARTITION IN (45, 55, 65);\
+script4 = '''
+CREATE MERGE TABLE upsme (a int, b varchar(32)) PARTITION BY VALUES USING (a +
5);
+CREATE TABLE subtable1 (a int, b varchar(32));
+CREATE TABLE subtable2 (a int, b varchar(32));
+CREATE TABLE subtable3 (a int, b varchar(32));
+ALTER TABLE upsme ADD TABLE subtable3 AS PARTITION FOR NULL VALUES;
+INSERT INTO upsme VALUES (NULL, 'one');
+ALTER TABLE upsme ADD TABLE subtable1 AS PARTITION IN (15, 25, 35);
+ALTER TABLE upsme ADD TABLE subtable2 AS PARTITION IN (45, 55, 65);
SELECT "value" FROM value_partitions;
'''
-script5 = '''\
-INSERT INTO upsme VALUES (10, 'two'), (40, 'three'), (NULL, 'four');\
-INSERT INTO subtable3 VALUES (NULL, 'five');\
-SELECT a,b FROM upsme;\
-SELECT a,b FROM subtable1;\
-SELECT a,b FROM subtable2;\
-SELECT a,b FROM subtable3;\
-ALTER TABLE upsme DROP TABLE subtable1;\
-ALTER TABLE upsme DROP TABLE subtable2;\
-ALTER TABLE upsme DROP TABLE subtable3;\
-SELECT "value" FROM value_partitions;\
-DROP TABLE upsme;\
-DROP TABLE subtable1;\
-DROP TABLE subtable2;\
+script5 = '''
+INSERT INTO upsme VALUES (10, 'two'), (40, 'three'), (NULL, 'four');
+INSERT INTO subtable3 VALUES (NULL, 'five');
+SELECT a,b FROM upsme;
+SELECT a,b FROM subtable1;
+SELECT a,b FROM subtable2;
+SELECT a,b FROM subtable3;
+ALTER TABLE upsme DROP TABLE subtable1;
+ALTER TABLE upsme DROP TABLE subtable2;
+ALTER TABLE upsme DROP TABLE subtable3;
+SELECT "value" FROM value_partitions;
+DROP TABLE upsme;
+DROP TABLE subtable1;
+DROP TABLE subtable2;
DROP TABLE subtable3;
'''
diff --git a/sql/test/merge-partitions/Tests/mergepart23.stable.err
b/sql/test/merge-partitions/Tests/mergepart23.stable.err
--- a/sql/test/merge-partitions/Tests/mergepart23.stable.err
+++ b/sql/test/merge-partitions/Tests/mergepart23.stable.err
@@ -1,66 +1,81 @@
stderr of test 'mergepart23` in directory 'sql/test/merge-partitions` itself:
-# 16:51:10 >
-# 16:51:10 > "/usr/bin/python" "mergepart23.py" "mergepart23"
-# 16:51:10 >
+# 08:41:06 >
+# 08:41:06 > "/usr/bin/python3" "mergepart23.SQL.py" "mergepart23"
+# 08:41:06 >
-# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-merge-partitions/BUILD/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
+# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Jun2020/BUILD/var/monetdb5/dbfarm/demo
# builtin opt mapi_port = 50000
# builtin opt mapi_open = false
+# builtin opt mapi_ipv6 = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# builtin opt raw_strings = false
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 40039
+# cmdline opt mapi_usock = /var/tmp/mtest-8430/.s.monetdb.40039
+# cmdline opt gdk_dbpath = /tmp/tmp5_6lepwa/db1/db1
+MAPI = (monetdb) /var/tmp/mtest-8430/.s.monetdb.40039
+QUERY = ALTER TABLE anothertest ADD TABLE subtable1 AS PARTITION FROM 11 TO
20; --error, subtable1 is part of another table
+ERROR = !ALTER TABLE: table 'sys.subtable1' is already part of another table
+CODE = 42000
+# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Jun2020/BUILD/var/monetdb5/dbfarm/demo
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_ipv6 = false
# builtin opt mapi_autosense = false
# builtin opt sql_optimizer = default_pipe
# builtin opt sql_debug = 0
+# builtin opt raw_strings = false
# cmdline opt gdk_nr_threads = 0
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 33958
-# cmdline opt mapi_usock = /var/tmp/mtest-1771/.s.monetdb.33958
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Apr2019/BUILD/var/MonetDB/mTests_sql_test_merge-partitions
-MAPI = (monetdb) /var/tmp/mtest-13251/.s.monetdb.37915
-QUERY = SELECT "minimum", "maximum" FROM range_partitions;ALTER TABLE
anothertest ADD TABLE subtable1 AS PARTITION FROM 11 TO 20;SELECT "minimum",
"maximum" FROM range_partitions;
-ERROR = !ALTER TABLE: table 'sys.subtable1' is already part of another table
-CODE = 42000
-# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-merge-partitions/BUILD/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
+# cmdline opt mapi_port = 59527
+# cmdline opt mapi_usock = /var/tmp/mtest-8016/.s.monetdb.59527
+# cmdline opt gdk_dbpath = /tmp/tmpeohzwcf3/db1/db1
+# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Jun2020/BUILD/var/monetdb5/dbfarm/demo
# builtin opt mapi_port = 50000
# builtin opt mapi_open = false
+# builtin opt mapi_ipv6 = false
# builtin opt mapi_autosense = false
# builtin opt sql_optimizer = default_pipe
# builtin opt sql_debug = 0
+# builtin opt raw_strings = false
# cmdline opt gdk_nr_threads = 0
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 33958
-# cmdline opt mapi_usock = /var/tmp/mtest-1771/.s.monetdb.33958
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-merge-partitions/BUILD/var/MonetDB/mTests_sql_test_merge-partitions
-# cmdline opt gdk_debug = 553648138
-# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-merge-partitions/BUILD/var/monetdb5/dbfarm/demo
-# builtin opt gdk_debug = 0
-# builtin opt gdk_vmtrim = no
-# builtin opt monet_prompt = >
-# builtin opt monet_daemon = no
+# cmdline opt mapi_port = 59527
+# cmdline opt mapi_usock = /var/tmp/mtest-8016/.s.monetdb.59527
+# cmdline opt gdk_dbpath = /tmp/tmpeohzwcf3/db1/db1
+# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Jun2020/BUILD/var/monetdb5/dbfarm/demo
# builtin opt mapi_port = 50000
# builtin opt mapi_open = false
+# builtin opt mapi_ipv6 = false
# builtin opt mapi_autosense = false
# builtin opt sql_optimizer = default_pipe
# builtin opt sql_debug = 0
+# builtin opt raw_strings = false
# cmdline opt gdk_nr_threads = 0
# cmdline opt mapi_open = true
-# cmdline opt mapi_port = 33958
-# cmdline opt mapi_usock = /var/tmp/mtest-1771/.s.monetdb.33958
-# cmdline opt monet_prompt =
-# cmdline opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-merge-partitions/BUILD/var/MonetDB/mTests_sql_test_merge-partitions
-# cmdline opt gdk_debug = 553648138
+# cmdline opt mapi_port = 59527
+# cmdline opt mapi_usock = /var/tmp/mtest-8016/.s.monetdb.59527
+# cmdline opt gdk_dbpath = /tmp/tmpeohzwcf3/db1/db1
+# builtin opt gdk_dbpath =
/home/ferreira/repositories/MonetDB-Jun2020/BUILD/var/monetdb5/dbfarm/demo
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_ipv6 = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# builtin opt raw_strings = false
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 59527
+# cmdline opt mapi_usock = /var/tmp/mtest-8016/.s.monetdb.59527
+# cmdline opt gdk_dbpath = /tmp/tmpeohzwcf3/db1/db1
-# 16:51:13 >
-# 16:51:13 > "Done."
-# 16:51:13 >
+# 08:41:09 >
+# 08:41:09 > "Done."
+# 08:41:09 >
diff --git a/sql/test/merge-partitions/Tests/mergepart23.stable.out
b/sql/test/merge-partitions/Tests/mergepart23.stable.out
--- a/sql/test/merge-partitions/Tests/mergepart23.stable.out
+++ b/sql/test/merge-partitions/Tests/mergepart23.stable.out
@@ -1,19 +1,21 @@
stdout of test 'mergepart23` in directory 'sql/test/merge-partitions` itself:
-# 16:51:10 >
-# 16:51:10 > "/usr/bin/python" "mergepart23.py" "mergepart23"
-# 16:51:10 >
+# 08:41:06 >
+# 08:41:06 > "/usr/bin/python3" "mergepart23.SQL.py" "mergepart23"
+# 08:41:06 >
-#CREATE MERGE TABLE testme (a int, b varchar(32)) PARTITION BY RANGE ON
(a);CREATE TABLE subtable1 (a int, b varchar(32));CREATE TABLE subtable2 (a
int, b varchar(32));CREATE TABLE subtable3 (a int, b varchar(32));CREATE TABLE
subtable4 (a int, b varchar(32));ALTER TABLE testme ADD TABLE subtable1 AS
PARTITION FROM 5 TO 10;CREATE MERGE TABLE anothertest (a int, b varchar(32))
PARTITION BY RANGE USING (a + 1);ALTER TABLE anothertest ADD TABLE subtable3 AS
PARTITION FROM 11 TO 20;SELECT "minimum", "maximum" FROM range_partitions;
-#CREATE MERGE TABLE testme (a int, b varchar(32)) PARTITION BY RANGE ON
(a);CREATE TABLE subtable1 (a int, b varchar(32));CREATE TABLE subtable2 (a
int, b varchar(32));CREATE TABLE subtable3 (a int, b varchar(32));CREATE TABLE
subtable4 (a int, b varchar(32));ALTER TABLE testme ADD TABLE subtable1 AS
PARTITION FROM 5 TO 10;CREATE MERGE TABLE anothertest (a int, b varchar(32))
PARTITION BY RANGE USING (a + 1);ALTER TABLE anothertest ADD TABLE subtable3 AS
PARTITION FROM 11 TO 20;SELECT "minimum", "maximum" FROM range_partitions;
-#CREATE MERGE TABLE testme (a int, b varchar(32)) PARTITION BY RANGE ON
(a);CREATE TABLE subtable1 (a int, b varchar(32));CREATE TABLE subtable2 (a
int, b varchar(32));CREATE TABLE subtable3 (a int, b varchar(32));CREATE TABLE
subtable4 (a int, b varchar(32));ALTER TABLE testme ADD TABLE subtable1 AS
PARTITION FROM 5 TO 10;CREATE MERGE TABLE anothertest (a int, b varchar(32))
PARTITION BY RANGE USING (a + 1);ALTER TABLE anothertest ADD TABLE subtable3 AS
PARTITION FROM 11 TO 20;SELECT "minimum", "maximum" FROM range_partitions;
-#CREATE MERGE TABLE testme (a int, b varchar(32)) PARTITION BY RANGE ON
(a);CREATE TABLE subtable1 (a int, b varchar(32));CREATE TABLE subtable2 (a
int, b varchar(32));CREATE TABLE subtable3 (a int, b varchar(32));CREATE TABLE
subtable4 (a int, b varchar(32));ALTER TABLE testme ADD TABLE subtable1 AS
PARTITION FROM 5 TO 10;CREATE MERGE TABLE anothertest (a int, b varchar(32))
PARTITION BY RANGE USING (a + 1);ALTER TABLE anothertest ADD TABLE subtable3 AS
PARTITION FROM 11 TO 20;SELECT "minimum", "maximum" FROM range_partitions;
-#CREATE MERGE TABLE testme (a int, b varchar(32)) PARTITION BY RANGE ON
(a);CREATE TABLE subtable1 (a int, b varchar(32));CREATE TABLE subtable2 (a
int, b varchar(32));CREATE TABLE subtable3 (a int, b varchar(32));CREATE TABLE
subtable4 (a int, b varchar(32));ALTER TABLE testme ADD TABLE subtable1 AS
PARTITION FROM 5 TO 10;CREATE MERGE TABLE anothertest (a int, b varchar(32))
PARTITION BY RANGE USING (a + 1);ALTER TABLE anothertest ADD TABLE subtable3 AS
PARTITION FROM 11 TO 20;SELECT "minimum", "maximum" FROM range_partitions;
-#CREATE MERGE TABLE testme (a int, b varchar(32)) PARTITION BY RANGE ON
(a);CREATE TABLE subtable1 (a int, b varchar(32));CREATE TABLE subtable2 (a
int, b varchar(32));CREATE TABLE subtable3 (a int, b varchar(32));CREATE TABLE
subtable4 (a int, b varchar(32));ALTER TABLE testme ADD TABLE subtable1 AS
PARTITION FROM 5 TO 10;CREATE MERGE TABLE anothertest (a int, b varchar(32))
PARTITION BY RANGE USING (a + 1);ALTER TABLE anothertest ADD TABLE subtable3 AS
PARTITION FROM 11 TO 20;SELECT "minimum", "maximum" FROM range_partitions;
-#CREATE MERGE TABLE testme (a int, b varchar(32)) PARTITION BY RANGE ON
(a);CREATE TABLE subtable1 (a int, b varchar(32));CREATE TABLE subtable2 (a
int, b varchar(32));CREATE TABLE subtable3 (a int, b varchar(32));CREATE TABLE
subtable4 (a int, b varchar(32));ALTER TABLE testme ADD TABLE subtable1 AS
PARTITION FROM 5 TO 10;CREATE MERGE TABLE anothertest (a int, b varchar(32))
PARTITION BY RANGE USING (a + 1);ALTER TABLE anothertest ADD TABLE subtable3 AS
PARTITION FROM 11 TO 20;SELECT "minimum", "maximum" FROM range_partitions;
-#CREATE MERGE TABLE testme (a int, b varchar(32)) PARTITION BY RANGE ON
(a);CREATE TABLE subtable1 (a int, b varchar(32));CREATE TABLE subtable2 (a
int, b varchar(32));CREATE TABLE subtable3 (a int, b varchar(32));CREATE TABLE
subtable4 (a int, b varchar(32));ALTER TABLE testme ADD TABLE subtable1 AS
PARTITION FROM 5 TO 10;CREATE MERGE TABLE anothertest (a int, b varchar(32))
PARTITION BY RANGE USING (a + 1);ALTER TABLE anothertest ADD TABLE subtable3 AS
PARTITION FROM 11 TO 20;SELECT "minimum", "maximum" FROM range_partitions;
-#CREATE MERGE TABLE testme (a int, b varchar(32)) PARTITION BY RANGE ON
(a);CREATE TABLE subtable1 (a int, b varchar(32));CREATE TABLE subtable2 (a
int, b varchar(32));CREATE TABLE subtable3 (a int, b varchar(32));CREATE TABLE
subtable4 (a int, b varchar(32));ALTER TABLE testme ADD TABLE subtable1 AS
PARTITION FROM 5 TO 10;CREATE MERGE TABLE anothertest (a int, b varchar(32))
PARTITION BY RANGE USING (a + 1);ALTER TABLE anothertest ADD TABLE subtable3 AS
PARTITION FROM 11 TO 20;SELECT "minimum", "maximum" FROM range_partitions;
+#CREATE MERGE TABLE testme (a int, b varchar(32)) PARTITION BY RANGE ON (a);
+#CREATE TABLE subtable1 (a int, b varchar(32));
+#CREATE TABLE subtable2 (a int, b varchar(32));
+#CREATE TABLE subtable3 (a int, b varchar(32));
+#CREATE TABLE subtable4 (a int, b varchar(32));
+#CREATE TABLE subtable5 (a int, b varchar(32));
+#ALTER TABLE testme ADD TABLE subtable1 AS PARTITION FROM 5 TO 10;
+#ALTER TABLE testme ADD TABLE subtable5 AS PARTITION FOR NULL VALUES;
+#CREATE MERGE TABLE anothertest (a int, b varchar(32)) PARTITION BY RANGE
USING (a + 1);
+#ALTER TABLE anothertest ADD TABLE subtable3 AS PARTITION FROM 11 TO 20;
+#SELECT "minimum", "maximum" FROM range_partitions;
% sys.range_partitions, sys.range_partitions # table_name
% minimum, maximum # name
% varchar, varchar # type
@@ -21,22 +23,20 @@ stdout of test 'mergepart23` in director
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
