Changeset: 3bceeb6a6a22 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3bceeb6a6a22
Modified Files:
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (truncated from 344 to 300 lines):
diff -r 7d242218ae03 -r 3bceeb6a6a22 sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/All Tue Oct 05 17:11:46 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/All Tue Oct 05 17:27:07 2010 +0200
@@ -59,3 +59,5 @@
multiple-common-table-expressions.Bug-2664
duplicate-key.Bug-2667
between-crash.Bug-2672
+select-view-key.Bug-2673
+select-distinct-limit.Bug-2676
diff -r 7d242218ae03 -r 3bceeb6a6a22
sql/src/test/BugTracker-2010/Tests/select-distinct-limit.Bug-2676.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/select-distinct-limit.Bug-2676.sql
Tue Oct 05 17:27:07 2010 +0200
@@ -0,0 +1,13 @@
+start transaction;
+create table t2676 (id int);
+insert into t2676 values (1);
+insert into t2676 values (1);
+insert into t2676 values (2);
+insert into t2676 values (2);
+insert into t2676 values (3);
+insert into t2676 values (3);
+insert into t2676 values (4);
+insert into t2676 values (4);
+select distinct id from t2676;
+select distinct id from t2676 limit 2;
+rollback;
diff -r 7d242218ae03 -r 3bceeb6a6a22
sql/src/test/BugTracker-2010/Tests/select-distinct-limit.Bug-2676.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/BugTracker-2010/Tests/select-distinct-limit.Bug-2676.stable.err
Tue Oct 05 17:27:07 2010 +0200
@@ -0,0 +1,80 @@
+stderr of test 'select-distinct-limit.Bug-2676` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 17:16:58 >
+# 17:16:58 > 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=34702 --set xrpc_port=42010
--set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 17:16:58 >
+
+# 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 = 34702
+# cmdline opt xrpc_port = 42010
+# 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)
+
+# 17:16:58 >
+# 17:16:58 > mclient -lsql -ftest -i -e --host=ottar --port=34702
+# 17:16:58 >
+
+
+# 17:16:58 >
+# 17:16:58 > Done.
+# 17:16:58 >
+
diff -r 7d242218ae03 -r 3bceeb6a6a22
sql/src/test/BugTracker-2010/Tests/select-distinct-limit.Bug-2676.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/BugTracker-2010/Tests/select-distinct-limit.Bug-2676.stable.out
Tue Oct 05 17:27:07 2010 +0200
@@ -0,0 +1,68 @@
+stdout of test 'select-distinct-limit.Bug-2676` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 17:16:58 >
+# 17:16:58 > 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=34702 --set xrpc_port=42010
--set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 17:16:58 >
+
+# 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:34702/
+# MonetDB/SQL module v2.40.0 loaded
+# MonetDB/GIS module v0.20.0 loaded
+
+Ready.
+# SQL catalog created, loading sql scripts once
+
+Over..
+
+# 17:16:58 >
+# 17:16:58 > mclient -lsql -ftest -i -e --host=ottar --port=34702
+# 17:16:58 >
+
+#start transaction;
+#create table t2676 (id int);
+#insert into t2676 values (1);
+[ 1 ]
+#insert into t2676 values (1);
+[ 1 ]
+#insert into t2676 values (2);
+[ 1 ]
+#insert into t2676 values (2);
+[ 1 ]
+#insert into t2676 values (3);
+[ 1 ]
+#insert into t2676 values (3);
+[ 1 ]
+#insert into t2676 values (4);
+[ 1 ]
+#insert into t2676 values (4);
+[ 1 ]
+#select distinct id from t2676;
+% sys.t2676 # table_name
+% id # name
+% int # type
+% 1 # length
+[ 1 ]
+[ 2 ]
+[ 3 ]
+[ 4 ]
+#select distinct id from t2676 limit 2;
+% sys.t2676 # table_name
+% id # name
+% int # type
+% 1 # length
+[ 1 ]
+[ 2 ]
+#rollback;
+
+# 17:16:58 >
+# 17:16:58 > Done.
+# 17:16:58 >
+
diff -r 7d242218ae03 -r 3bceeb6a6a22
sql/src/test/BugTracker-2010/Tests/select-view-key.Bug-2673.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/select-view-key.Bug-2673.sql Tue Oct
05 17:27:07 2010 +0200
@@ -0,0 +1,17 @@
+CREATE TABLE t2673 (
+ name varchar(128) NOT NULL,
+ field varchar(128) NOT NULL,
+ PRIMARY KEY (field, name)
+);
+CREATE VIEW v2673 AS SELECT name FROM t2673 WHERE field='SpecLineNames';
+SELECT
+ v2673.name
+FROM
+ v2673
+WHERE
+ v2673.name <> 'UNKNOWN'
+ and v2673.name = 'Hb_4863'
+;
+
+DROP VIEW v2673;
+DROP TABLE t2673;
diff -r 7d242218ae03 -r 3bceeb6a6a22
sql/src/test/BugTracker-2010/Tests/select-view-key.Bug-2673.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/select-view-key.Bug-2673.stable.err
Tue Oct 05 17:27:07 2010 +0200
@@ -0,0 +1,80 @@
+stderr of test 'select-view-key.Bug-2673` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 17:24:40 >
+# 17:24:40 > 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=37367 --set xrpc_port=48766
--set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 17:24:40 >
+
+# 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 = 37367
+# cmdline opt xrpc_port = 48766
+# 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)
+
+# 17:24:41 >
+# 17:24:41 > mclient -lsql -ftest -i -e --host=ottar --port=37367
+# 17:24:41 >
+
+
+# 17:24:42 >
+# 17:24:42 > Done.
+# 17:24:42 >
+
diff -r 7d242218ae03 -r 3bceeb6a6a22
sql/src/test/BugTracker-2010/Tests/select-view-key.Bug-2673.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/select-view-key.Bug-2673.stable.out
Tue Oct 05 17:27:07 2010 +0200
@@ -0,0 +1,53 @@
+stdout of test 'select-view-key.Bug-2673` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 17:24:40 >
+# 17:24:40 > 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=37367 --set xrpc_port=48766
--set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 17:24:40 >
+
+# MonetDB server v5.22.0, based on kernel v1.40.0
+# Not released
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
