Changeset: 64acf9744dca for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=64acf9744dca
Modified Files:
clients/src/mapiclient/dump.c
sql/src/test/BugTracker-2010/Tests/All
sql/src/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
sql/src/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.err
sql/src/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
Branch: Jun2010
Log Message:
added test for fixed bug 2552 PREPARE: limit statement not recognised
diffs (158 lines):
diff -r 1ee337e08430 -r 64acf9744dca clients/src/mapiclient/dump.c
--- a/clients/src/mapiclient/dump.c Fri Jul 02 08:30:13 2010 +0200
+++ b/clients/src/mapiclient/dump.c Fri Jul 02 08:47:25 2010 +0200
@@ -911,7 +911,7 @@
const char functions[] = "SELECT \"f\".\"func\" "
"FROM \"sys\".\"schemas\" \"s\","
"\"sys\".\"functions\" \"f\" "
- "WHERE \"f\".\"sql\" = TRUE AND "
+ "WHERE \"f\".\"id\" > 2000 AND "
"\"s\".\"id\" = \"f\".\"schema_id\""
"%s%s%s "
"ORDER BY \"f\".\"id\"";
diff -r 1ee337e08430 -r 64acf9744dca sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/All Fri Jul 02 08:30:13 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/All Fri Jul 02 08:47:25 2010 +0200
@@ -11,3 +11,4 @@
copy-into-too-long-string.Bug-2358
in_column_exp.Bug-2561
multiple-updates-in-transaction.Bug-2543
+limit_in_prepare.Bug-2552
diff -r 1ee337e08430 -r 64acf9744dca
sql/src/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql Fri Jul
02 08:47:25 2010 +0200
@@ -0,0 +1,5 @@
+create table rr (id int);
+insert into rr values (1),(2),(3);
+prepare select * from rr limit ?;
+exec 0 (1);
+
diff -r 1ee337e08430 -r 64acf9744dca
sql/src/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.err
Fri Jul 02 08:47:25 2010 +0200
@@ -0,0 +1,78 @@
+stderr of test 'limit_in_prepare.Bug-2552` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 08:45:11 >
+# 08:45:11 > 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 mapi_open=true --set xrpc_open=true --set mapi_port=35663 --set
xrpc_port=48610 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 08:45:11 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.0
+# builtin opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# builtin opt exec_prefix = ${prefix}
+# builtin opt gdk_dbname = demo
+# builtin opt gdk_dbfarm = ${prefix}/var/MonetDB/dbfarm
+# builtin opt gdk_debug = 0
+# builtin opt gdk_alloc_map = no
+# 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
+# builtin opt monet_daemon = no
+# builtin opt host = localhost
+# builtin opt mapi_port = 50000
+# builtin opt mapi_clients = 2
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_debug = 0
+# builtin opt standoff_ns =
+# builtin opt standoff_start = start
+# builtin opt standoff_end = end
+# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/niels/scratch/rc/Linux-x86_64
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
${exec_prefix}/lib/MonetDB5:${exec_prefix}/lib/MonetDB5/lib:${exec_prefix}/lib/MonetDB5/bin
+# config opt mero_pidfile = ${prefix}/var/run/MonetDB/merovingian.pid
+# config opt mero_controlport = 50001
+# config opt sql_optimizer = default_pipe
+# config opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# config opt default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt nov2009_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt replication_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt accumulator_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,accumulators,dataflow,history,multiplex,garbageCollector
+# config opt recycler_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,deadcode,recycle,reduce,dataflow,history,multiplex,garbageCollector
+# config opt cracker_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,selcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sidcrack_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,sidcrack,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacell_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,deadcode,constants,commonTerms,joinPath,datacell,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt octopus_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,constants,commonTerms,joinPath,octopus,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt mapreduce_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mapreduce,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,constants,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt derive_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,derivePath,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt dictionary_pipe =
inline,remap,dictionary,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt compression_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,constants,commonTerms,joinPath,deadcode,reduce,dataflow,compression,dataflow,history,multiplex,garbageCollector
+# cmdline opt config = /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt 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
+# cmdline opt gdk_dbfarm =
/ufs/niels/scratch/rc/Linux-x86_64/var/MonetDB5/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 35663
+# cmdline opt xrpc_port = 48610
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbname = mTests_src_test_BugTracker-2010
+# cmdline opt mal_listing = 0
+#warning: please don't forget to set your vault key!
+#(see /ufs/niels/scratch/rc/Linux-x86_64/etc/monetdb5.conf)
+
+# 08:45:11 >
+# 08:45:11 > mclient -lsql -ftest -i -e --host=alf --port=35663
+# 08:45:11 >
+
+
+# 08:45:11 >
+# 08:45:11 > Done.
+# 08:45:11 >
+
diff -r 1ee337e08430 -r 64acf9744dca
sql/src/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
Fri Jul 02 08:47:25 2010 +0200
@@ -0,0 +1,43 @@
+stdout of test 'limit_in_prepare.Bug-2552` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 08:45:11 >
+# 08:45:11 > 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 mapi_open=true --set xrpc_open=true --set mapi_port=35663 --set
xrpc_port=48610 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 08:45:11 >
+
+# MonetDB server v5.20.0, based on kernel v1.38.0
+# Serving database 'mTests_src_test_BugTracker-2010', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 7.754 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2010 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:35663/
+# MonetDB/SQL module v2.38.0 loaded
+
+Ready.
+
+Over..
+
+# 08:45:11 >
+# 08:45:11 > mclient -lsql -ftest -i -e --host=alf --port=35663
+# 08:45:11 >
+
+[ 3 ]
+#prepare select * from rr limit ?;
+% .prepare, .prepare, .prepare # table_name
+% type, digits, scale # name
+% varchar, int, int # type
+% 0, 0, 0 # length
+[ "wrd", 64, 0 ]
+#exec 0 (1);
+% sys.rr # table_name
+% id # name
+% int # type
+% 1 # length
+[ 1 ]
+
+# 08:45:11 >
+# 08:45:11 > Done.
+# 08:45:11 >
+
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
