Changeset: 76be7701721b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=76be7701721b
Modified Files:
sql/src/server/rel_exp.mx
sql/src/server/rel_select.mx
sql/src/test/BugTracker-2010/Tests/All
Branch: default
Log Message:
Merge Niels rownum bugfix of Jun2010 into default
diffs (206 lines):
diff -r 36bf09df0b9c -r 76be7701721b sql/src/server/rel_exp.mx
--- a/sql/src/server/rel_exp.mx Thu Jul 29 13:26:07 2010 +0200
+++ b/sql/src/server/rel_exp.mx Thu Jul 29 13:37:44 2010 +0200
@@ -819,11 +819,11 @@
case e_func:
case e_aggr:
{
- int r = 1;
+ int r = (e->card == CARD_ATOM);
node *n;
list *l = e->l;
- if (l)
+ if (r && l)
for (n = l->h; n; n = n->next)
r &= exp_is_atom(n->data);
return r;
diff -r 36bf09df0b9c -r 76be7701721b sql/src/server/rel_select.mx
--- a/sql/src/server/rel_select.mx Thu Jul 29 13:26:07 2010 +0200
+++ b/sql/src/server/rel_select.mx Thu Jul 29 13:37:44 2010 +0200
@@ -4024,6 +4024,8 @@
return sql_error(sql, 02, "SELECT: function '%s' not found",
aggrstr );
/* now we need the gbe and obe lists */
e = exp_op(gbe, wf);
+ /* make sure the expression has the proper cardinality */
+ e->card = CARD_AGGR;
if (obe)
e->r = obe;
else /* e->r specifies window expression */
diff -r 36bf09df0b9c -r 76be7701721b sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/All Thu Jul 29 13:26:07 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/All Thu Jul 29 13:37:44 2010 +0200
@@ -37,3 +37,4 @@
LIMIT_OFFSET_big-endian.Bug-2622
decimal-function.BUG-2624
function_results_NULL.Bug-2626
+with_row_number_crash.Bug-2631
diff -r 36bf09df0b9c -r 76be7701721b
sql/src/test/BugTracker-2010/Tests/with_row_number_crash.Bug-2631.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/with_row_number_crash.Bug-2631.sql
Thu Jul 29 13:37:44 2010 +0200
@@ -0,0 +1,4 @@
+WITH t2 (i) AS (SELECT ROW_NUMBER () OVER (ORDER BY id ASC) AS i FROM tables)
select i from t2;
+
+WITH t (i) AS (SELECT ROW_NUMBER () OVER (ORDER BY id ASC) AS i FROM _tables)
select i from t;
+
diff -r 36bf09df0b9c -r 76be7701721b
sql/src/test/BugTracker-2010/Tests/with_row_number_crash.Bug-2631.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/BugTracker-2010/Tests/with_row_number_crash.Bug-2631.stable.err
Thu Jul 29 13:37:44 2010 +0200
@@ -0,0 +1,81 @@
+stderr of test 'with_row_number_crash.Bug-2631` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 08:42:26 >
+# 08:42:26 > 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=31497 --set
xrpc_port=46277 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 08:42:26 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.2
+# 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 = 31497
+# cmdline opt xrpc_port = 46277
+# 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)
+
+# 08:53:11 >
+# 08:53:11 > mclient -lsql -ftest -i -e --host=alf --port=38895
+# 08:53:11 >
+
+MAPI = mone...@alf:38895
+QUERY = WITH t (i) AS (SELECT ROW_NUMBER () OVER (ORDER BY id ASC) AS i FROM
_tables) select i from t;
+
+
+# 08:53:11 >
+# 08:53:11 > Done.
+# 08:53:11 >
+
diff -r 36bf09df0b9c -r 76be7701721b
sql/src/test/BugTracker-2010/Tests/with_row_number_crash.Bug-2631.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/BugTracker-2010/Tests/with_row_number_crash.Bug-2631.stable.out
Thu Jul 29 13:37:44 2010 +0200
@@ -0,0 +1,72 @@
+stdout of test 'with_row_number_crash.Bug-2631` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 08:42:26 >
+# 08:42:26 > 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=31497 --set
xrpc_port=46277 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 08:42:26 >
+
+# MonetDB server v5.20.4, based on kernel v1.38.2
+# 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.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:31497/
+# MonetDB/SQL module v2.38.4 loaded
+
+Ready.
+
+Over..
+
+# 08:53:11 >
+# 08:53:11 > mclient -lsql -ftest -i -e --host=alf --port=38895
+# 08:53:11 >
+
+#WITH t2 (i) AS (SELECT ROW_NUMBER () OVER (ORDER BY id ASC) AS i FROM tables)
select i from t2;
+% .t2 # table_name
+% i # name
+% int # type
+% 2 # length
+[ 1 ]
+[ 2 ]
+[ 3 ]
+[ 4 ]
+[ 5 ]
+[ 6 ]
+[ 7 ]
+[ 8 ]
+[ 9 ]
+[ 10 ]
+[ 11 ]
+[ 12 ]
+[ 13 ]
+[ 14 ]
+[ 15 ]
+[ 16 ]
+[ 17 ]
+[ 18 ]
+[ 19 ]
+[ 20 ]
+[ 21 ]
+[ 22 ]
+[ 23 ]
+[ 24 ]
+[ 25 ]
+[ 26 ]
+[ 27 ]
+[ 28 ]
+[ 29 ]
+[ 30 ]
+[ 31 ]
+[ 32 ]
+[ 33 ]
+[ 34 ]
+[ 35 ]
+[ 36 ]
+
+# 08:53:11 >
+# 08:53:11 > Done.
+# 08:53:11 >
+
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
