Changeset: 3d41bfffe156 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3d41bfffe156 Added Files: sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py.src sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py sql/test/testdb-upgrade-chain/Tests/dump.SQL.py.src sql/test/testdb-upgrade-chain/Tests/upgrade.py sql/test/testdb-upgrade-hge/Tests/dump.SQL.py.src sql/test/testdb-upgrade-hge/Tests/dump.stable.out sql/test/testdb-upgrade-hge/Tests/upgrade.py sql/test/testdb-upgrade/Tests/dump.SQL.py.src sql/test/testdb-upgrade/Tests/upgrade.py Removed Files: sql/test/testdb-upgrade-chain-hge/Tests/dump.sql sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out.int128 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.int128 sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py.src sql/test/testdb-upgrade-chain-hge/Tests/upgrade.reqtests sql/test/testdb-upgrade-chain/Tests/dump.sql sql/test/testdb-upgrade-chain/Tests/unpackage.py sql/test/testdb-upgrade-chain/Tests/unpackage.stable.err sql/test/testdb-upgrade-chain/Tests/unpackage.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.SQL.py.src sql/test/testdb-upgrade-chain/Tests/upgrade.reqtests sql/test/testdb-upgrade-hge/Tests/dump.sql sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128 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.int128 sql/test/testdb-upgrade-hge/Tests/upgrade.SQL.py.src sql/test/testdb-upgrade-hge/Tests/upgrade.reqtests sql/test/testdb-upgrade/Tests/dump.sql sql/test/testdb-upgrade/Tests/unpackage.py sql/test/testdb-upgrade/Tests/unpackage.stable.err sql/test/testdb-upgrade/Tests/unpackage.stable.out sql/test/testdb-upgrade/Tests/upgrade.SQL.py sql/test/testdb-upgrade/Tests/upgrade.reqtests Modified Files: sql/test/testdb-upgrade-chain-hge/Tests/All sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/All sql/test/testdb-upgrade-chain/Tests/dump.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/All sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade/Tests/All sql/test/testdb-upgrade/Tests/dump.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 Branch: mtest Log Message:
Converted sql/test/testdb-upgrade* directories. diffs (truncated from 1371 to 300 lines): diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/All b/sql/test/testdb-upgrade-chain-hge/Tests/All --- a/sql/test/testdb-upgrade-chain-hge/Tests/All +++ b/sql/test/testdb-upgrade-chain-hge/Tests/All @@ -1,4 +1,3 @@ -HAVE_HGE&HAVE_GEOM&PREVHGECHAINREL?unpackage HAVE_HGE&HAVE_GEOM&PREVHGECHAINREL?upgrade HAVE_HGE&HAVE_GEOM&PREVHGECHAINREL&RELEASERUN?package HAVE_HGE&HAVE_GEOM&PREVHGECHAINREL?dump diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py.src b/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py.src new file mode 100644 --- /dev/null +++ b/sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py.src @@ -0,0 +1,1 @@ +$RELSRCDIR/../../testdb/Tests/dump.SQL.py diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.sql b/sql/test/testdb-upgrade-chain-hge/Tests/dump.sql deleted file mode 100644 --- a/sql/test/testdb-upgrade-chain-hge/Tests/dump.sql +++ /dev/null @@ -1,2 +0,0 @@ -SET TIME ZONE INTERVAL '+00:00' HOUR TO MINUTE; -\D diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out.int128 b/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out rename from sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out.int128 rename to sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out --- a/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out.int128 +++ b/sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out @@ -1,70 +1,3 @@ -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 - -# 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 - -# 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"; @@ -101300,8 +101233,3 @@ ALTER SEQUENCE "testschema"."selfref_seq ALTER SEQUENCE "testschema"."test_seq" RESTART WITH 8 INCREMENT BY 3 MINVALUE 5 MAXVALUE 10 CYCLE; SET SCHEMA "sys"; COMMIT; - -# 15:46:00 > -# 15:46:00 > "Done." -# 15:46:00 > - diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/unpackage.py b/sql/test/testdb-upgrade-chain-hge/Tests/unpackage.py deleted file mode 100644 --- a/sql/test/testdb-upgrade-chain-hge/Tests/unpackage.py +++ /dev/null @@ -1,11 +0,0 @@ -import os, sys, zipfile - -dbfarm = os.environ['GDK_DBFARM'] -db = os.path.join(dbfarm, os.environ['TSTDB']) -archive = os.path.join(dbfarm, 'prevhgechainrel.zip') -if not os.path.exists(archive): - sys.exit(1) - -z = zipfile.ZipFile(archive) -z.extractall(db) -z.close() diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.err b/sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.err deleted file mode 100644 --- a/sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.err +++ /dev/null @@ -1,12 +0,0 @@ -stderr of test 'unpackage` in directory 'sql/test/testdb-upgrade-chain-hge` itself: - - -# 15:45:46 > -# 15:45:46 > "/usr/bin/python2" "unpackage.py" "unpackage" -# 15:45:46 > - - -# 15:45:46 > -# 15:45:46 > "Done." -# 15:45:46 > - diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.out.int128 b/sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.out.int128 deleted file mode 100644 --- a/sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.out.int128 +++ /dev/null @@ -1,12 +0,0 @@ -stdout of test 'unpackage` in directory 'sql/test/testdb-upgrade-chain-hge` itself: - - -# 15:45:46 > -# 15:45:46 > "/usr/bin/python2" "unpackage.py" "unpackage" -# 15:45:46 > - - -# 15:45:46 > -# 15:45:46 > "Done." -# 15:45:46 > - diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py.src b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py.src deleted file mode 100644 --- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py.src +++ /dev/null @@ -1,1 +0,0 @@ -$RELSRCDIR/../../testdb-upgrade/Tests/upgrade.SQL.py diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py new file mode 100644 --- /dev/null +++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.py @@ -0,0 +1,76 @@ +#!/usr/bin/env python3 + +# When called in the test environment, this is called with exactly one +# argument: the name of the test. +# When called without argument, we dump the server output so that it +# can be saved to be tested against. +try: + from MonetDBtesting import process +except ImportError: + import process + +import sys +import os +import zipfile + +# find zipped database +dbfarm = os.environ['GDK_DBFARM'] +db = os.path.join(dbfarm, os.environ['TSTDB']) +archive = os.path.join(dbfarm, 'prevhgechainrel.zip') +if not os.path.exists(archive): + print('file "{}" not found'.format(archive), file=sys.stderr) + sys.exit(1) + +# unpackage database +with zipfile.ZipFile(archive) as z: + z.extractall(path=db) + +# start server and dump database +with process.server(mapiport='0', + stdin=process.PIPE, + stdout=process.PIPE, + stderr=process.PIPE) as srv: + with process.client(lang='sql', + user='testuser', + passwd='testpassword', + stdin=process.PIPE, + stdout=process.PIPE, + stderr=process.PIPE, + server=srv) as clt: + cltout, clterr = clt.communicate('select count(*) from testschema.smallstring;\n') + srvout, srverr = srv.communicate() + +srvout = [line for line in srvout.splitlines(keepends=True) if not line.startswith('#')] + +# check server output (upgrade commands) and check dump (empty) +if len(sys.argv) == 2 and sys.argv[1] == 'upgrade': + bits = os.getenv('TST_BITS') + if bits: + bits = ['.' + bits, ''] + else: + bits = [''] + arch = os.uname()[4] + arch = ['.' + arch, ''] + hge = os.getenv('HAVE_HGE') + if hge: + hge = ['.int128', ''] + else: + hge = [''] + found = False + for b in bits: + for a in arch: + for h in hge: + f = 'upgrade.stable.out{}{}{}'.format(b, a, h) + found = os.path.exists(f) + if found: + break + if found: + break + if found: + break + stable = open(f).readlines() + import difflib + for line in difflib.unified_diff(stable, srvout, fromfile='test', tofile=f): + sys.stderr.write(line) +else: + sys.stdout.writelines(srvout) diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.reqtests b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.reqtests deleted file mode 100644 --- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.reqtests +++ /dev/null @@ -1,1 +0,0 @@ -unpackage diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 --- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 +++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 @@ -1,21 +1,3 @@ -stdout of test 'upgrade` in directory 'sql/test/testdb-upgrade-chain-hge` itself: - - -# 15:45:52 > -# 15:45:52 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=37689" "--set" "mapi_usock=/var/tmp/mtest-31771/.s.monetdb.37689" "--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:52 > - -# 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:37689/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-31771/.s.monetdb.37689 -# MonetDB/GIS module loaded Running database upgrade commands: set schema "sys"; delete from sys.dependencies where id < 2000; @@ -4235,20 +4217,3 @@ ALTER TABLE sys.keywords SET READ ONLY; ALTER TABLE sys.table_types SET READ ONLY; set schema "sys"; -# MonetDB/SQL module loaded - -# 16:02:38 > -# 16:02:38 > "/bin/python" "upgrade.SQL.py" "upgrade" -# 16:02:38 > - -#select count(*) from testschema.smallstring; -% .%1 # table_name -% %1 # name -% bigint # type -% 2 # length -[ 66 ] - -# 15:45:53 > -# 15:45:53 > "Done." -# 15:45:53 > - diff --git a/sql/test/testdb-upgrade-chain/Tests/All b/sql/test/testdb-upgrade-chain/Tests/All --- a/sql/test/testdb-upgrade-chain/Tests/All +++ b/sql/test/testdb-upgrade-chain/Tests/All @@ -1,4 +1,3 @@ -HAVE_GEOM&PREVCHAINREL?unpackage _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
