Changeset: 6f35abbe1f39 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6f35abbe1f39 Modified Files: sql/ChangeLog.Jun2010 sql/src/server/rel_bin.mx sql/src/test/BugTracker-2010/Tests/All sql/src/test/BugTracker-2010/Tests/in_query_with_constants_fails.Bug-2582.sql sql/src/test/BugTracker-2010/Tests/in_query_with_constants_fails.Bug-2582.stable.err sql/src/test/BugTracker-2010/Tests/in_query_with_constants_fails.Bug-2582.stable.out Branch: Jun2010 Log Message:
fixed bug in in handling with constants diffs (164 lines): diff -r 9a0c10303c47 -r 6f35abbe1f39 sql/ChangeLog.Jun2010 --- a/sql/ChangeLog.Jun2010 Wed Jul 07 09:20:43 2010 +0200 +++ b/sql/ChangeLog.Jun2010 Wed Jul 07 09:29:21 2010 +0200 @@ -2,5 +2,6 @@ # This file is updated with Maddlog * Wed Jul 7 2010 Niels Nes <[email protected]> +- Fix bug 2582. Statements with 'constant in ( )' are now handled properly. - Fixed bug 2583 + added test. The assert was incorrect. diff -r 9a0c10303c47 -r 6f35abbe1f39 sql/src/server/rel_bin.mx --- a/sql/src/server/rel_bin.mx Wed Jul 07 09:20:43 2010 +0200 +++ b/sql/src/server/rel_bin.mx Wed Jul 07 09:29:21 2010 +0200 @@ -182,9 +182,9 @@ are_equality_exps( list *exps ) { if (list_length(exps) == 1) { - sql_exp *e = exps->h->data, *re = e->r; - - if (e->type == e_cmp && e->flag == cmp_equal && re->card == CARD_ATOM) + sql_exp *e = exps->h->data, *le = e->l, *re = e->r; + + if (e->type == e_cmp && e->flag == cmp_equal && le->card != CARD_ATOM && re->card == CARD_ATOM) return 1; if (e->type == e_cmp && e->flag == cmp_or) return (are_equality_exps(e->l) && diff -r 9a0c10303c47 -r 6f35abbe1f39 sql/src/test/BugTracker-2010/Tests/All --- a/sql/src/test/BugTracker-2010/Tests/All Wed Jul 07 09:20:43 2010 +0200 +++ b/sql/src/test/BugTracker-2010/Tests/All Wed Jul 07 09:29:21 2010 +0200 @@ -17,3 +17,4 @@ decimal_div_whole_nrs.Bug-2579 SQLengine_error_on_join.Bug-2580 keycheck_crash.Bug-2583 +in_query_with_constants_fails.Bug-2582 diff -r 9a0c10303c47 -r 6f35abbe1f39 sql/src/test/BugTracker-2010/Tests/in_query_with_constants_fails.Bug-2582.sql --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/test/BugTracker-2010/Tests/in_query_with_constants_fails.Bug-2582.sql Wed Jul 07 09:29:21 2010 +0200 @@ -0,0 +1,5 @@ +create table skycrash(id serial, boom boolean); +create view skyview as select 1 as unknown, id from skycrash; +select * from skyview where unknown in (1, 2, 3); +drop view skyview; +drop table skycrash; diff -r 9a0c10303c47 -r 6f35abbe1f39 sql/src/test/BugTracker-2010/Tests/in_query_with_constants_fails.Bug-2582.stable.err --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/test/BugTracker-2010/Tests/in_query_with_constants_fails.Bug-2582.stable.err Wed Jul 07 09:29:21 2010 +0200 @@ -0,0 +1,78 @@ +stderr of test 'in_query_with_constants_fails.Bug-2582` in directory 'src/test/BugTracker-2010` itself: + + +# 09:27:06 > +# 09:27:06 > 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=38169 --set xrpc_port=44022 --set monet_prompt= --set mal_listing=2 --trace "--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo Over.. +# 09:27:06 > + +# 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 = 38169 +# cmdline opt xrpc_port = 44022 +# 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:27:06 > +# 09:27:06 > mclient -lsql -ftest -i -e --host=alf --port=38169 +# 09:27:06 > + + +# 09:27:06 > +# 09:27:06 > Done. +# 09:27:06 > + diff -r 9a0c10303c47 -r 6f35abbe1f39 sql/src/test/BugTracker-2010/Tests/in_query_with_constants_fails.Bug-2582.stable.out --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/test/BugTracker-2010/Tests/in_query_with_constants_fails.Bug-2582.stable.out Wed Jul 07 09:29:21 2010 +0200 @@ -0,0 +1,35 @@ +stdout of test 'in_query_with_constants_fails.Bug-2582` in directory 'src/test/BugTracker-2010` itself: + + +# 09:27:06 > +# 09:27:06 > 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=38169 --set xrpc_port=44022 --set monet_prompt= --set mal_listing=2 --trace "--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo Over.. +# 09:27:06 > + +# 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:38169/ +# MonetDB/SQL module v2.38.2 loaded + +Ready. + +Over.. + +# 09:27:06 > +# 09:27:06 > mclient -lsql -ftest -i -e --host=alf --port=38169 +# 09:27:06 > + +#select * from skyview where unknown in (1, 2, 3); +% .skyview, sys.skyview # table_name +% unknown, id # name +% tinyint, int # type +% 1, 1 # length + +# 09:27:06 > +# 09:27:06 > Done. +# 09:27:06 > + _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
