Changeset: 8670d9360669 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8670d9360669
Modified Files:
sql/ChangeLog.Jun2010
sql/src/test/BugTracker-2010/Tests/All
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 411 to 300 lines):
diff -r 668907374273 -r 8670d9360669 sql/ChangeLog.Jun2010
--- a/sql/ChangeLog.Jun2010 Mon Aug 09 14:27:48 2010 +0200
+++ b/sql/ChangeLog.Jun2010 Tue Aug 10 09:14:50 2010 +0200
@@ -1,6 +1,10 @@
# ChangeLog file for sql
# This file is updated with Maddlog
+* Mon Aug 9 2010 Jennie Zhang <y.zh...@cwi.nl>
+- Fixed bug 2645: mat.pack+algebra.slice should be replaced by mat.slice
+ for 'limit 1' (when the default_pipe is used)
+
* Fri Aug 6 2010 Fabian Groffen <fab...@cwi.nl>
- Fixed bug #2641, The SQL server now handles Unicode BOM sequences
occurring in any place. Previously an "unexpected character (U+FEFF)"
diff -r 668907374273 -r 8670d9360669 sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/All Mon Aug 09 14:27:48 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/All Tue Aug 10 09:14:50 2010 +0200
@@ -40,3 +40,4 @@
with_row_number_crash.Bug-2631
complex_query_crash.Bug-2633
unicode-bom.Bug-2641
+mat.slice_limit1.Bug-2645
diff -r 668907374273 -r 8670d9360669
sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.sql Tue Aug
10 09:14:50 2010 +0200
@@ -0,0 +1,47 @@
+create table slice_test (x int, y int, val int);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 0, 1, 12985);
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+insert into slice_test values ( 1, 1, 28323);
+insert into slice_test values ( 3, 5, 89439);
+
+explain select x,y from slice_test limit 1;
+
+explain select cast(x as string)||'-bla-'||cast(y as string) from slice_test
limit 1;
+
+drop table slice_test;
+
diff -r 668907374273 -r 8670d9360669
sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.err
Tue Aug 10 09:14:50 2010 +0200
@@ -0,0 +1,78 @@
+stderr of test 'mat.slice_limit1.Bug-2645` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 15:04:12 >
+# 15:04:12 > mserver5
"--config=/export/scratch0/zhang/monet-install/candidate/debug/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5:/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5/lib:/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/export/scratch0/zhang/monet-install/candidate/debug/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=37776 --set
xrpc_port=42741 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 15:04:12 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.4
+# builtin opt prefix = /export/scratch0/zhang/monet-install/candidate/debug
+# 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 = /export/scratch0/zhang/monet-install/candidate/debug
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /export/scratch0/zhang/monet-install/candidate/debug
+# 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 =
/export/scratch0/zhang/monet-install/candidate/debug/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt monet_mod_path =
/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5:/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5/lib:/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5/bin
+# cmdline opt gdk_dbfarm =
/export/scratch0/zhang/monet-install/candidate/debug/var/MonetDB5/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 37776
+# cmdline opt xrpc_port = 42741
+# 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 /export/scratch0/zhang/monet-install/candidate/debug/etc/monetdb5.conf)
+
+# 15:04:12 >
+# 15:04:12 > mclient -lsql -ftest -i -e --host=halfdan --port=37776
+# 15:04:12 >
+
+
+# 15:04:12 >
+# 15:04:12 > Done.
+# 15:04:12 >
+
diff -r 668907374273 -r 8670d9360669
sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/mat.slice_limit1.Bug-2645.stable.out
Tue Aug 10 09:14:50 2010 +0200
@@ -0,0 +1,252 @@
+stdout of test 'mat.slice_limit1.Bug-2645` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 15:04:12 >
+# 15:04:12 > mserver5
"--config=/export/scratch0/zhang/monet-install/candidate/debug/etc/monetdb5.conf"
--debug=10 --set gdk_nr_threads=0 --set
"monet_mod_path=/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5:/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5/lib:/export/scratch0/zhang/monet-install/candidate/debug/lib/MonetDB5/bin"
--set
"gdk_dbfarm=/export/scratch0/zhang/monet-install/candidate/debug/var/MonetDB5/dbfarm"
--set mapi_open=true --set xrpc_open=true --set mapi_port=37776 --set
xrpc_port=42741 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 15:04:12 >
+
+# MonetDB server v5.20.4, based on kernel v1.38.4
+# Not released
+# 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.751 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://halfdan.ins.cwi.nl:37776/
+# MonetDB/SQL module v2.38.4 loaded
+# MonetDB/GIS module v0.18.4 loaded
+
+Ready.
+
+Over..
+
+# 15:04:12 >
+# 15:04:12 > mclient -lsql -ftest -i -e --host=halfdan --port=37776
+# 15:04:12 >
+
+#create table slice_test (x int, y int, val int);
+#insert into slice_test values ( 0, 1, 12985);
+[ 1 ]
+#insert into slice_test values ( 0, 1, 12985);
+[ 1 ]
+#insert into slice_test values ( 0, 1, 12985);
+[ 1 ]
+#insert into slice_test values ( 0, 1, 12985);
+[ 1 ]
+#insert into slice_test values ( 0, 1, 12985);
+[ 1 ]
+#insert into slice_test values ( 0, 1, 12985);
+[ 1 ]
+#insert into slice_test values ( 0, 1, 12985);
+[ 1 ]
+#insert into slice_test values ( 0, 1, 12985);
+[ 1 ]
+#insert into slice_test values ( 0, 1, 12985);
+[ 1 ]
+#insert into slice_test values ( 0, 1, 12985);
+[ 1 ]
+#insert into slice_test values ( 1, 1, 28323);
+[ 1 ]
+#insert into slice_test values ( 3, 5, 89439);
+[ 1 ]
+#insert into slice_test values ( 1, 1, 28323);
+[ 1 ]
+#insert into slice_test values ( 3, 5, 89439);
+[ 1 ]
+#insert into slice_test values ( 1, 1, 28323);
+[ 1 ]
+#insert into slice_test values ( 3, 5, 89439);
+[ 1 ]
+#insert into slice_test values ( 1, 1, 28323);
+[ 1 ]
+#insert into slice_test values ( 3, 5, 89439);
+[ 1 ]
+#insert into slice_test values ( 1, 1, 28323);
+[ 1 ]
+#insert into slice_test values ( 3, 5, 89439);
+[ 1 ]
+#insert into slice_test values ( 1, 1, 28323);
+[ 1 ]
+#insert into slice_test values ( 3, 5, 89439);
+[ 1 ]
+#insert into slice_test values ( 1, 1, 28323);
+[ 1 ]
+#insert into slice_test values ( 3, 5, 89439);
+[ 1 ]
+#insert into slice_test values ( 1, 1, 28323);
+[ 1 ]
+#insert into slice_test values ( 3, 5, 89439);
+[ 1 ]
+#insert into slice_test values ( 1, 1, 28323);
+[ 1 ]
+#insert into slice_test values ( 3, 5, 89439);
+[ 1 ]
+#insert into slice_test values ( 1, 1, 28323);
+[ 1 ]
+#insert into slice_test values ( 3, 5, 89439);
+[ 1 ]
+#explain select x,y from slice_test limit 1;
+% .explain # table_name
+% mal # name
+% clob # type
+% 0 # length
+function user.s1_1{autoCommit=true}():void;
+ _2 := sql.mvc();
+barrier _113 := language.dataflow();
+ _48:bat[:oid,:int] := sql.bind(_2,"sys","slice_test","x",0,0...@0,7...@0);
+ _7:bat[:oid,:int] := sql.bind(_2,"sys","slice_test","x",2);
+ _59 := algebra.kdifference(_48,_7);
+ _63 := algebra.semijoin(_7,_48);
+ _67 := algebra.kunion(_59,_63);
+ _11:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","slice_test",1);
+ _12 := bat.reverse(_11);
+ _71 := algebra.kdifference(_67,_12);
+ _50:bat[:oid,:int] := sql.bind(_2,"sys","slice_test","x",0,7...@0,1...@0);
+ _60 := algebra.kdifference(_50,_7);
+ _64 := algebra.semijoin(_7,_50);
+ _68 := algebra.kunion(_60,_64);
+ _73 := algebra.kdifference(_68,_12);
+ _52:bat[:oid,:int] := sql.bind(_2,"sys","slice_test","x",0,1...@0,2...@0);
+ _61 := algebra.kdifference(_52,_7);
+ _65 := algebra.semijoin(_7,_52);
+ _69 := algebra.kunion(_61,_65);
+ _74 := algebra.kdifference(_69,_12);
+ _54:bat[:oid,:int] :=
sql.bind(_2,"sys","slice_test","x",0,2...@0,nil:oid);
+ _62 := algebra.kdifference(_54,_7);
+ _66 := algebra.semijoin(_7,_54);
+ _70 := algebra.kunion(_62,_66);
+ _75 := algebra.kdifference(_70,_12);
+ _9:bat[:oid,:int] := sql.bind(_2,"sys","slice_test","x",1);
+ _76 := algebra.kdifference(_9,_12);
+ _13 := mat.slice(0:wrd,0:wrd,_71,_73,_74,_75,_76);
+ _14 := algebra.slice(_13,0:wrd,0:wrd);
+ _17:bat[:oid,:int] := sql.bind(_2,"sys","slice_test","y",1);
+ _18:bat[:oid,:oid] := sql.bind_dbat(_2,"sys","slice_test",1);
+ _21 := bat.reverse(_18);
+ _99 := algebra.kdifference(_17,_21);
+ _104 := algebra.semijoin(_99,_13);
+ _110 := algebra.semijoin(_104,_14);
+ _58:bat[:oid,:int] :=
sql.bind(_2,"sys","slice_test","y",0,2...@0,nil:oid);
+ _16:bat[:oid,:int] := sql.bind(_2,"sys","slice_test","y",2);
+ _85 := algebra.kdifference(_58,_16);
+ _89 := algebra.semijoin(_16,_58);
+ _93 := algebra.kunion(_85,_89);
+ _98 := algebra.kdifference(_93,_21);
+ _103 := algebra.semijoin(_98,_13);
+ _109 := algebra.semijoin(_103,_14);
+ _57:bat[:oid,:int] := sql.bind(_2,"sys","slice_test","y",0,1...@0,2...@0);
+ _83 := algebra.kdifference(_57,_16);
+ _88 := algebra.semijoin(_16,_57);
+ _92 := algebra.kunion(_83,_88);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
