Changeset: d89a833ad93c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d89a833ad93c Added Files: sql/test/leaks/Tests/check1.reqtests sql/test/leaks/Tests/check1.sql sql/test/leaks/Tests/check2.reqtests sql/test/leaks/Tests/check3.reqtests sql/test/leaks/Tests/check4.reqtests sql/test/leaks/Tests/check5.reqtests sql/test/leaks/Tests/drop3.reqtests sql/test/leaks/Tests/initialize.sql sql/test/leaks/Tests/initialize.stable.err sql/test/leaks/Tests/initialize.stable.out sql/test/leaks/Tests/select1.reqtests sql/test/leaks/Tests/select2.reqtests sql/test/leaks/Tests/temp1.reqtests sql/test/leaks/Tests/temp2.reqtests sql/test/leaks/Tests/temp3.reqtests Removed Files: sql/test/leaks/Tests/check0.sql sql/test/leaks/Tests/check0.stable.err sql/test/leaks/Tests/check0.stable.out sql/test/leaks/Tests/check0.stable.out.int128 sql/test/leaks/Tests/check1.sql.src Modified Files: sql/test/leaks/Tests/All sql/test/leaks/Tests/check1.stable.out sql/test/leaks/Tests/check2.sql.src sql/test/leaks/Tests/check3.sql.src sql/test/leaks/Tests/check4.sql.src sql/test/leaks/Tests/check5.sql.src Branch: Dec2016 Log Message:
sql/test/leaks/check0 was too volatile. Replaced the test by a simple initialization because the old check0 gave different results depending on whether or not the log manager had run. diffs (truncated from 500 to 300 lines): diff --git a/sql/test/leaks/Tests/All b/sql/test/leaks/Tests/All --- a/sql/test/leaks/Tests/All +++ b/sql/test/leaks/Tests/All @@ -1,4 +1,4 @@ -HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?check0 +initialize HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?check1 HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?temp1 HAVE_GEOM&HAVE_GSL&HAVE_LIDAR&HAVE_SHP&HAVE_NETCDF&HAVE_SAMTOOLS?check2 diff --git a/sql/test/leaks/Tests/check0.stable.err b/sql/test/leaks/Tests/check0.stable.err deleted file mode 100644 --- a/sql/test/leaks/Tests/check0.stable.err +++ /dev/null @@ -1,35 +0,0 @@ -stderr of test 'check0` in directory 'sql/test/leaks` itself: - - -# 16:21:15 > -# 16:21:15 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30577" "--set" "mapi_usock=/var/tmp/mtest-27819/.s.monetdb.30577" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_leaks" "--set" "mal_listing=0" -# 16:21:15 > - -# builtin opt gdk_dbpath = /ufs/sjoerd/Monet-candidate/var/monetdb5/dbfarm/demo -# builtin opt gdk_debug = 0 -# builtin opt gdk_vmtrim = yes -# 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 = 30577 -# cmdline opt mapi_usock = /var/tmp/mtest-27819/.s.monetdb.30577 -# cmdline opt monet_prompt = -# cmdline opt mal_listing = 2 -# cmdline opt gdk_dbpath = /ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_leaks -# cmdline opt mal_listing = 0 - -# 16:21:15 > -# 16:21:15 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-27819" "--port=30577" -# 16:21:15 > - - -# 16:21:16 > -# 16:21:16 > "Done." -# 16:21:16 > - diff --git a/sql/test/leaks/Tests/check0.stable.out b/sql/test/leaks/Tests/check0.stable.out deleted file mode 100644 --- a/sql/test/leaks/Tests/check0.stable.out +++ /dev/null @@ -1,94 +0,0 @@ -stdout of test 'check0` in directory 'sql/test/leaks` itself: - - -# 16:21:15 > -# 16:21:15 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30577" "--set" "mapi_usock=/var/tmp/mtest-27819/.s.monetdb.30577" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_leaks" "--set" "mal_listing=0" -# 16:21:15 > - -# MonetDB 5 server v11.17.0 (hg id: d91089635868) -# This is an unreleased version -# Serving database 'mTests_sql_test_leaks', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Found 15.591 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:30577/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-27819/.s.monetdb.30577 -# MonetDB/GIS module loaded -# MonetDB/JAQL module loaded -# MonetDB/SQL 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_compress.sql -# loading sql script: 18_dictionary.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: 40_geom.sql -# loading sql script: 40_json.sql -# loading sql script: 41_md5sum.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: 99_system.sql - -# 16:21:15 > -# 16:21:15 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-27819" "--port=30577" -# 16:21:15 > - -#set optimizer='minimal_pipe'; -#select htype, ttype, count from bbp() as bbp -#where kind like 'pers%' -#order by ttype, count; -% .bbp, .bbp # table_name -% ttype, count # name -% clob, bigint # type -% 3, 3 # length -[ "int", 0 ] -[ "int", 0 ] -[ "int", 1 ] -[ "int", 1 ] -[ "int", 256 ] -[ "lng", 1 ] -[ "oid", 0 ] -[ "oid", 0 ] -[ "oid", 0 ] -[ "str", 1 ] -[ "str", 1 ] -[ "str", 1 ] -[ "str", 256 ] -#select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; -% .L1, .L3 # table_name -% L1, L2 # name -% char, bigint # type -% 9, 3 # length -[ "transient", 551 ] -#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; -% .L1, .L3 # table_name -% L1, L2 # name -% char, bigint # type -% 10, 2 # length -[ "persistent", 13 ] - -# 16:21:16 > -# 16:21:16 > "Done." -# 16:21:16 > - diff --git a/sql/test/leaks/Tests/check0.stable.out.int128 b/sql/test/leaks/Tests/check0.stable.out.int128 deleted file mode 100644 --- a/sql/test/leaks/Tests/check0.stable.out.int128 +++ /dev/null @@ -1,94 +0,0 @@ -stdout of test 'check0` in directory 'sql/test/leaks` itself: - - -# 16:21:15 > -# 16:21:15 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=30577" "--set" "mapi_usock=/var/tmp/mtest-27819/.s.monetdb.30577" "--set" "monet_prompt=" "--forcemito" "--set" "mal_listing=2" "--dbpath=/ufs/sjoerd/Monet-candidate/var/MonetDB/mTests_sql_test_leaks" "--set" "mal_listing=0" -# 16:21:15 > - -# MonetDB 5 server v11.17.0 (hg id: d91089635868) -# This is an unreleased version -# Serving database 'mTests_sql_test_leaks', using 8 threads -# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked -# Found 15.591 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:30577/ -# Listening for UNIX domain connection requests on mapi:monetdb:///var/tmp/mtest-27819/.s.monetdb.30577 -# MonetDB/GIS module loaded -# MonetDB/JAQL module loaded -# MonetDB/SQL 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_compress.sql -# loading sql script: 18_dictionary.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: 40_geom.sql -# loading sql script: 40_json.sql -# loading sql script: 41_md5sum.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: 99_system.sql - -# 16:21:15 > -# 16:21:15 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-27819" "--port=30577" -# 16:21:15 > - -#set optimizer='minimal_pipe'; -#select htype, ttype, count from bbp() as bbp -#where kind like 'pers%' -#order by ttype, count; -% .bbp, .bbp # table_name -% ttype, count # name -% clob, bigint # type -% 3, 3 # length -[ "int", 0 ] -[ "int", 0 ] -[ "int", 1 ] -[ "int", 1 ] -[ "int", 256 ] -[ "lng", 1 ] -[ "oid", 0 ] -[ "oid", 0 ] -[ "oid", 0 ] -[ "str", 1 ] -[ "str", 1 ] -[ "str", 1 ] -[ "str", 256 ] -#select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; -% .L2, .L6 # table_name -% L2, L5 # name -% char, bigint # type -% 9, 3 # length -[ "transient", 552 ] -#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; -% .L2, .L6 # table_name -% L2, L5 # name -% char, bigint # type -% 10, 2 # length -[ "persistent", 13 ] - -# 16:21:16 > -# 16:21:16 > "Done." -# 16:21:16 > - diff --git a/sql/test/leaks/Tests/check1.reqtests b/sql/test/leaks/Tests/check1.reqtests new file mode 100644 --- /dev/null +++ b/sql/test/leaks/Tests/check1.reqtests @@ -0,0 +1,1 @@ +initialize diff --git a/sql/test/leaks/Tests/check0.sql b/sql/test/leaks/Tests/check1.sql rename from sql/test/leaks/Tests/check0.sql rename to sql/test/leaks/Tests/check1.sql diff --git a/sql/test/leaks/Tests/check1.sql.src b/sql/test/leaks/Tests/check1.sql.src deleted file mode 100644 --- a/sql/test/leaks/Tests/check1.sql.src +++ /dev/null @@ -1,1 +0,0 @@ -$RELSRCDIR/check0.sql diff --git a/sql/test/leaks/Tests/check1.stable.out b/sql/test/leaks/Tests/check1.stable.out --- a/sql/test/leaks/Tests/check1.stable.out +++ b/sql/test/leaks/Tests/check1.stable.out @@ -300,14 +300,14 @@ Ready. [ "timestamp", 0 ] [ "timestamp", 0 ] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; -% .L1, .L3 # table_name -% L1, L2 # name +% .L2, .L6 # table_name +% L2, L5 # name % char, bigint # type % 9, 3 # length -[ "transient", 164 ] +[ "transient", 160 ] #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; -% .L1, .L3 # table_name -% L1, L2 # name +% .L2, .L6 # table_name +% L2, L5 # name % char, bigint # type % 10, 3 # length [ "persistent", 266 ] diff --git a/sql/test/leaks/Tests/check2.reqtests b/sql/test/leaks/Tests/check2.reqtests new file mode 100644 --- /dev/null +++ b/sql/test/leaks/Tests/check2.reqtests @@ -0,0 +1,1 @@ +temp1 diff --git a/sql/test/leaks/Tests/check2.sql.src b/sql/test/leaks/Tests/check2.sql.src --- a/sql/test/leaks/Tests/check2.sql.src +++ b/sql/test/leaks/Tests/check2.sql.src @@ -1,1 +1,1 @@ -$RELSRCDIR/check0.sql +$RELSRCDIR/check1.sql diff --git a/sql/test/leaks/Tests/check3.reqtests b/sql/test/leaks/Tests/check3.reqtests new file mode 100644 --- /dev/null _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
