Changeset: 51d90261da7e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=51d90261da7e Added Files: sql/test/mergetables/Tests/All sql/test/mergetables/Tests/crash0.sql sql/test/mergetables/Tests/mergedrop.sql sql/test/mergetables/Tests/mergeinit.sql sql/test/mergetables/Tests/mergeinit.stable.err sql/test/mergetables/Tests/mergeinit.stable.out sql/test/mergetables/Tests/mergeload.sql sql/test/mergetables/Tests/mergeload.stable.err sql/test/mergetables/Tests/mergeload.stable.out sql/test/mergetables/Tests/mergequery.sql sql/test/mergetables/Tests/mergequery.stable.err sql/test/mergetables/Tests/mergequery.stable.out Branch: default Log Message:
Addition of the first merge table tests. 2 tests causes the server to crash diffs (truncated from 526 to 300 lines): diff --git a/sql/test/mergetables/Tests/All b/sql/test/mergetables/Tests/All new file mode 100644 --- /dev/null +++ b/sql/test/mergetables/Tests/All @@ -0,0 +1,6 @@ +mergeinit +mergeload +mergequery +#mergedrop corrupts the database +#crash0 crashes the server + diff --git a/sql/test/mergetables/Tests/crash0.sql b/sql/test/mergetables/Tests/crash0.sql new file mode 100644 --- /dev/null +++ b/sql/test/mergetables/Tests/crash0.sql @@ -0,0 +1,25 @@ +START TRANSACTION; +CREATE TABLE part1 ( x double, y double, z double); +COPY 4 RECORDS INTO part1 FROM stdin USING DELIMITERS ' ','\n'; +0.0 0.0 0.0 +1.0 0.0 0.0 +0.0 1.0 0.0 +1.0 1.0 0.0 + +CREATE TABLE part2 ( x double, y double, z double); +COPY 4 RECORDS INTO part2 FROM stdin USING DELIMITERS ' ','\n'; +2.0 0.0 0.0 +3.0 0.0 0.0 +2.0 1.0 0.0 +3.0 1.0 0.0 + +CREATE MERGE TABLE complete ( x double, y double, z double); + +ALTER TABLE complete ADD TABLE part1; +ALTER TABLE complete ADD TABLE part2; +ALTER TABLE complete SET READ ONLY; + +DROP TABLE complete; +DROP TABLE part1; +DROP TABLE part2; +ABORT; diff --git a/sql/test/mergetables/Tests/mergedrop.sql b/sql/test/mergetables/Tests/mergedrop.sql new file mode 100644 --- /dev/null +++ b/sql/test/mergetables/Tests/mergedrop.sql @@ -0,0 +1,28 @@ +CREATE TABLE part1 ( x double, y double, z double); +COPY 4 RECORDS INTO part1 FROM stdin USING DELIMITERS ' ','\n'; +0.0 0.0 0.0 +1.0 0.0 0.0 +0.0 1.0 0.0 +1.0 1.0 0.0 + +CREATE TABLE part2 ( x double, y double, z double); +COPY 4 RECORDS INTO part2 FROM stdin USING DELIMITERS ' ','\n'; +2.0 0.0 0.0 +3.0 0.0 0.0 +2.0 1.0 0.0 +3.0 1.0 0.0 + +CREATE MERGE TABLE complete ( x double, y double, z double); + +ALTER TABLE complete ADD TABLE part1; +ALTER TABLE complete ADD TABLE part2; + +SELECT * FROM COMPLETE; + +DROP TABLE part1; +SELECT * FROM COMPLETE; + +DROP TABLE part2; +SELECT * FROM COMPLETE; + +DROP TABLE complete; diff --git a/sql/test/mergetables/Tests/mergeinit.sql b/sql/test/mergetables/Tests/mergeinit.sql new file mode 100644 --- /dev/null +++ b/sql/test/mergetables/Tests/mergeinit.sql @@ -0,0 +1,12 @@ +CREATE TABLE part1 ( x double, y double, z double); +CREATE TABLE part2 ( x double, y double, z double); + +CREATE MERGE TABLE complete ( x double, y double, z double); + +ALTER TABLE complete ADD TABLE part1; +ALTER TABLE complete ADD TABLE part2; + + +DROP TABLE complete; +DROP TABLE part1; +DROP TABLE part2; diff --git a/sql/test/mergetables/Tests/mergeinit.stable.err b/sql/test/mergetables/Tests/mergeinit.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/mergetables/Tests/mergeinit.stable.err @@ -0,0 +1,37 @@ +stderr of test 'mergeinit` in directory 'sql/test/mergetables` itself: + + +# 16:18:31 > +# 16:18:31 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39884" "--set" "mapi_usock=/var/tmp/mtest-10817/.s.monetdb.39884" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_test_mergetables" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 16:18:31 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/current//Linux/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 = 39884 +# cmdline opt mapi_usock = /var/tmp/mtest-10817/.s.monetdb.39884 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_test_mergetables +# cmdline opt mal_listing = 0 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 16:18:31 > +# 16:18:31 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-10817" "--port=39884" +# 16:18:31 > + + +# 16:18:31 > +# 16:18:31 > "Done." +# 16:18:31 > + diff --git a/sql/test/mergetables/Tests/mergeinit.stable.out b/sql/test/mergetables/Tests/mergeinit.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/mergetables/Tests/mergeinit.stable.out @@ -0,0 +1,72 @@ +stdout of test 'mergeinit` in directory 'sql/test/mergetables` itself: + + +# 16:18:31 > +# 16:18:31 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39884" "--set" "mapi_usock=/var/tmp/mtest-10817/.s.monetdb.39884" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_test_mergetables" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 16:18:31 > + +# MonetDB 5 server v11.20.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_mergetables', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 15.590 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://vienna.ins.cwi.nl:39884/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-10817/.s.monetdb.39884 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded +# MonetDB/R module loaded + +Ready. +# 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: 19_cluster.sql +# loading sql script: 20_vacuum.sql +# loading sql script: 21_dependency_functions.sql +# loading sql script: 22_clients.sql +# loading sql script: 23_skyserver.sql +# loading sql script: 24_zorder.sql +# loading sql script: 25_debug.sql +# loading sql script: 26_sysmon.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_jsonstore.sql +# loading sql script: 45_uuid.sql +# loading sql script: 46_gsl.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: 89_generator_hge.sql +# loading sql script: 90_generator.sql +# loading sql script: 99_system.sql + +# 16:18:31 > +# 16:18:31 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-10817" "--port=39884" +# 16:18:31 > + +#CREATE TABLE part1 ( x double, y double, z double); +#CREATE TABLE part2 ( x double, y double, z double); +#CREATE MERGE TABLE complete ( x double, y double, z double); +#ALTER TABLE complete ADD TABLE part1; +#ALTER TABLE complete ADD TABLE part2; +#DROP TABLE complete; +#DROP TABLE part1; +#DROP TABLE part2; + +# 16:18:31 > +# 16:18:31 > "Done." +# 16:18:31 > + diff --git a/sql/test/mergetables/Tests/mergeload.sql b/sql/test/mergetables/Tests/mergeload.sql new file mode 100644 --- /dev/null +++ b/sql/test/mergetables/Tests/mergeload.sql @@ -0,0 +1,24 @@ +CREATE TABLE part1 ( x double, y double, z double); +COPY 4 RECORDS INTO part1 FROM stdin USING DELIMITERS ' ','\n'; +0.0 0.0 0.0 +1.0 0.0 0.0 +0.0 1.0 0.0 +1.0 1.0 0.0 + +CREATE TABLE part2 ( x double, y double, z double); +COPY 4 RECORDS INTO part2 FROM stdin USING DELIMITERS ' ','\n'; +2.0 0.0 0.0 +3.0 0.0 0.0 +2.0 1.0 0.0 +3.0 1.0 0.0 + +CREATE MERGE TABLE complete ( x double, y double, z double); + +ALTER TABLE complete ADD TABLE part1; +ALTER TABLE complete ADD TABLE part2; + +SELECT * FROM COMPLETE; + +DROP TABLE complete; +DROP TABLE part1; +DROP TABLE part2; diff --git a/sql/test/mergetables/Tests/mergeload.stable.err b/sql/test/mergetables/Tests/mergeload.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/mergetables/Tests/mergeload.stable.err @@ -0,0 +1,37 @@ +stderr of test 'mergeload` in directory 'sql/test/mergetables` itself: + + +# 16:18:32 > +# 16:18:32 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39884" "--set" "mapi_usock=/var/tmp/mtest-10817/.s.monetdb.39884" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_test_mergetables" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 16:18:32 > + +# builtin opt gdk_dbpath = /export/scratch1/mk/current//Linux/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 = 39884 +# cmdline opt mapi_usock = /var/tmp/mtest-10817/.s.monetdb.39884 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbpath = /export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_test_mergetables +# cmdline opt mal_listing = 0 +# cmdline opt embedded_r = yes +# cmdline opt gdk_debug = 536870922 + +# 16:18:32 > +# 16:18:32 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-10817" "--port=39884" +# 16:18:32 > + + +# 16:18:32 > +# 16:18:32 > "Done." +# 16:18:32 > + diff --git a/sql/test/mergetables/Tests/mergeload.stable.out b/sql/test/mergetables/Tests/mergeload.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/mergetables/Tests/mergeload.stable.out @@ -0,0 +1,65 @@ +stdout of test 'mergeload` in directory 'sql/test/mergetables` itself: + + +# 16:18:32 > +# 16:18:32 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=39884" "--set" "mapi_usock=/var/tmp/mtest-10817/.s.monetdb.39884" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/export/scratch1/mk/current//Linux/var/MonetDB/mTests_sql_test_mergetables" "--set" "mal_listing=0" "--set" "embedded_r=yes" +# 16:18:32 > + +# MonetDB 5 server v11.20.0 +# This is an unreleased version +# Serving database 'mTests_sql_test_mergetables', using 8 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs and 128bit integers dynamically linked +# Found 15.590 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
