Changeset: 903de635b8a9 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=903de635b8a9 Added Files: sql/test/merge-partitions/Tests/mergepart23.py sql/test/merge-partitions/Tests/mergepart23.stable.err sql/test/merge-partitions/Tests/mergepart23.stable.out Modified Files: sql/test/merge-partitions/Tests/All Branch: merge-partitions Log Message:
Test coherence of partitions with reinitialization of the server diffs (248 lines): diff --git a/sql/test/merge-partitions/Tests/All b/sql/test/merge-partitions/Tests/All --- a/sql/test/merge-partitions/Tests/All +++ b/sql/test/merge-partitions/Tests/All @@ -21,3 +21,4 @@ mergepart19 mergepart20 mergepart21 mergepart22 +mergepart23 diff --git a/sql/test/merge-partitions/Tests/mergepart23.py b/sql/test/merge-partitions/Tests/mergepart23.py new file mode 100644 --- /dev/null +++ b/sql/test/merge-partitions/Tests/mergepart23.py @@ -0,0 +1,61 @@ +import sys + +try: + from MonetDBtesting import process +except ImportError: + import process + +def server_stop(s): + out, err = s.communicate() + sys.stdout.write(out) + sys.stderr.write(err) + +def client(input): + c = process.client('sql', stdin = process.PIPE, stdout = process.PIPE, stderr = process.PIPE) + out, err = c.communicate(input) + sys.stdout.write(out) + 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));\ +ALTER TABLE testme ADD TABLE subtable1 AS PARTITION BETWEEN 5 AND 10;\ +CREATE MERGE TABLE anothertest (a int, b varchar(32)) PARTITION BY RANGE USING (a + 1);\ +ALTER TABLE anothertest ADD TABLE subtable3 AS PARTITION BETWEEN 11 AND 20; +''' + +script2 = '''\ +ALTER TABLE anothertest ADD TABLE subtable1 AS PARTITION BETWEEN 11 AND 20; +''' + +script3 = '''\ +ALTER TABLE testme ADD TABLE subtable2 AS PARTITION BETWEEN 11 AND 20;\ +ALTER TABLE anothertest ADD TABLE subtable4 AS PARTITION BETWEEN 11 AND 20;\ +INSERT INTO testme VALUES (1, 'one'), (12, 'two'), (13, 'three'), (15, 'four');\ +INSERT INTO anothertest VALUES (1, 'one'), (12, 'two'), (13, 'three'), (15, 'four');\ +SELECT a,b FROM testme;\ +SELECT a,b FROM anothertest;\ +ALTER TABLE testme DROP TABLE subtable1;\ +ALTER TABLE testme DROP TABLE subtable2;\ +ALTER TABLE anothertest DROP TABLE subtable3;\ +ALTER TABLE anothertest DROP TABLE subtable4;\ +DROP TABLE testme;\ +DROP TABLE subtable1;\ +DROP TABLE subtable2;\ +DROP TABLE anothertest;\ +DROP TABLE subtable3;\ +DROP TABLE subtable4; +''' + +s = process.server(args = [], stdin = process.PIPE, stdout = process.PIPE, stderr = process.PIPE) +client(script1) +server_stop(s) +s = process.server(args = [], stdin = process.PIPE, stdout = process.PIPE, stderr = process.PIPE) +client(script2) +server_stop(s) +s = process.server(args = [], stdin = process.PIPE, stdout = process.PIPE, stderr = process.PIPE) +client(script3) +server_stop(s) diff --git a/sql/test/merge-partitions/Tests/mergepart23.stable.err b/sql/test/merge-partitions/Tests/mergepart23.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/merge-partitions/Tests/mergepart23.stable.err @@ -0,0 +1,67 @@ +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 > + +# 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 mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# 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 +MAPI = (monetdb) /var/tmp/mtest-20394/.s.monetdb.38240 +QUERY = ALTER TABLE anothertest ADD TABLE subtable1 AS PARTITION BETWEEN 11 AND 20; +ERROR = !ALTER TABLE: table sys.subtable1 is already part of another range partition 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 +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# 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 +# builtin opt mapi_port = 50000 +# builtin opt mapi_open = false +# builtin opt mapi_autosense = false +# builtin opt sql_optimizer = default_pipe +# builtin opt sql_debug = 0 +# 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 + +# 16:51:13 > +# 16:51:13 > "Done." +# 16:51:13 > + diff --git a/sql/test/merge-partitions/Tests/mergepart23.stable.out b/sql/test/merge-partitions/Tests/mergepart23.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/merge-partitions/Tests/mergepart23.stable.out @@ -0,0 +1,97 @@ +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 > + +#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 BETWEEN 5 AND 10;CREATE MERGE TABLE anothertest (a int, b varchar(32)) PARTITION BY RANGE USING (a + 1);ALTER TABLE anothertest ADD TABLE subtable3 AS PARTITION BETWEEN 11 AND 20; +#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 BETWEEN 5 AND 10;CREATE MERGE TABLE anothertest (a int, b varchar(32)) PARTITION BY RANGE USING (a + 1);ALTER TABLE anothertest ADD TABLE subtable3 AS PARTITION BETWEEN 11 AND 20; +#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 BETWEEN 5 AND 10;CREATE MERGE TABLE anothertest (a int, b varchar(32)) PARTITION BY RANGE USING (a + 1);ALTER TABLE anothertest ADD TABLE subtable3 AS PARTITION BETWEEN 11 AND 20; +#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 BETWEEN 5 AND 10;CREATE MERGE TABLE anothertest (a int, b varchar(32)) PARTITION BY RANGE USING (a + 1);ALTER TABLE anothertest ADD TABLE subtable3 AS PARTITION BETWEEN 11 AND 20; +#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 BETWEEN 5 AND 10;CREATE MERGE TABLE anothertest (a int, b varchar(32)) PARTITION BY RANGE USING (a + 1);ALTER TABLE anothertest ADD TABLE subtable3 AS PARTITION BETWEEN 11 AND 20; +#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 BETWEEN 5 AND 10;CREATE MERGE TABLE anothertest (a int, b varchar(32)) PARTITION BY RANGE USING (a + 1);ALTER TABLE anothertest ADD TABLE subtable3 AS PARTITION BETWEEN 11 AND 20; +#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 BETWEEN 5 AND 10;CREATE MERGE TABLE anothertest (a int, b varchar(32)) PARTITION BY RANGE USING (a + 1);ALTER TABLE anothertest ADD TABLE subtable3 AS PARTITION BETWEEN 11 AND 20; +#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 BETWEEN 5 AND 10;CREATE MERGE TABLE anothertest (a int, b varchar(32)) PARTITION BY RANGE USING (a + 1);ALTER TABLE anothertest ADD TABLE subtable3 AS PARTITION BETWEEN 11 AND 20; +# MonetDB 5 server v11.30.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_merge-partitions', using 8 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers +# Found 15.492 GiB available main-memory. +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://dhcp-193.eduroam.cwi.nl:33958/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1771/.s.monetdb.33958 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# SQL catalog created, loading sql scripts once +# loading sql script: 09_like.sql +# loading sql script: 10_math.sql +# loading sql script: 11_times.sql +# loading sql script: 12_url.sql +# loading sql script: 13_date.sql +# loading sql script: 14_inet.sql +# loading sql script: 15_querylog.sql +# loading sql script: 16_tracelog.sql +# loading sql script: 17_temporal.sql +# loading sql script: 18_index.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_functions.sql +# loading sql script: 21_dependency_views.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 25_debug.sql +# loading sql script: 26_sysmon.sql +# loading sql script: 27_rejects.sql +# loading sql script: 39_analytics.sql +# loading sql script: 39_analytics_hge.sql +# loading sql script: 40_geom.sql +# loading sql script: 40_json.sql +# loading sql script: 40_json_hge.sql +# loading sql script: 41_md5sum.sql +# loading sql script: 45_uuid.sql +# loading sql script: 46_profiler.sql +# loading sql script: 51_sys_schema_extension.sql +# loading sql script: 60_wlcr.sql +# loading sql script: 72_fits.sql +# loading sql script: 74_netcdf.sql +# loading sql script: 75_lidar.sql +# loading sql script: 75_shp.sql +# loading sql script: 75_storagemodel.sql +# loading sql script: 80_statistics.sql +# loading sql script: 80_udf.sql +# loading sql script: 80_udf_hge.sql +# loading sql script: 85_bam.sql +# loading sql script: 90_generator.sql +# loading sql script: 90_generator_hge.sql +# loading sql script: 99_system.sql +# MonetDB 5 server v11.30.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_merge-partitions', using 8 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers +# Found 15.492 GiB available main-memory. +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://dhcp-193.eduroam.cwi.nl:33958/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1771/.s.monetdb.33958 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB 5 server v11.30.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_merge-partitions', using 8 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers +# Found 15.492 GiB available main-memory. +# Copyright (c) 1993 - July 2008 CWI. +# Copyright (c) August 2008 - 2018 MonetDB B.V., all rights reserved +# Visit https://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://dhcp-193.eduroam.cwi.nl:33958/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-1771/.s.monetdb.33958 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +# 16:51:13 > +# 16:51:13 > "Done." +# 16:51:13 > + _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list