Changeset: 98daefbced18 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=98daefbced18 Added Files: sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.sql.src sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out sql/test/leaks/Tests/check0_nogeom.sql.src sql/test/leaks/Tests/check0_nogeom.stable.err sql/test/leaks/Tests/check0_nogeom.stable.out sql/test/leaks/Tests/check1_nogeom.sql.src sql/test/leaks/Tests/check1_nogeom.stable.err sql/test/leaks/Tests/check1_nogeom.stable.out sql/test/leaks/Tests/check2_nogeom.sql.src sql/test/leaks/Tests/check2_nogeom.stable.err sql/test/leaks/Tests/check2_nogeom.stable.out sql/test/leaks/Tests/check3_nogeom.sql.src sql/test/leaks/Tests/check3_nogeom.stable.err sql/test/leaks/Tests/check3_nogeom.stable.out sql/test/leaks/Tests/check4_nogeom.sql.src sql/test/leaks/Tests/check4_nogeom.stable.err sql/test/leaks/Tests/check4_nogeom.stable.out sql/test/leaks/Tests/check5_nogeom.sql.src sql/test/leaks/Tests/check5_nogeom.stable.err sql/test/leaks/Tests/check5_nogeom.stable.out sql/test/leaks/Tests/drop3_nogeom.sql.src sql/test/leaks/Tests/drop3_nogeom.stable.err sql/test/leaks/Tests/drop3_nogeom.stable.out sql/test/leaks/Tests/select1_nogeom.sql.src sql/test/leaks/Tests/select1_nogeom.stable.err sql/test/leaks/Tests/select1_nogeom.stable.out sql/test/leaks/Tests/select2_nogeom.sql.src sql/test/leaks/Tests/select2_nogeom.stable.err sql/test/leaks/Tests/select2_nogeom.stable.out sql/test/leaks/Tests/temp1_nogeom.sql.src sql/test/leaks/Tests/temp1_nogeom.stable.err sql/test/leaks/Tests/temp1_nogeom.stable.out sql/test/leaks/Tests/temp2_nogeom.sql.src sql/test/leaks/Tests/temp2_nogeom.stable.err sql/test/leaks/Tests/temp2_nogeom.stable.out sql/test/leaks/Tests/temp3_nogeom.sql.src sql/test/leaks/Tests/temp3_nogeom.stable.err sql/test/leaks/Tests/temp3_nogeom.stable.out sql/test/mapi/Tests/php_monetdb_nogeom.SQL.bat sql/test/mapi/Tests/php_monetdb_nogeom.SQL.sh sql/test/mapi/Tests/php_monetdb_nogeom.stable.err sql/test/mapi/Tests/php_monetdb_nogeom.stable.out Modified Files: sql/test/BugTracker-2012/Tests/All sql/test/leaks/Tests/All sql/test/mapi/Tests/All sql/test/testdb-upgrade-chain/Tests/All sql/test/testdb-upgrade/Tests/All Branch: Jul2012 Log Message:
Fix tests for when geom is not available. diffs (truncated from 2074 to 300 lines): diff --git a/sql/test/BugTracker-2012/Tests/All b/sql/test/BugTracker-2012/Tests/All --- a/sql/test/BugTracker-2012/Tests/All +++ b/sql/test/BugTracker-2012/Tests/All @@ -40,7 +40,8 @@ bug_large-insert-Bug.2960 any_null.Bug-2594 float-mod.Bug-3086 aggregate_vs_positional_column_crash.Bug-3085 -predicate_select.Bug-3090 +HAVE_GEOM?predicate_select.Bug-3090 +!HAVE_GEOM?predicate_select.Bug-3090_nogeom hash_join_crash.Bug-3089 row-number-nyi.Bug-3087 insert_serial_with_unique_key.Bug-3091 diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.sql.src b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.sql.src new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.sql.src @@ -0,0 +1,1 @@ +$RELSRCDIR/predicate_select.Bug-3090.sql diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err @@ -0,0 +1,40 @@ +stderr of test 'predicate_select.Bug-3090_nogeom` in directory 'test/BugTracker-2012` itself: + + +# 18:53:13 > +# 18:53:13 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set" "mapi_open=true" "--set" "mapi_port=32323" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012" "--set" "mal_listing=0" +# 18:53:13 > + +# builtin opt gdk_dbname = demo +# builtin opt gdk_dbfarm = /home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm +# builtin opt gdk_debug = 0 +# builtin opt gdk_alloc_map = no +# 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 gdk_dbfarm = /home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB +# cmdline opt mapi_open = true +# cmdline opt mapi_port = 32323 +# cmdline opt monet_prompt = +# cmdline opt mal_listing = 2 +# cmdline opt gdk_dbname = mTests_test_BugTracker-2012 +# cmdline opt mal_listing = 0 + +# 18:53:13 > +# 18:53:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels" "--port=32323" +# 18:53:13 > + +MAPI = monetdb@sofia:39129 +QUERY = select * from tables where name; +ERROR = !conversion from string to type bit failed. + +# 18:53:13 > +# 18:53:13 > "Done." +# 18:53:13 > + diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out @@ -0,0 +1,66 @@ +stdout of test 'predicate_select.Bug-3090_nogeom` in directory 'test/BugTracker-2012` itself: + + +# 18:53:13 > +# 18:53:13 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "gdk_dbfarm=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB" "--set" "mapi_open=true" "--set" "mapi_port=32323" "--set" "monet_prompt=" "--trace" "--forcemito" "--set" "mal_listing=2" "--dbname=mTests_test_BugTracker-2012" "--set" "mal_listing=0" +# 18:53:13 > + +# MonetDB 5 server v11.9.2 +# This is an unreleased version +# Serving database 'mTests_test_BugTracker-2012', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 3.778 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved +# Visit http://www.monetdb.org/ for further information +# Listening for connection requests on mapi:monetdb://niels.nesco.mine.nu:32323/ +# MonetDB/GIS module loaded +# MonetDB/SQL module loaded + +Ready. + +# 18:53:13 > +# 18:53:13 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels" "--port=32323" +# 18:53:13 > + +#select * from tables where 1; +% .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables, .tables # table_name +% id, name, schema_id, query, type, system, commit_action, readonly, temporary # name +% int, varchar, int, varchar, smallint, boolean, smallint, boolean, tinyint # type +% 4, 15, 4, 192, 1, 5, 1, 5, 1 # length +[ 2001, "schemas", 2000, NULL, 0, true, 0, false, 0 ] +[ 2006, "types", 2000, NULL, 0, true, 0, false, 0 ] +[ 2015, "functions", 2000, NULL, 0, true, 0, false, 0 ] +[ 2024, "args", 2000, NULL, 0, true, 0, false, 0 ] +[ 2032, "sequences", 2000, NULL, 0, true, 0, false, 0 ] +[ 2042, "dependencies", 2000, NULL, 0, true, 0, false, 0 ] +[ 2046, "connections", 2000, NULL, 0, true, 0, false, 0 ] +[ 2055, "_tables", 2000, NULL, 0, true, 0, false, 0 ] +[ 2064, "_columns", 2000, NULL, 0, true, 0, false, 0 ] +[ 2075, "keys", 2000, NULL, 0, true, 0, false, 0 ] +[ 2082, "idxs", 2000, NULL, 0, true, 0, false, 0 ] +[ 2087, "triggers", 2000, NULL, 0, true, 0, false, 0 ] +[ 2098, "objects", 2000, NULL, 0, true, 0, false, 0 ] +[ 2103, "_tables", 2102, NULL, 0, true, 2, false, 0 ] +[ 2112, "_columns", 2102, NULL, 0, true, 2, false, 0 ] +[ 2123, "keys", 2102, NULL, 0, true, 2, false, 0 ] +[ 2130, "idxs", 2102, NULL, 0, true, 2, false, 0 ] +[ 2135, "triggers", 2102, NULL, 0, true, 2, false, 0 ] +[ 2146, "objects", 2102, NULL, 0, true, 2, false, 0 ] +[ 4993, "tables", 2000, "SELECT * FROM (SELECT p.*, 0 AS \"temporary\" FROM \"sys\".\"_tables\" AS p UNION ALL SELECT t.*, 1 AS \"temporary\" FROM \"tmp\".\"_tables\" AS t) AS tables where tables.type < 2;", 1, true, 0, false, 0 ] +[ 5003, "columns", 2000, "SELECT * FROM (SELECT p.* FROM \"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM \"tmp\".\"_columns\" AS t) AS columns;", 1, true, 0, false, 0 ] +[ 5023, "db_user_info", 2000, NULL, 0, true, 0, false, 0 ] +[ 5031, "users", 2000, "SELECT u.\"name\" AS \"name\", ui.\"fullname\", ui.\"default_schema\" FROM db_users() AS u LEFT JOIN \"sys\".\"db_user_info\" AS ui ON u.\"name\" = ui.\"name\" ;", 1, true, 0, false, 0 ] +[ 5035, "user_role", 2000, NULL, 0, true, 0, false, 0 ] +[ 5038, "auths", 2000, NULL, 0, true, 0, false, 0 ] +[ 5042, "privileges", 2000, NULL, 0, true, 0, false, 0 ] +[ 5195, "queryhistory", 2000, NULL, 0, true, 0, false, 0 ] +[ 5209, "callhistory", 2000, NULL, 0, true, 0, false, 0 ] +[ 5226, "querylog", 2000, "create view querylog as\nselect qd.*, ql.ctime, ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock, ql.oublock from queryhistory qd, callhistory ql\nwhere qd.id = ql.id;", 1, true, 0, false, 0 ] +[ 5641, "systemfunctions", 2000, NULL, 0, true, 0, false, 0 ] +[ 5750, "r", 2000, NULL, 0, false, 0, false, 0 ] + +# 18:53:13 > +# 18:53:13 > "Done." +# 18:53:13 > + 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,12 +1,24 @@ -check0 -check1 -temp1 -check2 -temp2 -check3 -temp3 -drop3 -check4 -check5 -select1 -select2 +HAVE_GEOM?check0 +!HAVE_GEOM?check0_nogeom +HAVE_GEOM?check1 +!HAVE_GEOM?check1_nogeom +HAVE_GEOM?temp1 +!HAVE_GEOM?temp1_nogeom +HAVE_GEOM?check2 +!HAVE_GEOM?check2_nogeom +HAVE_GEOM?temp2 +!HAVE_GEOM?temp2_nogeom +HAVE_GEOM?check3 +!HAVE_GEOM?check3_nogeom +HAVE_GEOM?temp3 +!HAVE_GEOM?temp3_nogeom +HAVE_GEOM?drop3 +!HAVE_GEOM?drop3_nogeom +HAVE_GEOM?check4 +!HAVE_GEOM?check4_nogeom +HAVE_GEOM?check5 +!HAVE_GEOM?check5_nogeom +HAVE_GEOM?select1 +!HAVE_GEOM?select1_nogeom +HAVE_GEOM?select2 +!HAVE_GEOM?select2_nogeom diff --git a/sql/test/leaks/Tests/check0_nogeom.sql.src b/sql/test/leaks/Tests/check0_nogeom.sql.src new file mode 100644 --- /dev/null +++ b/sql/test/leaks/Tests/check0_nogeom.sql.src @@ -0,0 +1,1 @@ +$RELSRCDIR/check0.sql diff --git a/sql/test/leaks/Tests/check0_nogeom.stable.err b/sql/test/leaks/Tests/check0_nogeom.stable.err new file mode 100644 --- /dev/null +++ b/sql/test/leaks/Tests/check0_nogeom.stable.err @@ -0,0 +1,17 @@ +stderr of test 'check0_nogeom` in directory 'test/leaks` itself: + + +# 11:28:50 > +# 11:28:50 > Mtimeout -timeout 60 Mserver "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set "monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib64/MonetDB:/ufs/niels/scratch/rc/Linux-x86_64/lib64/MonetDB/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib64/MonetDB/bin" --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB/dbfarm" --set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB/sql_logs" --set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB/xquery_logs" --set mapi_port=33103 --set monet_prompt= --trace --dbname=mTests_src_test_leaks check0.prelude < check0.milM +# 11:28:50 > + + +# 22:06:14 > +# 22:06:14 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels" "--port=36318" +# 22:06:14 > + + +# 22:06:14 > +# 22:06:14 > "Done." +# 22:06:14 > + diff --git a/sql/test/leaks/Tests/check0_nogeom.stable.out b/sql/test/leaks/Tests/check0_nogeom.stable.out new file mode 100644 --- /dev/null +++ b/sql/test/leaks/Tests/check0_nogeom.stable.out @@ -0,0 +1,84 @@ +stdout of test 'check0_nogeom` in directory 'test/leaks` itself: + + +# 22:02:15 > +# 22:02:15 > mserver5 "--config=/ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=0 --set "monet_mod_path=/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/rc/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/sql_logs" --set mapi_open=true --set xrpc_open=true --set mapi_port=35700 --set xrpc_port=46587 --set monet_prompt= --trace "--dbname=mTests_src_test_leaks" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. +# 22:02:15 > + +# MonetDB server v5.8.0, based on kernel v1.26.0 +# Serving database 'mTests_src_test_leaks', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008- MonetDB B.V., all rights reserved +# Visit http://monetdb.cwi.nl/ for further information +# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:35700/ +# MonetDB/SQL module v2.26.0 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_history.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: 40_geom.sql +# loading sql script: 80_udf.sql +# loading sql script: 99_system.sql + +# 22:06:31 > +# 22:06:31 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=niels" "--port=33453" +# 22:06:31 > + +#select htype, ttype, count from bbp() as bbp +#where kind like 'pers%' +#order by htype, ttype, count; +% .bbp, .bbp, .bbp # table_name +% htype, ttype, count # name +% clob, clob, bigint # type +% 3, 3, 4 # length +[ "int", "int", 8 ] +[ "int", "lng", 2 ] +[ "int", "str", 142 ] +[ "oid", "int", 20 ] +[ "oid", "int", 20 ] +[ "oid", "int", 1109 ] +[ "oid", "int", 3061 ] +[ "oid", "int", 3061 ] +[ "oid", "int", 3061 ] +[ "oid", "int", 3061 ] +[ "oid", "int", 3061 ] +[ "oid", "lng", 20 ] +[ "oid", "str", 1 ] +[ "oid", "str", 1 ] +[ "oid", "str", 20 ] +[ "oid", "str", 3061 ] +[ "oid", "str", 3061 ] +#select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; +% .L1, .bbp # table_name +% L1, L2 # name +% char, wrd # type +% 9, 3 # length +[ "transient", 499 ] +#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; +% .L1, .bbp # table_name +% L1, L2 # name +% char, wrd # type +% 10, 2 # length +[ "persistent", 17 ] + +# 22:02:15 > +# 22:02:15 > Done. +# 22:02:15 > + diff --git a/sql/test/leaks/Tests/check1_nogeom.sql.src b/sql/test/leaks/Tests/check1_nogeom.sql.src new file mode 100644 --- /dev/null +++ b/sql/test/leaks/Tests/check1_nogeom.sql.src @@ -0,0 +1,1 @@ +$RELSRCDIR/check0.sql diff --git a/sql/test/leaks/Tests/check1_nogeom.stable.err b/sql/test/leaks/Tests/check1_nogeom.stable.err new file mode 100644 _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
