Changeset: ef219b40f948 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ef219b40f948 Added Files: sql/test/prepare/Tests/bind_with_cast.SF-1720934.SQL.py sql/test/prepare/Tests/bind_with_cast.SF-1720934.sql sql/test/prepare/Tests/bind_with_cast.SF-1720934.stable.err sql/test/prepare/Tests/bind_with_cast.SF-1720934.stable.out sql/test/prepare/Tests/decimal_prepare.SF-1655818.SQL.py sql/test/prepare/Tests/decimal_prepare.SF-1655818.sql sql/test/prepare/Tests/decimal_prepare.SF-1655818.stable.err sql/test/prepare/Tests/decimal_prepare.SF-1655818.stable.out sql/test/prepare/Tests/large_prepare.SF-1363729.SQL.py sql/test/prepare/Tests/large_prepare.SF-1363729.sql sql/test/prepare/Tests/large_prepare.SF-1363729.stable.err sql/test/prepare/Tests/large_prepare.SF-1363729.stable.out sql/test/prepare/Tests/large_prepare_2.SF-1363729.SQL.py sql/test/prepare/Tests/large_prepare_2.SF-1363729.sql sql/test/prepare/Tests/large_prepare_2.SF-1363729.stable.err sql/test/prepare/Tests/large_prepare_2.SF-1363729.stable.out sql/test/prepare/Tests/prepare_decimal_float.SF-1675795.SQL.py sql/test/prepare/Tests/prepare_decimal_float.SF-1675795.sql sql/test/prepare/Tests/prepare_decimal_float.SF-1675795.stable.err sql/test/prepare/Tests/prepare_decimal_float.SF-1675795.stable.out Removed Files: sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.sql sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.out sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.test sql/test/BugTracker/Tests/decimal_prepare.SF-1655818.sql sql/test/BugTracker/Tests/decimal_prepare.SF-1655818.stable.err sql/test/BugTracker/Tests/decimal_prepare.SF-1655818.stable.out sql/test/BugTracker/Tests/decimal_prepare.SF-1655818.test sql/test/BugTracker/Tests/large_prepare.SF-1363729.sql sql/test/BugTracker/Tests/large_prepare.SF-1363729.stable.err sql/test/BugTracker/Tests/large_prepare.SF-1363729.stable.out sql/test/BugTracker/Tests/large_prepare.SF-1363729.test sql/test/BugTracker/Tests/large_prepare_2.SF-1363729.sql sql/test/BugTracker/Tests/large_prepare_2.SF-1363729.stable.err sql/test/BugTracker/Tests/large_prepare_2.SF-1363729.stable.out sql/test/BugTracker/Tests/large_prepare_2.SF-1363729.test sql/test/BugTracker/Tests/prepare_decimal_float.SF-1675795.sql sql/test/BugTracker/Tests/prepare_decimal_float.SF-1675795.stable.err sql/test/BugTracker/Tests/prepare_decimal_float.SF-1675795.stable.out sql/test/BugTracker/Tests/prepare_decimal_float.SF-1675795.test Modified Files: sql/test/BugTracker/Tests/All sql/test/prepare/Tests/All Branch: mtest Log Message:
more prepare tests relocated diffs (truncated from 1748 to 300 lines): diff --git a/sql/test/BugTracker/Tests/All b/sql/test/BugTracker/Tests/All --- a/sql/test/BugTracker/Tests/All +++ b/sql/test/BugTracker/Tests/All @@ -5,8 +5,6 @@ rank_over.SF-1691098 with_only_once.SF-1720293 multi-column-constraint.SF-1964587 inserting_invalid_timestamp.SF-1363557 -large_prepare.SF-1363729 -large_prepare_2.SF-1363729 update_with_subselect.SF-1362771 crash_on_cast.SF-1357271 string2int_conversion.SF-1356068 @@ -45,13 +43,11 @@ crash_on_delete.SF-1651567 crash_on_insert.SF-1639113 create_column.SF-1643542 #caching.SF-1651599 -decimal_prepare.SF-1655818 union_order revoke_role.SF-1691646 subquery_orderby.SF-1688915 limits_of_decimal.SF-1685357 like_join.SF-1684798 -prepare_decimal_float.SF-1675795 crash_on_fkey_update.SF-1703497 crash_on_fkey_update2.SF-1703497 variable_stack_crash_load.SF-1711251 @@ -67,7 +63,6 @@ like_for_time_values.SF-1715659 local_global_temporary_table.SF-1715672 decimal.SF-1718253 alter-default.SF-1695290 -bind_with_cast.SF-1720934 groupby_orderby_nonselected.SF-1723863 rand_not_executed_for_every_row.SF-1723791 auto_commit.SF-1724151 diff --git a/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.sql b/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.sql deleted file mode 100644 --- a/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.sql +++ /dev/null @@ -1,7 +0,0 @@ -CREATE TABLE data_1mto10m ( -id INTEGER, -col1 INTEGER, -col2 VARCHAR(5) -) ; -PREPARE select id from data_1mto10m where id > CAST(? AS INTEGER) limit 10; -exec **('100'); diff --git a/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err b/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err deleted file mode 100644 --- a/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.err +++ /dev/null @@ -1,30 +0,0 @@ -stderr of test 'bind_with_cast.SF-1720934` in directory 'sql/test/BugTracker` itself: - - -# 21:37:04 > -# 21:37:04 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set" "mapi_open=true" "--set" "mapi_port=31466" "--set" "mapi_usock=/var/tmp/mtest-6542/.s.monetdb.31466" "--set" "monet_prompt=" "--forcemito" "--dbpath=/export/scratch1/mk/jit//Linux/var/MonetDB/mTests_sql_test_BugTracker" "--set" "embedded_r=yes" -# 21:37:04 > - -# builtin opt gdk_dbpath = /export/scratch1/mk/jit//Linux/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 = 31466 -# cmdline opt mapi_usock = /var/tmp/mtest-6542/.s.monetdb.31466 -# cmdline opt monet_prompt = -# cmdline opt gdk_dbpath = /export/scratch1/mk/jit//Linux/var/MonetDB/mTests_sql_test_BugTracker -# cmdline opt embedded_r = yes -# cmdline opt gdk_debug = 536870922 - -# 10:47:04 > -# 10:47:04 > "Done." -# 10:47:04 > - diff --git a/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.out b/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.out deleted file mode 100644 --- a/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.out +++ /dev/null @@ -1,41 +0,0 @@ -stdout of test 'bind_with_cast.SF-1720934` in directory 'sql/test/BugTracker` itself: - - -# 14:16:53 > -# 14:16:53 > Mtimeout -timeout 180 Mserver "--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/MonetDB.conf" --debug=10 --set "monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB4/bin" --set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/dbfarm" --set "sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/sql_logs" --set "xquery_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB4/xquery_logs" --set mapi_port=32953 --set xrpc_port=47402 --set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker" --dbinit=" module(sql_server);" ; echo ; echo Over.. -# 14:16:53 > - -# Monet Database Server V4.17.1 -# Copyright (c) 1993-2007, CWI. All rights reserved. -# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs; dynamically linked. -# Visit http://monetdb.cwi.nl/ for further information. - - - -# 12:37:58 > -# 12:37:58 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=madrid" "--port=32243" -# 12:37:58 > - -#CREATE TABLE data_1mto10m ( -#id INTEGER, -#col1 INTEGER, -#col2 VARCHAR(5) -#) ; -#PREPARE select id from data_1mto10m where id > CAST(? AS INTEGER) limit 10; -#PREPARE select id from data_1mto10m where id > CAST(? AS INTEGER) limit 10; -% .prepare, .prepare, .prepare, .prepare, .prepare, .prepare # table_name -% type, digits, scale, schema, table, column # name -% varchar, int, int, str, str, str # type -% 3, 3, 1, 0, 12, 2 # length -[ "int", 32, 0, "", "data_1mto10m", "id" ] -[ "int", 32, 0, NULL, NULL, NULL ] -#exec 0('100'); -% sys.data_1mto10m # table_name -% id # name -% int # type -% 1 # length - -# 10:47:04 > -# 10:47:04 > "Done." -# 10:47:04 > - diff --git a/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.test b/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.test deleted file mode 100644 --- a/sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.test +++ /dev/null @@ -1,14 +0,0 @@ -statement ok -CREATE TABLE data_1mto10m ( -id INTEGER, -col1 INTEGER, -col2 VARCHAR(5) -) - -statement ok -PREPARE select id from data_1mto10m where id > CAST(? AS INTEGER) limit 10 - -statement ok -exec **('100') - - diff --git a/sql/test/BugTracker/Tests/decimal_prepare.SF-1655818.sql b/sql/test/BugTracker/Tests/decimal_prepare.SF-1655818.sql deleted file mode 100644 --- a/sql/test/BugTracker/Tests/decimal_prepare.SF-1655818.sql +++ /dev/null @@ -1,15 +0,0 @@ --- origin: Anders Blaagaard - -START TRANSACTION; - -create table P1655818 ( - time timestamp not null, - x numeric(5,2) not null, - y numeric(5,2) not null -); - -PREPARE insert into P1655818 (time,x,y) values (?,?,?); - -exec **(timestamp '2003-01-30 18:03:35.0', 71.91, 71.98); - -ROLLBACK; diff --git a/sql/test/BugTracker/Tests/decimal_prepare.SF-1655818.stable.err b/sql/test/BugTracker/Tests/decimal_prepare.SF-1655818.stable.err deleted file mode 100644 --- a/sql/test/BugTracker/Tests/decimal_prepare.SF-1655818.stable.err +++ /dev/null @@ -1,19 +0,0 @@ -stderr of test 'decimal_prepare.SF-1655818` in directory 'sql/test/BugTracker` itself: - - -# 11:47:08 > -# 11:47:08 > Mtimeout -timeout 180 mserver5 "--config=/ufs/fabian/scratch/monetdb/stable/program-x86_64/etc/monetdb5.conf" --debug=10 --set "monet_mod_path=/ufs/fabian/scratch/monetdb/stable/program-x86_64/lib64/MonetDB5:/ufs/fabian/scratch/monetdb/stable/program-x86_64/lib64/MonetDB5/lib:/ufs/fabian/scratch/monetdb/stable/program-x86_64/lib64/MonetDB5/bin" --set "gdk_dbfarm=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-stable-pegasus.ins.cwi.nl/sql/dbfarm" --set "sql_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-stable-pegasus.ins.cwi.nl/sql/sqllog" --set "xquery_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-stable-pegasus.ins.cwi.nl/sql/xquerylog" --set mapi_port=33419 --set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker" --dbinit='include sql;' ; echo ; echo Over.. -# 11:47:08 > - -#warning: please don't forget to set your vault key! -#(see /ufs/fabian/scratch/monetdb/stable/program-x86_64/etc/monetdb5.conf) - -# 11:47:08 > -# 11:47:08 > Mtimeout -timeout 60 MapiClient -lsql -umonetdb -Pmonetdb --host=localhost --port=33419 < decimal_prepare.SF-1655818.sql -# 11:47:08 > - - -# 11:47:08 > -# 11:47:08 > Done. -# 11:47:08 > - diff --git a/sql/test/BugTracker/Tests/decimal_prepare.SF-1655818.stable.out b/sql/test/BugTracker/Tests/decimal_prepare.SF-1655818.stable.out deleted file mode 100644 --- a/sql/test/BugTracker/Tests/decimal_prepare.SF-1655818.stable.out +++ /dev/null @@ -1,35 +0,0 @@ -stdout of test 'decimal_prepare.SF-1655818` in directory 'sql/test/BugTracker` itself: - - -# 11:47:08 > -# 11:47:08 > Mtimeout -timeout 180 mserver5 "--config=/ufs/fabian/scratch/monetdb/stable/program-x86_64/etc/monetdb5.conf" --debug=10 --set "monet_mod_path=/ufs/fabian/scratch/monetdb/stable/program-x86_64/lib64/MonetDB5:/ufs/fabian/scratch/monetdb/stable/program-x86_64/lib64/MonetDB5/lib:/ufs/fabian/scratch/monetdb/stable/program-x86_64/lib64/MonetDB5/bin" --set "gdk_dbfarm=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-stable-pegasus.ins.cwi.nl/sql/dbfarm" --set "sql_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-stable-pegasus.ins.cwi.nl/sql/sqllog" --set "xquery_logdir=/net/pegasus.ins.cwi.nl/export/scratch0/fabian/vtmp/mtest-stable-pegasus.ins.cwi.nl/sql/xquerylog" --set mapi_port=33419 --set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker" --dbinit='include sql;' ; echo ; echo Over.. -# 11:47:08 > - - - -# 12:37:53 > -# 12:37:53 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=madrid" "--port=32243" -# 12:37:53 > - -#START TRANSACTION; -#create table P1655818 ( -# time timestamp not null, -# x numeric(5,2) not null, -# y numeric(5,2) not null -#); -#PREPARE insert into P1655818 (time,x,y) values (?,?,?); -#PREPARE insert into P1655818 (time,x,y) values (?,?,?); -% .prepare, .prepare, .prepare, .prepare, .prepare, .prepare # table_name -% type, digits, scale, schema, table, column # name -% varchar, int, int, str, str, str # type -% 9, 1, 1, 0, 0, 0 # length -[ "timestamp", 7, 0, NULL, NULL, NULL ] -[ "decimal", 5, 2, NULL, NULL, NULL ] -[ "decimal", 5, 2, NULL, NULL, NULL ] -#exec 2(timestamp '2003-01-30 18:03:35.0', 71.91, 71.98); -[ 1 ] - -# 11:47:08 > -# 11:47:08 > Done. -# 11:47:08 > - diff --git a/sql/test/BugTracker/Tests/decimal_prepare.SF-1655818.test b/sql/test/BugTracker/Tests/decimal_prepare.SF-1655818.test deleted file mode 100644 --- a/sql/test/BugTracker/Tests/decimal_prepare.SF-1655818.test +++ /dev/null @@ -1,20 +0,0 @@ -statement ok -START TRANSACTION - -statement ok -create table P1655818 ( - time timestamp not null, - x numeric(5,2) not null, - y numeric(5,2) not null -) - -statement ok -PREPARE insert into P1655818 (time,x,y) values (?,?,?) - -statement ok -exec **(timestamp '2003-01-30 18:03:35.0', 71.91, 71.98) - -statement ok -ROLLBACK - - diff --git a/sql/test/BugTracker/Tests/large_prepare.SF-1363729.sql b/sql/test/BugTracker/Tests/large_prepare.SF-1363729.sql deleted file mode 100644 --- a/sql/test/BugTracker/Tests/large_prepare.SF-1363729.sql +++ /dev/null @@ -1,8 +0,0 @@ -START TRANSACTION; -create table foo (clickTime time,long1 bigint,long2 bigint,long3 bigint,long4 bigint,long5 bigint,long6 bigint,long7 bigint,long8 bigint,long9 bigint,long10 bigint,long11 bigint,long12 bigint,long13 bigint,long14 bigint,long15 bigint,long16 bigint,long17 bigint,long18 bigint,long19 bigint,long20 bigint,long21 bigint,long22 bigint,long23 bigint,long24 bigint,long25 bigint,long26 bigint,long27 bigint,long28 bigint,long29 bigint,long30 bigint,long31 bigint,long32 bigint,long33 bigint,long34 bigint); - -PREPARE insert into foo values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?); - -exec **(time '12:12:12', 6021938018913874944, 7909540736630212608, 5804504770669764608, 5731640460629998592, 862374748439479296, 4118786240046083072, 5736585692206052352, 4180956383130519552, 4431348585717823488, 1687909604323355648, 7376783045669721088, 6515523872365652992, 1715453341893179392, 627721492047376384, 8331839817029594112, 7977041363446006784, 3801764841538480128, 1446801246901456896, 7532895413276706816, 4715259018010967040, 5954047085661367296, 2677611782788034560, 4159344106040219648, 5295979755028414464, 4288751348846951424, 5935314607102821376, 1154335402415802368, 2620740421044021248, 6505497079060329472, 3480814257727680512, 6653356907163571200, 1246123775073920000, 7227784505536452608, 7143603808078267392); - -rollback; diff --git a/sql/test/BugTracker/Tests/large_prepare.SF-1363729.stable.err b/sql/test/BugTracker/Tests/large_prepare.SF-1363729.stable.err deleted file mode 100644 --- a/sql/test/BugTracker/Tests/large_prepare.SF-1363729.stable.err +++ /dev/null @@ -1,86 +0,0 @@ -stderr of test 'large_prepare.SF-1363729` in directory 'sql/test/BugTracker` itself: - - -# 19:33:07 > -# 19:33:07 > mserver5 "--config=/ufs/niels/scratch/monetdb/Linux-x86_64/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=4 --set "monet_mod_path=/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/lib:/ufs/niels/scratch/monetdb/Linux-x86_64/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/niels/scratch/monetdb/Linux-x86_64/var/MonetDB5/sql_logs" --set mapi_open=true --set xrpc_open=true --set mapi_port=33470 --set xrpc_port=49128 --set monet_prompt= --trace "--dbname=mTests_src_test_BugTracker" --set mal_listing=0 "--dbinit= include sql;" ; echo ; echo Over.. -# 19:33:07 > - -# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu -# builtin opt gdk_version = 1.27.0 -# builtin opt monet_pid = 30817 -# builtin opt prefix = /ufs/niels/scratch/monetdb/Linux-x86_64 -# builtin opt exec_prefix = ${prefix} -# builtin opt gdk_dbname = tst -# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB -# builtin opt gdk_debug = 8 -# builtin opt gdk_mem_bigsize = 262144 -# builtin opt gdk_alloc_map = yes -# builtin opt gdk_mem_pagebits = 14 -# builtin opt gdk_vmtrim = yes -# builtin opt monet_admin = adm -# builtin opt monet_prompt = > -# builtin opt monet_welcome = yes -# builtin opt monet_mod_path = ${exec_prefix}/lib/MonetDB:${exec_prefix}/lib/bin -# builtin opt monet_daemon = yes -# builtin opt host = localhost -# builtin opt mapi_port = 50000 -# builtin opt mapi_noheaders = no _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list