Changeset: a0d12c135b17 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a0d12c135b17 Modified Files: sql/ChangeLog.Jun2010 sql/src/server/rel_optimizer.mx sql/src/test/BugTracker-2010/Tests/All sql/src/test/BugTracker-2010/Tests/keycheck_crash.Bug-2583.sql sql/src/test/BugTracker-2010/Tests/keycheck_crash.Bug-2583.stable.err sql/src/test/BugTracker-2010/Tests/keycheck_crash.Bug-2583.stable.out Branch: Jun2010 Log Message:
Fixed bug 2583 The keys can match a smaller set out of the expression list. Thats fine, ie the assert was incorrect. diffs (177 lines): diff -r 2c5e204b6272 -r a0d12c135b17 sql/ChangeLog.Jun2010 --- a/sql/ChangeLog.Jun2010 Tue Jul 06 17:50:49 2010 +0200 +++ b/sql/ChangeLog.Jun2010 Wed Jul 07 09:20:08 2010 +0200 @@ -1,3 +1,6 @@ # ChangeLog file for sql # This file is updated with Maddlog +* Wed Jul 7 2010 Niels Nes <[email protected]> +- Fixed bug 2583 + added test. The assert was incorrect. + diff -r 2c5e204b6272 -r a0d12c135b17 sql/src/server/rel_optimizer.mx --- a/sql/src/server/rel_optimizer.mx Tue Jul 06 17:50:49 2010 +0200 +++ b/sql/src/server/rel_optimizer.mx Wed Jul 07 09:20:08 2010 +0200 @@ -3160,7 +3160,6 @@ } } } - assert(list_length(exps) == list_length(es)); /* fix the destroy function */ cols->destroy = NULL; list_destroy(cols); diff -r 2c5e204b6272 -r a0d12c135b17 sql/src/test/BugTracker-2010/Tests/All --- a/sql/src/test/BugTracker-2010/Tests/All Tue Jul 06 17:50:49 2010 +0200 +++ b/sql/src/test/BugTracker-2010/Tests/All Wed Jul 07 09:20:08 2010 +0200 @@ -16,3 +16,4 @@ delete_insert.Bug-2529 decimal_div_whole_nrs.Bug-2579 SQLengine_error_on_join.Bug-2580 +keycheck_crash.Bug-2583 diff -r 2c5e204b6272 -r a0d12c135b17 sql/src/test/BugTracker-2010/Tests/keycheck_crash.Bug-2583.sql --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/test/BugTracker-2010/Tests/keycheck_crash.Bug-2583.sql Wed Jul 07 09:20:08 2010 +0200 @@ -0,0 +1,23 @@ +CREATE SCHEMA "test"; +CREATE TABLE "test"."tbl1" ( + "id" int NOT NULL, + "id1" int NOT NULL, + "id2" int NOT NULL, + "name" varchar(300) NOT NULL, + CONSTRAINT "test_id_pkey" PRIMARY KEY ("id"), + CONSTRAINT "test_id1_name_unique" UNIQUE ("id1", "name") +); + + +SELECT + (1) AS "a" +FROM + "test"."tbl1" +WHERE + "tbl1"."name" = 'some text' AND + "tbl1"."id1" = 1 AND NOT + ("tbl1"."id2" = 295) +; + +DROP TABLE "test"."tbl1"; +DROP SCHEMA "test"; diff -r 2c5e204b6272 -r a0d12c135b17 sql/src/test/BugTracker-2010/Tests/keycheck_crash.Bug-2583.stable.err --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/test/BugTracker-2010/Tests/keycheck_crash.Bug-2583.stable.err Wed Jul 07 09:20:08 2010 +0200 @@ -0,0 +1,78 @@ +stderr of test 'keycheck_crash.Bug-2583` in directory 'src/test/BugTracker-2010` itself: + + +# 09:16:38 > +# 09:16:38 > 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=31811 --set xrpc_port=48864 --set monet_prompt= --set mal_listing=2 --trace "--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo Over.. +# 09:16:38 > + +# 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 = 31811 +# cmdline opt xrpc_port = 48864 +# 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:16:38 > +# 09:16:38 > mclient -lsql -ftest -i -e --host=alf --port=31811 +# 09:16:38 > + + +# 09:16:38 > +# 09:16:38 > Done. +# 09:16:38 > + diff -r 2c5e204b6272 -r a0d12c135b17 sql/src/test/BugTracker-2010/Tests/keycheck_crash.Bug-2583.stable.out --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sql/src/test/BugTracker-2010/Tests/keycheck_crash.Bug-2583.stable.out Wed Jul 07 09:20:08 2010 +0200 @@ -0,0 +1,35 @@ +stdout of test 'keycheck_crash.Bug-2583` in directory 'src/test/BugTracker-2010` itself: + + +# 09:16:38 > +# 09:16:38 > 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=31811 --set xrpc_port=48864 --set monet_prompt= --set mal_listing=2 --trace "--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo Over.. +# 09:16:38 > + +# 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:31811/ +# MonetDB/SQL module v2.38.2 loaded + +Ready. + +Over.. + +# 09:16:38 > +# 09:16:38 > mclient -lsql -ftest -i -e --host=alf --port=31811 +# 09:16:38 > + +#SELECT +% . # table_name +% a # name +% tinyint # type +% 1 # length + +# 09:16:38 > +# 09:16:38 > Done. +# 09:16:38 > + _______________________________________________ Checkin-list mailing list [email protected] http://mail.monetdb.org/mailman/listinfo/checkin-list
