Changeset: 72c034ea5f47 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72c034ea5f47
Modified Files:
sql/src/backends/monet5/sql.mx
sql/src/server/rel_select.mx
sql/src/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.err
sql/src/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.out
Branch: Jun2010
Log Message:
back ported fixes for rank test
approved output for rank test
diffs (171 lines):
diff -r 480c1c2c0808 -r 72c034ea5f47 sql/src/backends/monet5/sql.mx
--- a/sql/src/backends/monet5/sql.mx Sun Jul 04 19:26:15 2010 +0200
+++ b/sql/src/backends/monet5/sql.mx Sun Jul 04 20:17:49 2010 +0200
@@ -4824,8 +4824,9 @@
if( (b = BATdescriptor(*bid)) == NULL )
throw(SQL, "s...@1rank", "Cannot access descriptor");
- if (BATtordered(b) != GDK_SORTED)
+ if (!(BATtordered(b) & GDK_SORTED) && !(BATtordered(b) &
GDK_SORTED_REV))
throw(SQL, "s...@1rank", "bat not sorted");
+
bi = bat_iterator(b);
cmp = BATatoms[b->ttype].atomCmp;
cur = BUNtail(bi, BUNfirst(b));
diff -r 480c1c2c0808 -r 72c034ea5f47 sql/src/server/rel_select.mx
--- a/sql/src/server/rel_select.mx Sun Jul 04 19:26:15 2010 +0200
+++ b/sql/src/server/rel_select.mx Sun Jul 04 20:17:49 2010 +0200
@@ -724,8 +724,11 @@
static sql_rel*
rel_parent( sql_rel *rel )
{
- if (is_project(rel->op) || rel->op == op_topn)
- return rel->l;
+ if (is_project(rel->op) || rel->op == op_topn) {
+ sql_rel *l = rel->l;
+ if (is_project(l->op))
+ return l;
+ }
return rel;
}
@@ -1335,6 +1338,9 @@
char *tname = NULL, name[16], *nme;
nme = number2name(name, 16, nr);
+
+ if (!sq)
+ return NULL;
if (query->data.lval->h->next->data.sym) {
tname =
query->data.lval->h->next->data.sym->data.lval->h->data.sval;
diff -r 480c1c2c0808 -r 72c034ea5f47
sql/src/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.err
--- a/sql/src/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.err
Sun Jul 04 19:26:15 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.err
Sun Jul 04 20:17:49 2010 +0200
@@ -1,1 +1,78 @@
-When the bug is fixed, output can be provided.
+stderr of test 'rank-over-crash.SF-2926454` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 20:16:19 >
+# 20:16:19 > 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=31389 --set
xrpc_port=40697 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 20:16:19 >
+
+# builtin opt gdk_arch = 64bitx86_64-unknown-linux-gnu
+# builtin opt gdk_version = 1.38.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 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 = 31389
+# cmdline opt xrpc_port = 40697
+# 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)
+
+# 20:16:19 >
+# 20:16:19 > mclient -lsql -ftest -i -e --host=alf --port=31389
+# 20:16:19 >
+
+
+# 20:16:19 >
+# 20:16:19 > Done.
+# 20:16:19 >
+
diff -r 480c1c2c0808 -r 72c034ea5f47
sql/src/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.out
--- a/sql/src/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.out
Sun Jul 04 19:26:15 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/rank-over-crash.SF-2926454.stable.out
Sun Jul 04 20:17:49 2010 +0200
@@ -1,1 +1,42 @@
-When the bug is fixed, output can be provided.
+stdout of test 'rank-over-crash.SF-2926454` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 20:16:19 >
+# 20:16:19 > 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=31389 --set
xrpc_port=40697 --set monet_prompt= --set mal_listing=2 --trace
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 20:16:19 >
+
+# MonetDB server v5.20.0, based on kernel v1.38.0
+# 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:31389/
+# MonetDB/SQL module v2.38.0 loaded
+
+Ready.
+
+Over..
+
+# 20:16:19 >
+# 20:16:19 > mclient -lsql -ftest -i -e --host=alf --port=31389
+# 20:16:19 >
+
+[ 1 ]
+[ 1 ]
+[ 1 ]
+[ 1 ]
+[ 1 ]
+#select
+% sys.score_table, sys.score_table, . # table_name
+% s_name, totalscore, rank_L5 # name
+% varchar, bigint, int # type
+% 3, 3, 1 # length
+[ "foo", 180, 1 ]
+[ "bar", 120, 2 ]
+
+# 20:16:19 >
+# 20:16:19 > Done.
+# 20:16:19 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
