Changeset: 61b3fa3b5d19 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=61b3fa3b5d19 Added Files: sql/test/Dump/Tests/clean-again.reqtests sql/test/Dump/Tests/clean-again.sql.src sql/test/Dump/Tests/clean-again.stable.err sql/test/Dump/Tests/clean-again.stable.out sql/test/Dump/Tests/dump-again.SQL.py sql/test/Dump/Tests/dump-again.reqtests sql/test/Dump/Tests/dump-again.stable.err sql/test/Dump/Tests/dump-again.stable.out sql/test/Dump/Tests/reload-again.SQL.py sql/test/Dump/Tests/reload-again.reqtests sql/test/Dump/Tests/reload-again.stable.err sql/test/Dump/Tests/reload-again.stable.out sql/test/Dump/Tests/test-again.reqtests sql/test/Dump/Tests/test-again.sql.src sql/test/Dump/Tests/test-again.stable.err.src sql/test/Dump/Tests/test-again.stable.out.src Modified Files: sql/test/Dump/Tests/All Branch: Mar2018 Log Message:
Added test for dumping using INSERT queries. The output currently required for the INTERVAL types is debatable, but I thought I'd make them as precise as possible. diffs (truncated from 480 to 300 lines): diff --git a/sql/test/Dump/Tests/All b/sql/test/Dump/Tests/All --- a/sql/test/Dump/Tests/All +++ b/sql/test/Dump/Tests/All @@ -1,6 +1,10 @@ dump-empty load dump +dump-again clean reload test +clean-again +reload-again +test-again diff --git a/sql/test/Dump/Tests/clean-again.reqtests b/sql/test/Dump/Tests/clean-again.reqtests new file mode 100644 --- /dev/null +++ b/sql/test/Dump/Tests/clean-again.reqtests @@ -0,0 +1,1 @@ +reload diff --git a/sql/test/Dump/Tests/clean-again.sql.src b/sql/test/Dump/Tests/clean-again.sql.src new file mode 100644 --- /dev/null +++ b/sql/test/Dump/Tests/clean-again.sql.src @@ -0,0 +1,1 @@ +clean.sql diff --git a/sql/test/Dump/Tests/clean-again.stable.err b/sql/test/Dump/Tests/clean-again.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/Dump/Tests/clean-again.stable.err @@ -0,0 +1,35 @@ +stderr of test 'clean-again` in directory 'sql/test/Dump` itself: + + +# 22:19:54 > +# 22:19:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37984" "--set" "mapi_usock=/var/tmp/mtest-25752/.s.monetdb.37984" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_Dump" "--set" "embedded_c=true" +# 22:19:54 > + +# builtin opt gdk_dbpath = /home/sjoerd/@Monet-stable/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 = 37984 +# cmdline opt mapi_usock = /var/tmp/mtest-25752/.s.monetdb.37984 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /home/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_Dump +# cmdline opt embedded_c = true +# cmdline opt gdk_debug = 553648138 + +# 22:19:54 > +# 22:19:54 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-25752" "--port=37984" +# 22:19:54 > + + +# 22:19:54 > +# 22:19:54 > "Done." +# 22:19:54 > + diff --git a/sql/test/Dump/Tests/clean-again.stable.out b/sql/test/Dump/Tests/clean-again.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/Dump/Tests/clean-again.stable.out @@ -0,0 +1,36 @@ +stdout of test 'clean-again` in directory 'sql/test/Dump` itself: + + +# 22:19:54 > +# 22:19:54 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37984" "--set" "mapi_usock=/var/tmp/mtest-25752/.s.monetdb.37984" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_Dump" "--set" "embedded_c=true" +# 22:19:54 > + +# MonetDB 5 server v11.29.4 (hg id: c717aa6c1f76) +# This is an unreleased version +# Serving database 'mTests_sql_test_Dump', using 4 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers +# Found 15.513 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://meeuw.mullender.nl:37984/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-25752/.s.monetdb.37984 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. + +# 22:19:54 > +# 22:19:54 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-25752" "--port=37984" +# 22:19:54 > + +#drop table "test"; +#drop sequence "test_seq"; +#drop table "typestest"; +#drop table keytest2; +#drop table keytest1; + +# 22:19:54 > +# 22:19:54 > "Done." +# 22:19:54 > + diff --git a/sql/test/Dump/Tests/dump-again.SQL.py b/sql/test/Dump/Tests/dump-again.SQL.py new file mode 100644 --- /dev/null +++ b/sql/test/Dump/Tests/dump-again.SQL.py @@ -0,0 +1,16 @@ +import os, sys +try: + from MonetDBtesting import process +except ImportError: + import process + +p = process.client('sqldump', args = ['--inserts'], stdout = process.PIPE, stderr = process.PIPE) +dump, err = p.communicate() + +print(os.path.join(os.environ['TSTTRGDIR'], 'dumpoutput2.sql')) +f = open(os.path.join(os.environ['TSTTRGDIR'], 'dumpoutput2.sql'), 'w') +f.write(dump) +f.close() + +sys.stdout.write(dump) +sys.stderr.write(err) diff --git a/sql/test/Dump/Tests/dump-again.reqtests b/sql/test/Dump/Tests/dump-again.reqtests new file mode 100644 --- /dev/null +++ b/sql/test/Dump/Tests/dump-again.reqtests @@ -0,0 +1,1 @@ +load diff --git a/sql/test/Dump/Tests/dump-again.stable.err b/sql/test/Dump/Tests/dump-again.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/Dump/Tests/dump-again.stable.err @@ -0,0 +1,43 @@ +stderr of test 'dump-again` in directory 'sql/test/Dump` itself: + + +# 22:27:57 > +# 22:27:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34099" "--set" "mapi_usock=/var/tmp/mtest-27453/.s.monetdb.34099" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_Dump" "--set" "embedded_c=true" +# 22:27:57 > + +# builtin opt gdk_dbpath = /home/sjoerd/@Monet-stable/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 = 34099 +# cmdline opt mapi_usock = /var/tmp/mtest-27453/.s.monetdb.34099 +# cmdline opt monet_prompt = +# cmdline opt gdk_dbpath = /home/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_Dump +# cmdline opt embedded_c = true +# cmdline opt gdk_debug = 553648138 +#WARNING To speedup sql.get_value a bulk operator implementation is needed +# X_258:bat[:lng] := mal.multiplex("sql":str, "get_value":str, X_230:bat[:str], X_238:bat[:str]); +#WARNING To speedup sql.get_value a bulk operator implementation is needed +# X_259:bat[:lng] := mal.multiplex("sql":str, "get_value":str, X_231:bat[:str], X_239:bat[:str]); +#WARNING To speedup sql.get_value a bulk operator implementation is needed +# X_260:bat[:lng] := mal.multiplex("sql":str, "get_value":str, X_232:bat[:str], X_240:bat[:str]); +#WARNING To speedup sql.get_value a bulk operator implementation is needed +# X_261:bat[:lng] := mal.multiplex("sql":str, "get_value":str, X_233:bat[:str], X_241:bat[:str]); + +# 22:27:57 > +# 22:27:57 > "/usr/bin/python" "dump-again.SQL.py" "dump-again" +# 22:27:57 > + + +# 22:27:57 > +# 22:27:57 > "Done." +# 22:27:57 > + diff --git a/sql/test/Dump/Tests/dump-again.stable.out b/sql/test/Dump/Tests/dump-again.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/Dump/Tests/dump-again.stable.out @@ -0,0 +1,112 @@ +stdout of test 'dump-again` in directory 'sql/test/Dump` itself: + + +# 22:27:57 > +# 22:27:57 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=34099" "--set" "mapi_usock=/var/tmp/mtest-27453/.s.monetdb.34099" "--set" "monet_prompt=" "--forcemito" "--dbpath=/home/sjoerd/@Monet-stable/var/MonetDB/mTests_sql_test_Dump" "--set" "embedded_c=true" +# 22:27:57 > + +# MonetDB 5 server v11.29.4 (hg id: c717aa6c1f76) +# This is an unreleased version +# Serving database 'mTests_sql_test_Dump', using 4 threads +# Compiled for x86_64-pc-linux-gnu/64bit with 128bit integers +# Found 15.513 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://meeuw.mullender.nl:34099/ +# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-27453/.s.monetdb.34099 +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. + +# 22:27:57 > +# 22:27:57 > "/usr/bin/python" "dump-again.SQL.py" "dump-again" +# 22:27:57 > + +/home/sjoerd/@Monet-stable/mTests/sql/test/Dump/dumpoutput2.sql +START TRANSACTION; +CREATE SEQUENCE "sys"."test_seq" AS INTEGER; +SET SCHEMA "sys"; +CREATE TABLE "sys"."test" ( + "id" INTEGER, + "i" SMALLINT DEFAULT next value for "sys"."test_seq" +); +INSERT INTO "sys"."test" VALUES (0, 7); +INSERT INTO "sys"."test" VALUES (1, 10); +INSERT INTO "sys"."test" VALUES (2, 5); +INSERT INTO "sys"."test" VALUES (3, 8); +INSERT INTO "sys"."test" VALUES (4, 5); +CREATE TABLE "sys"."typestest" ( + "boolean" BOOLEAN, + "tinyint" TINYINT, + "smallint" SMALLINT, + "int" INTEGER, + "bigint" BIGINT, + "double" DOUBLE, + "real" REAL, + "decimal" DECIMAL(18,3), + "decimal9" DECIMAL(9), + "decimal83" DECIMAL(8,3), + "float" DOUBLE, + "float9" FLOAT(9), + "float83" FLOAT(8,3), + "date" DATE, + "iY" INTERVAL YEAR, + "iYM" INTERVAL YEAR TO MONTH, + "iM" INTERVAL MONTH, + "id" INTERVAL DAY, + "idh" INTERVAL DAY TO HOUR, + "idm" INTERVAL DAY TO MINUTE, + "ids" INTERVAL DAY TO SECOND, + "ih" INTERVAL HOUR, + "ihm" INTERVAL HOUR TO MINUTE, + "ihs" INTERVAL HOUR TO SECOND, + "im" INTERVAL MINUTE, + "ims" INTERVAL MINUTE TO SECOND, + "is" INTERVAL SECOND, + "timestamp" TIMESTAMP, + "timestamp5" TIMESTAMP(5), + "timestampzone" TIMESTAMP WITH TIME ZONE, + "timestamp5zone" TIMESTAMP(5) WITH TIME ZONE, + "time" TIME, + "time5" TIME(5), + "timezone" TIME WITH TIME ZONE, + "time5zone" TIME(5) WITH TIME ZONE, + "blob" BINARY LARGE OBJECT, + "blob100" BINARY LARGE OBJECT(100), + "clob" CHARACTER LARGE OBJECT, + "clob100" CHARACTER LARGE OBJECT(100), + "character" CHAR(1), + "varchar100" VARCHAR(100), + "character10" CHAR(10), + "inet" INET, + "inet9" INET(9), + "json" JSON, + "json10" JSON(10), + "url" URL, + "url55" URL(55), + "uuid" UUID +); +INSERT INTO "sys"."typestest" VALUES (true, 10, 10000, 1000000, 10000000000, 1e+30, 1e+20, 1.000, 123456789, 12345.678, 3.1415, 3.1415, 3.1415, DATE '2009-04-15', INTERVAL '2' YEAR, INTERVAL '1-06' YEAR TO MONTH, INTERVAL '3' MONTH, INTERVAL '20' DAY, INTERVAL '1 06' DAY TO HOUR, INTERVAL '1 09:20' DAY TO MINUTE, INTERVAL '1 03:46:40' DAY TO SECOND, INTERVAL '10' HOUR, INTERVAL '1:40' HOUR TO MINUTE, INTERVAL '0:33:20' HOUR TO SECOND, INTERVAL '10' MINUTE, INTERVAL '1:40' MINUTE TO SECOND, INTERVAL '10' SECOND, TIMESTAMP '1995-07-15 07:30', TIMESTAMP '1995-07-15 07:30', TIMESTAMP '1995-07-15 07:30', TIMESTAMP '1995-07-15 07:30', TIME '07:30', TIME '07:30', TIME '07:30', TIME '07:30', BLOB '123456', BLOB '123456', '123456', '123456', 'x', 'varchar', '0123456789', '127.0.0.0', '127.127.127.255', '{"a": 123}', '{"b": 456}', 'https://www.monetdb.org/Documentation/Manuals/SQLreference/BuiltinTypes', 'https://www.monetdb.org/Documentation/Manuals/SQLreference/URLtype', 'ae106ad4-81fd-4f1a -85e8-5efface60da4'); +CREATE TABLE "sys"."keytest1" ( + "key1" INTEGER NOT NULL, + "key2" INTEGER NOT NULL, + CONSTRAINT "keytest1_key1_key2_pkey" PRIMARY KEY ("key1", "key2") +); +INSERT INTO "sys"."keytest1" VALUES (0, 0); +INSERT INTO "sys"."keytest1" VALUES (0, 1); +CREATE TABLE "sys"."keytest2" ( + "key1" INTEGER, + "key2" INTEGER +); +INSERT INTO "sys"."keytest2" VALUES (0, 0); +INSERT INTO "sys"."keytest2" VALUES (0, 1); +ALTER TABLE "sys"."keytest2" ADD CONSTRAINT "keytest2_key1_key2_fkey" FOREIGN KEY ("key1", "key2") REFERENCES "sys"."keytest1" ("key1", "key2"); +ALTER SEQUENCE "sys"."test_seq" RESTART WITH 8 INCREMENT BY 3 MINVALUE 5 MAXVALUE 10 CYCLE; +COMMIT; + +# 22:27:57 > +# 22:27:57 > "Done." +# 22:27:57 > + diff --git a/sql/test/Dump/Tests/reload-again.SQL.py b/sql/test/Dump/Tests/reload-again.SQL.py _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
