Changeset: 1ae6125830cb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1ae6125830cb Modified Files: sql/ChangeLog.Jun2010 sql/src/test/BugTracker-2010/Tests/All sql/src/test/BugTracker-2010/Tests/prepare_on_boolean_bug.Bug-2581.sql sql/src/test/BugTracker-2010/Tests/prepare_on_boolean_bug.Bug-2581.stable.err sql/src/test/BugTracker-2010/Tests/prepare_on_boolean_bug.Bug-2581.stable.out Branch: Jun2010 Log Message:
Fixed bug 2581 The fix was checked in earlier. Min/max fixes for bits and make sure we don't use min/max on different types. Added test for bug 2581 diffs (149 lines): diff -r 6f35abbe1f39 -r 1ae6125830cb sql/ChangeLog.Jun2010 --- a/sql/ChangeLog.Jun2010 Wed Jul 07 09:29:21 2010 +0200 +++ b/sql/ChangeLog.Jun2010 Wed Jul 07 09:37:10 2010 +0200 @@ -2,6 +2,7 @@ # This file is updated with Maddlog * Wed Jul 7 2010 Niels Nes <[email protected]> +- Fixed bug 2581. Completed the implementation of handling boolean types in prepare statements. - Fix bug 2582. Statements with 'constant in ( )' are now handled properly. - Fixed bug 2583 + added test. The assert was incorrect. diff -r 6f35abbe1f39 -r 1ae6125830cb sql/src/test/BugTracker-2010/Tests/All --- a/sql/src/test/BugTracker-2010/Tests/All Wed Jul 07 09:29:21 2010 +0200 +++ b/sql/src/test/BugTracker-2010/Tests/All Wed Jul 07 09:37:10 2010 +0200 @@ -18,3 +18,4 @@ SQLengine_error_on_join.Bug-2580 keycheck_crash.Bug-2583 in_query_with_constants_fails.Bug-2582 +prepare_on_boolean_bug.Bug-2581 diff -r 6f35abbe1f39 -r 1ae6125830cb sql/src/test/BugTracker-2010/Tests/prepare_on_boolean_bug.Bug-2581.sql --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/test/BugTracker-2010/Tests/prepare_on_boolean_bug.Bug-2581.sql Wed Jul 07 09:37:10 2010 +0200 @@ -0,0 +1,3 @@ +create table skycrash (id serial, boom boolean); +prepare select * from skycrash where boom = ? and boom = ?; +drop table skycrash; diff -r 6f35abbe1f39 -r 1ae6125830cb sql/src/test/BugTracker-2010/Tests/prepare_on_boolean_bug.Bug-2581.stable.err --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/test/BugTracker-2010/Tests/prepare_on_boolean_bug.Bug-2581.stable.err Wed Jul 07 09:37:10 2010 +0200 @@ -0,0 +1,78 @@ +stderr of test 'prepare_on_boolean_bug.Bug-2581` in directory 'src/test/BugTracker-2010` itself: + + +# 09:34:27 > +# 09:34:27 > 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=30431 --set xrpc_port=48860 --set monet_prompt= --set mal_listing=2 --trace "--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo Over.. +# 09:34:27 > + +# 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 = 30431 +# cmdline opt xrpc_port = 48860 +# 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) + +# 09:34:27 > +# 09:34:27 > mclient -lsql -ftest -i -e --host=alf --port=30431 +# 09:34:27 > + + +# 09:34:27 > +# 09:34:27 > Done. +# 09:34:27 > + diff -r 6f35abbe1f39 -r 1ae6125830cb sql/src/test/BugTracker-2010/Tests/prepare_on_boolean_bug.Bug-2581.stable.out --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/test/BugTracker-2010/Tests/prepare_on_boolean_bug.Bug-2581.stable.out Wed Jul 07 09:37:10 2010 +0200 @@ -0,0 +1,37 @@ +stdout of test 'prepare_on_boolean_bug.Bug-2581` in directory 'src/test/BugTracker-2010` itself: + + +# 09:34:27 > +# 09:34:27 > 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=30431 --set xrpc_port=48860 --set monet_prompt= --set mal_listing=2 --trace "--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo Over.. +# 09:34:27 > + +# 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:30431/ +# MonetDB/SQL module v2.38.2 loaded + +Ready. + +Over.. + +# 09:34:27 > +# 09:34:27 > mclient -lsql -ftest -i -e --host=alf --port=30431 +# 09:34:27 > + +#prepare select * from skycrash where boom = ? and boom = ?; +% .prepare, .prepare, .prepare # table_name +% type, digits, scale # name +% varchar, int, int # type +% 0, 0, 0 # length +[ "boolean", 1, 0 ] +[ "boolean", 1, 0 ] + +# 09:34:27 > +# 09:34:27 > Done. +# 09:34:27 > + _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
