Changeset: cc4c5ff7fc5d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cc4c5ff7fc5d
Modified Files:
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (224 lines):
diff -r 5cf3a4b2a14c -r cc4c5ff7fc5d sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/All Thu Oct 07 16:18:30 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/All Thu Oct 07 16:38:51 2010 +0200
@@ -51,6 +51,7 @@
crash_on_in_1.Bug-2352
crash_on_complex_join_exp.Bug-2353
times-crash.Bug-2586
+orderby-limit.Bug-2634
crash_in_dce.Bug-2651
in_query_missing_columns.Bug-2652
sum_on_date_crash.Bug-2643
diff -r 5cf3a4b2a14c -r cc4c5ff7fc5d
sql/src/test/BugTracker-2010/Tests/orderby-limit.Bug-2634.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/orderby-limit.Bug-2634.sql Thu Oct
07 16:38:51 2010 +0200
@@ -0,0 +1,43 @@
+CREATE TABLE "tbl1" (
+ "id" int NOT NULL,
+ "id1" int NOT NULL,
+ "id2" int NOT NULL
+)
+;
+
+CREATE TABLE "tbl2" (
+ "id" int NOT NULL,
+ "title" varchar(10)
+)
+;
+
+INSERT INTO tbl1 VALUES (1,1,1)
+;
+INSERT INTO tbl1 VALUES (2,2,2)
+;
+INSERT INTO tbl2 VALUES (1, 'one')
+;
+INSERT INTO tbl2 VALUES (2, 'two')
+;
+INSERT INTO tbl2 VALUES (3, 'three')
+;
+
+--
+-- ERROR = !MALException:group.refine:Operation failed
+-- !ERROR: CTrefine: both BATs must have the same cardinality and
their heads must form a 1-1 match.
+--
+SELECT
+ tbl1.id,
+ tbl1.id1,
+ tbl1.id2
+FROM
+ tbl1 INNER JOIN tbl2
+ ON (tbl1.id1 = tbl2.id)
+ORDER BY
+ tbl2.title ASC,
+ tbl1.id1 ASC
+LIMIT 1
+;
+
+DROP TABLE "tbl2";
+DROP TABLE "tbl1";
diff -r 5cf3a4b2a14c -r cc4c5ff7fc5d
sql/src/test/BugTracker-2010/Tests/orderby-limit.Bug-2634.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/orderby-limit.Bug-2634.stable.err
Thu Oct 07 16:38:51 2010 +0200
@@ -0,0 +1,80 @@
+stderr of test 'orderby-limit.Bug-2634` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 16:35:17 >
+# 16:35:17 > mserver5
"--config=/ufs/sjoerd/Monet-candidate/etc/monetdb5.conf" --debug=10 --set
gdk_nr_threads=0 --set gdk_testing=true --set
"monet_mod_path=/ufs/sjoerd/Monet-candidate/lib64/MonetDB5:/ufs/sjoerd/Monet-candidate/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-candidate/lib64/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/sjoerd/Monet-candidate/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=34202 --set xrpc_port=46857
--set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 16:35:17 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.40.0
+# builtin opt prefix = /ufs/sjoerd/Monet-candidate
+# 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 = ${prefix}/lib64/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/sjoerd/Monet-candidate
+# config opt config = ${prefix}/etc/monetdb5.conf
+# config opt prefix = /ufs/sjoerd/Monet-candidate
+# config opt exec_prefix = ${prefix}
+# config opt gdk_dbfarm = ${prefix}/var/MonetDB5/dbfarm
+# config opt monet_mod_path =
${prefix}/lib64/MonetDB5:${prefix}/lib64/MonetDB5/lib:${prefix}/lib64/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 no_mitosis_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# config opt sequential_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,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 datacyclotron_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,datacyclotron,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,replication,multiplex,garbageCollector
+# config opt derive_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,derivePath,joinPath,reorder,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/sjoerd/Monet-candidate/etc/monetdb5.conf
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt gdk_testing = true
+# cmdline opt monet_mod_path =
/ufs/sjoerd/Monet-candidate/lib64/MonetDB5:/ufs/sjoerd/Monet-candidate/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-candidate/lib64/MonetDB5/bin
+# cmdline opt gdk_dbfarm = /ufs/sjoerd/Monet-candidate/var/MonetDB5/dbfarm
+# cmdline opt mapi_open = true
+# cmdline opt xrpc_open = true
+# cmdline opt mapi_port = 34202
+# cmdline opt xrpc_port = 46857
+# 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/sjoerd/Monet-candidate/etc/monetdb5.conf)
+
+# 16:35:17 >
+# 16:35:17 > mclient -lsql -ftest -i -e --host=ottar --port=34202
+# 16:35:17 >
+
+
+# 16:35:52 >
+# 16:35:52 > Done.
+# 16:35:52 >
+
diff -r 5cf3a4b2a14c -r cc4c5ff7fc5d
sql/src/test/BugTracker-2010/Tests/orderby-limit.Bug-2634.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/orderby-limit.Bug-2634.stable.out
Thu Oct 07 16:38:51 2010 +0200
@@ -0,0 +1,78 @@
+stdout of test 'orderby-limit.Bug-2634` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 16:35:17 >
+# 16:35:17 > mserver5
"--config=/ufs/sjoerd/Monet-candidate/etc/monetdb5.conf" --debug=10 --set
gdk_nr_threads=0 --set gdk_testing=true --set
"monet_mod_path=/ufs/sjoerd/Monet-candidate/lib64/MonetDB5:/ufs/sjoerd/Monet-candidate/lib64/MonetDB5/lib:/ufs/sjoerd/Monet-candidate/lib64/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/sjoerd/Monet-candidate/var/MonetDB5/dbfarm" --set
mapi_open=true --set xrpc_open=true --set mapi_port=34202 --set xrpc_port=46857
--set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 16:35:17 >
+
+# MonetDB server v5.22.0, based on kernel v1.40.0
+# 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.750 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://ottar.ins.cwi.nl:34202/
+# MonetDB/SQL module v2.40.0 loaded
+# MonetDB/GIS module v0.20.0 loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+
+Over..
+
+# 16:35:17 >
+# 16:35:17 > mclient -lsql -ftest -i -e --host=ottar --port=34202
+# 16:35:17 >
+
+#CREATE TABLE "tbl1" (
+# "id" int NOT NULL,
+# "id1" int NOT NULL,
+# "id2" int NOT NULL
+#)
+#;
+#CREATE TABLE "tbl2" (
+# "id" int NOT NULL,
+# "title" varchar(10)
+#)
+#;
+#INSERT INTO tbl1 VALUES (1,1,1)
+#;
+[ 1 ]
+#INSERT INTO tbl1 VALUES (2,2,2)
+#;
+[ 1 ]
+#INSERT INTO tbl2 VALUES (1, 'one')
+#;
+[ 1 ]
+#INSERT INTO tbl2 VALUES (2, 'two')
+#;
+[ 1 ]
+#INSERT INTO tbl2 VALUES (3, 'three')
+#;
+[ 1 ]
+#SELECT
+# tbl1.id,
+# tbl1.id1,
+# tbl1.id2
+#FROM
+# tbl1 INNER JOIN tbl2
+# ON (tbl1.id1 = tbl2.id)
+#ORDER BY
+# tbl2.title ASC,
+# tbl1.id1 ASC
+#LIMIT 1
+#;
+% sys.tbl1, sys.tbl1, sys.tbl1 # table_name
+% id, id1, id2 # name
+% int, int, int # type
+% 1, 1, 1 # length
+[ 1, 1, 1 ]
+#DROP TABLE "tbl2";
+#DROP TABLE "tbl1";
+
+# 16:35:17 >
+# 16:35:17 > Done.
+# 16:35:17 >
+
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
