Changeset: 195a13507c2a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=195a13507c2a
Modified Files:
sql/src/server/rel_optimizer.c
sql/src/server/rel_select.c
Branch: default
Log Message:
merge with Oct2010
diffs (200 lines):
diff -r 81293e2793a5 -r 195a13507c2a sql/src/server/rel_optimizer.c
--- a/sql/src/server/rel_optimizer.c Wed Nov 24 15:13:17 2010 +0100
+++ b/sql/src/server/rel_optimizer.c Wed Nov 24 19:01:28 2010 +0100
@@ -89,18 +89,18 @@
c = name_find_column( rel->l, rname, name);
return c;
case op_select:
+ case op_topn:
+ case op_ddl:
+ return name_find_column( rel->l, rname, name);
case op_union:
case op_inter:
case op_except:
- case op_topn:
- case op_ddl:
- return name_find_column( rel->l, rname, name);
case op_project:
case op_groupby:
if (!rel->exps)
break;
alias = exps_bind_column(rel->exps, name, NULL);
- if (!alias) {
+ if (!alias && rel->l) {
/* group by column not found as alias in projection
list;
fall back to check plain input columns */
return name_find_column( rel->l, rname, name);
diff -r 81293e2793a5 -r 195a13507c2a sql/src/server/rel_select.c
--- a/sql/src/server/rel_select.c Wed Nov 24 15:13:17 2010 +0100
+++ b/sql/src/server/rel_select.c Wed Nov 24 19:01:28 2010 +0100
@@ -1366,6 +1366,7 @@
}
}
}
+ set_processed(r);
rel_table_optname(sql, r, optname);
return r;
}
diff -r 81293e2793a5 -r 195a13507c2a sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/All Wed Nov 24 15:13:17 2010 +0100
+++ b/sql/src/test/BugTracker-2010/Tests/All Wed Nov 24 19:01:28 2010 +0100
@@ -73,3 +73,4 @@
TypeException_with_missing_function.Bug-2674
join-and-like.Bug-2715
between-timestamp.Bug-2718
+values.Bug-2726
diff -r 81293e2793a5 -r 195a13507c2a
sql/src/test/BugTracker-2010/Tests/values.Bug-2726.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/values.Bug-2726.sql Wed Nov 24
19:01:28 2010 +0100
@@ -0,0 +1,12 @@
+SELECT t0.a
+ FROM (VALUES (1), (3)) AS t0(a),
+ (VALUES (1), (3)) AS t1(b)
+ WHERE a = b;
+
+SELECT a
+ FROM (VALUES (1), (3)) AS t0(a),
+ (VALUES (1), (3)) AS t1(b)
+ WHERE a = b;
+
+
+
diff -r 81293e2793a5 -r 195a13507c2a
sql/src/test/BugTracker-2010/Tests/values.Bug-2726.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/values.Bug-2726.stable.err Wed Nov
24 19:01:28 2010 +0100
@@ -0,0 +1,79 @@
+stderr of test 'values.Bug-2726` in directory 'src/test/BugTracker-2010`
itself:
+
+
+# 16:36:03 >
+# 16:36:03 > 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=33705 --set
xrpc_port=47411 --set monet_prompt= --trace --forcemito --set mal_listing=2
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 16:36:03 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.40.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 default_pipe =
inline,remap,evaluate,costModel,coercions,emptySet,aliases,mitosis,mergetable,deadcode,commonTerms,joinPath,reorder,deadcode,reduce,dataflow,history,multiplex,garbageCollector
+# builtin opt minimal_pipe = inline,remap,deadcode,multiplex,garbageCollector
+# builtin opt sql_optimizer = default_pipe
+# 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 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/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 = 33705
+# cmdline opt xrpc_port = 47411
+# 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)
+
+# 16:36:04 >
+# 16:36:04 > mclient -lsql -ftest -i -e --host=alf --port=33705
+# 16:36:04 >
+
+
+# 16:36:04 >
+# 16:36:04 > Done.
+# 16:36:04 >
+
diff -r 81293e2793a5 -r 195a13507c2a
sql/src/test/BugTracker-2010/Tests/values.Bug-2726.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/values.Bug-2726.stable.out Wed Nov
24 19:01:28 2010 +0100
@@ -0,0 +1,52 @@
+stdout of test 'values.Bug-2726` in directory 'src/test/BugTracker-2010`
itself:
+
+
+# 16:36:03 >
+# 16:36:03 > 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=33705 --set
xrpc_port=47411 --set monet_prompt= --trace --forcemito --set mal_listing=2
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 16:36:03 >
+
+# 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.753 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
+#WARNING: LoaderException:loadLibrary:Loading error 'libmseed.so.2: cannot
open shared object file: No such file or directory' from within file 'vault'
+# Listening for connection requests on mapi:monetdb://alf.ins.cwi.nl:33705/
+# MonetDB/SQL module v2.40.0 loaded
+
+Ready.
+
+Over..
+
+# 16:36:04 >
+# 16:36:04 > mclient -lsql -ftest -i -e --host=alf --port=33705
+# 16:36:04 >
+
+#SELECT t0.a
+# FROM (VALUES (1), (3)) AS t0(a),
+# (VALUES (1), (3)) AS t1(b)
+# WHERE a = b;
+% .t0 # table_name
+% a # name
+% tinyint # type
+% 1 # length
+[ 1 ]
+[ 3 ]
+#SELECT a
+# FROM (VALUES (1), (3)) AS t0(a),
+# (VALUES (1), (3)) AS t1(b)
+# WHERE a = b;
+% .t0 # table_name
+% a # name
+% tinyint # type
+% 1 # length
+[ 1 ]
+[ 3 ]
+
+# 16:36:04 >
+# 16:36:04 > Done.
+# 16:36:04 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
