Changeset: 268123a85275 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=268123a85275
Added Files:
sql/test/testdb-upgrade-chain-hge/Tests/All
sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
sql/test/testdb-upgrade-chain-hge/Tests/dump.reqtests
sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.err
sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/dump.timeout
sql/test/testdb-upgrade-chain-hge/Tests/package.py
sql/test/testdb-upgrade-chain-hge/Tests/package.reqtests
sql/test/testdb-upgrade-chain-hge/Tests/package.stable.err
sql/test/testdb-upgrade-chain-hge/Tests/package.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/unpackage.py
sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.err
sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.reqtests
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.err
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-hge/Tests/All
sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
sql/test/testdb-upgrade-hge/Tests/dump.reqtests
sql/test/testdb-upgrade-hge/Tests/dump.stable.err
sql/test/testdb-upgrade-hge/Tests/dump.stable.out
sql/test/testdb-upgrade-hge/Tests/dump.timeout
sql/test/testdb-upgrade-hge/Tests/unpackage.py
sql/test/testdb-upgrade-hge/Tests/unpackage.stable.err
sql/test/testdb-upgrade-hge/Tests/unpackage.stable.out
sql/test/testdb-upgrade-hge/Tests/upgrade.SQL.py
sql/test/testdb-upgrade-hge/Tests/upgrade.reqtests
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.err
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb/Tests/testdb-package-hge.py
sql/test/testdb/Tests/testdb-package-hge.stable.err
sql/test/testdb/Tests/testdb-package-hge.stable.out
Modified Files:
sql/test/testdb-upgrade-chain/Tests/All
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb/Tests/All
Branch: Jul2015
Log Message:
Fixed upgrade tests so that we can run with and without 128 bit ints.
diffs (truncated from 204631 to 300 lines):
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/All
b/sql/test/testdb-upgrade-chain-hge/Tests/All
new file mode 100644
--- /dev/null
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/All
@@ -0,0 +1,4 @@
+HAVE_HGE&HAVE_GEOM&PREVCHAINREL?unpackage
+HAVE_HGE&HAVE_GEOM&PREVCHAINREL?upgrade
+HAVE_HGE&HAVE_GEOM&PREVCHAINREL&RELEASERUN?package
+HAVE_HGE&HAVE_GEOM&PREVCHAINREL?dump
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
b/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
@@ -0,0 +1,10 @@
+import sys
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
+
+p = process.client('sqldump', stdout = process.PIPE, stderr = process.PIPE)
+out, err = p.communicate()
+sys.stdout.write(out)
+sys.stderr.write(err)
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.reqtests
b/sql/test/testdb-upgrade-chain-hge/Tests/dump.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/dump.reqtests
@@ -0,0 +1,1 @@
+upgrade
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.err
b/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.err
@@ -0,0 +1,37 @@
+stderr of test 'dump` in directory 'sql/test/testdb-upgrade-chain-hge` itself:
+
+
+# 15:45:59 >
+# 15:45:59 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34328" "--set"
"mapi_usock=/var/tmp/mtest-31831/.s.monetdb.34328" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_testdb-upgrade-chain-hge"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 15:45:59 >
+
+# builtin opt gdk_dbpath =
/ufs/sjoerd/Monet-candidate/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 = 34328
+# cmdline opt mapi_usock = /var/tmp/mtest-31831/.s.monetdb.34328
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_testdb-upgrade-chain-hge
+# cmdline opt mal_listing = 0
+# cmdline opt embedded_r = yes
+# cmdline opt gdk_debug = 536870922
+
+# 15:45:59 >
+# 15:45:59 > "/usr/bin/python2" "dump.SQL.py" "dump"
+# 15:45:59 >
+
+
+# 15:46:00 >
+# 15:46:00 > "Done."
+# 15:46:00 >
+
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
b/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
@@ -0,0 +1,101324 @@
+stdout of test 'dump` in directory 'sql/test/testdb-upgrade-chain-hge` itself:
+
+
+# 15:45:59 >
+# 15:45:59 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=34328" "--set"
"mapi_usock=/var/tmp/mtest-31831/.s.monetdb.34328" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_testdb-upgrade-chain-hge"
"--set" "mal_listing=0" "--set" "embedded_r=yes"
+# 15:45:59 >
+
+# MonetDB 5 server v11.21.6 (hg id: adf405e7edb0+)
+# This is an unreleased version
+# Serving database 'mTests_sql_test_testdb-upgrade-chain-hge', 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-2015 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://madrid.ins.cwi.nl:34328/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-31831/.s.monetdb.34328
+# MonetDB/GIS module loaded
+# Start processing logs sql/sql_logs version 52200
+# Start reading the write-ahead log 'sql_logs/sql/log.3'
+# Finished reading the write-ahead log 'sql_logs/sql/log.3'
+# Finished processing logs sql/sql_logs
+# 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: 17_temporal.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: 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_gsl.sql
+# loading sql script: 51_sys_schema_extension.sql
+# loading sql script: 72_fits.sql
+# loading sql script: 74_netcdf.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
+#WARNING To speedup sql.password a bulk operator implementation is needed
+# X_178:bat[:oid,:str]{horigin=1} :=
mal.multiplex("sql":str,"password":str,X_170:bat[:oid,:str]);
+#WARNING To speedup sql.password a bulk operator implementation is needed
+# X_179:bat[:oid,:str]{horigin=2} :=
mal.multiplex("sql":str,"password":str,X_171:bat[:oid,:str]);
+#WARNING To speedup sql.password a bulk operator implementation is needed
+# X_180:bat[:oid,:str]{horigin=3} :=
mal.multiplex("sql":str,"password":str,X_172:bat[:oid,:str]);
+#WARNING To speedup sql.password a bulk operator implementation is needed
+# X_181:bat[:oid,:str]{horigin=4} :=
mal.multiplex("sql":str,"password":str,X_173:bat[:oid,:str]);
+#WARNING To speedup sql.get_value a bulk operator implementation is needed
+# X_240:bat[:oid,:lng]{horigin=1} :=
mal.multiplex("sql":str,"get_value":str,X_236:bat[:oid,:str],X_228:bat[:oid,:str]);
+#WARNING To speedup sql.get_value a bulk operator implementation is needed
+# X_241:bat[:oid,:lng]{horigin=2} :=
mal.multiplex("sql":str,"get_value":str,X_237:bat[:oid,:str],X_229:bat[:oid,:str]);
+#WARNING To speedup sql.get_value a bulk operator implementation is needed
+# X_242:bat[:oid,:lng]{horigin=3} :=
mal.multiplex("sql":str,"get_value":str,X_238:bat[:oid,:str],X_230:bat[:oid,:str]);
+#WARNING To speedup sql.get_value a bulk operator implementation is needed
+# X_243:bat[:oid,:lng]{horigin=4} :=
mal.multiplex("sql":str,"get_value":str,X_239:bat[:oid,:str],X_231:bat[:oid,:str]);
+
+# 15:45:59 >
+# 15:45:59 > "/usr/bin/python2" "dump.SQL.py" "dump"
+# 15:45:59 >
+
+START TRANSACTION;
+CREATE USER "testuser" WITH ENCRYPTED PASSWORD
'e9e633097ab9ceb3e48ec3f70ee2beba41d05d5420efee5da85f97d97005727587fda33ef4ff2322088f4c79e8133cc9cd9f3512f4d3a303cbdb5bc585415a00'
NAME 'Test User' SCHEMA "sys";
+CREATE SCHEMA "testschema" AUTHORIZATION "testuser";
+ALTER USER "testuser" SET SCHEMA "testschema";
+CREATE SEQUENCE "testschema"."selfref_seq" AS INTEGER;
+CREATE SEQUENCE "testschema"."test_seq" AS INTEGER;
+SET SCHEMA "testschema";
+CREATE TABLE "testschema"."smallstring" (
+ "string1" VARCHAR(5),
+ "string2" CHAR(5),
+ "string3" CHARACTER LARGE OBJECT
+);
+COPY 66 RECORDS INTO "testschema"."smallstring" FROM stdin USING DELIMITERS
'\t','\n','"';
+"a0" "b0" "c0"
+"a1" "b1" "c1"
+"a2" "b2" "c2"
+"a3" "b3" "c3"
+"a4" "b4" "c4"
+"a5" "b5" "c5"
+"a6" "b6" "c6"
+"a7" "b7" "c7"
+"a8" "b8" "c8"
+"a9" "b9" "c9"
+"a10" "b10" "c10"
+"a0" "b0" "c0"
+"a1" "b1" "c1"
+"a2" "b2" "c2"
+"a3" "b3" "c3"
+"a4" "b4" "c4"
+"a5" "b5" "c5"
+"a6" "b6" "c6"
+"a7" "b7" "c7"
+"a8" "b8" "c8"
+"a9" "b9" "c9"
+"a10" "b10" "c10"
+"a0" "b0" "c0"
+"a1" "b1" "c1"
+"a2" "b2" "c2"
+"a3" "b3" "c3"
+"a4" "b4" "c4"
+"a5" "b5" "c5"
+"a6" "b6" "c6"
+"a7" "b7" "c7"
+"a8" "b8" "c8"
+"a9" "b9" "c9"
+"a10" "b10" "c10"
+"a0" "b0" "c0"
+"a1" "b1" "c1"
+"a2" "b2" "c2"
+"a3" "b3" "c3"
+"a4" "b4" "c4"
+"a5" "b5" "c5"
+"a6" "b6" "c6"
+"a7" "b7" "c7"
+"a8" "b8" "c8"
+"a9" "b9" "c9"
+"a10" "b10" "c10"
+"a0" "b0" "c0"
+"a1" "b1" "c1"
+"a2" "b2" "c2"
+"a3" "b3" "c3"
+"a4" "b4" "c4"
+"a5" "b5" "c5"
+"a6" "b6" "c6"
+"a7" "b7" "c7"
+"a8" "b8" "c8"
+"a9" "b9" "c9"
+"a10" "b10" "c10"
+"a0" "b0" "c0"
+"a1" "b1" "c1"
+"a2" "b2" "c2"
+"a3" "b3" "c3"
+"a4" "b4" "c4"
+"a5" "b5" "c5"
+"a6" "b6" "c6"
+"a7" "b7" "c7"
+"a8" "b8" "c8"
+"a9" "b9" "c9"
+"a10" "b10" "c10"
+CREATE TABLE "testschema"."mediumstring" (
+ "string1" VARCHAR(20),
+ "string2" CHAR(20),
+ "string3" CHARACTER LARGE OBJECT
+);
+COPY 1001 RECORDS INTO "testschema"."mediumstring" FROM stdin USING DELIMITERS
'\t','\n','"';
+"a222833216428103" "b222833216428103" "c222833216428103"
+"a22462275706708" "b22462275706708" "c22462275706708"
+"a207961069219280" "b207961069219280" "c207961069219280"
+"a1430667456508" "b1430667456508" "c1430667456508"
+"a143912596726204" "b143912596726204" "c143912596726204"
+"a35882931026608" "b35882931026608" "c35882931026608"
+"a12630311241498" "b12630311241498" "c12630311241498"
+"a1147528919691" "b1147528919691" "c1147528919691"
+"a2463126399106" "b2463126399106" "c2463126399106"
+"a26499139713669" "b26499139713669" "c26499139713669"
+"a1248634873065" "b1248634873065" "c1248634873065"
+"a78212594930635" "b78212594930635" "c78212594930635"
+"a14529139788559" "b14529139788559" "c14529139788559"
+"a10412828415305" "b10412828415305" "c10412828415305"
+"a754999078504" "b754999078504" "c754999078504"
+"a985134955047" "b985134955047" "c985134955047"
+"a27593261253403" "b27593261253403" "c27593261253403"
+"a29091483332322" "b29091483332322" "c29091483332322"
+"a29783294642194" "b29783294642194" "c29783294642194"
+"a61212319516165" "b61212319516165" "c61212319516165"
+"a9790291319652" "b9790291319652" "c9790291319652"
+"a128551073512834" "b128551073512834" "c128551073512834"
+"a107222526426812" "b107222526426812" "c107222526426812"
+"a192822630622328" "b192822630622328" "c192822630622328"
+"a1819108732235" "b1819108732235" "c1819108732235"
+"a10323207312962" "b10323207312962" "c10323207312962"
+"a15370296666320" "b15370296666320" "c15370296666320"
+"a187742599011153" "b187742599011153" "c187742599011153"
+"a18328230057849" "b18328230057849" "c18328230057849"
+"a205222912631044" "b205222912631044" "c205222912631044"
+"a392061491190" "b392061491190" "c392061491190"
+"a235721900411925" "b235721900411925" "c235721900411925"
+"a3638297274421" "b3638297274421" "c3638297274421"
+"a304501624130727" "b304501624130727" "c304501624130727"
+"a200101806031815" "b200101806031815" "c200101806031815"
+"a19477283831120" "b19477283831120" "c19477283831120"
+"a324401098630786" "b324401098630786" "c324401098630786"
+"a59922976024008" "b59922976024008" "c59922976024008"
+"a171451532014245" "b171451532014245" "c171451532014245"
+"a24994307510604" "b24994307510604" "c24994307510604"
+"a23270699516753" "b23270699516753" "c23270699516753"
+"a24460305672989" "b24460305672989" "c24460305672989"
+"a3617143832716" "b3617143832716" "c3617143832716"
+"a80393188816189" "b80393188816189" "c80393188816189"
+"a5998191311481" "b5998191311481" "c5998191311481"
+"a5045584029865" "b5045584029865" "c5045584029865"
+"a616555128083" "b616555128083" "c616555128083"
+"a4184115045075" "b4184115045075" "c4184115045075"
+"a281922864920395" "b281922864920395" "c281922864920395"
+"a96702087523470" "b96702087523470" "c96702087523470"
+"a202741137830465" "b202741137830465" "c202741137830465"
+"a4259307028265" "b4259307028265" "c4259307028265"
+"a7248668829703" "b7248668829703" "c7248668829703"
+"a71971472728823" "b71971472728823" "c71971472728823"
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
