Changeset: 3bb99f7adc70 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3bb99f7adc70
Modified Files:
sql/src/server/rel_bin.c
sql/src/server/rel_dump.c
sql/src/server/rel_optimizer.c
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (254 lines):
diff -r 2c9d965a279a -r 3bb99f7adc70 MonetDB5/src/optimizer/opt_datacyclotron.mx
--- a/MonetDB5/src/optimizer/opt_datacyclotron.mx Mon Oct 11 16:00:37
2010 +0200
+++ b/MonetDB5/src/optimizer/opt_datacyclotron.mx Tue Oct 12 09:27:07
2010 +0200
@@ -240,11 +240,11 @@
OPTdatacyclotronImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p)
{
int i=0, actions=0, k=0, z=0, j=0, num_regs=DCYREGS, *tpes=NULL;
- DCYcatalog **regs, *reg = NULL;
+ DCYcatalog **regs=NULL, *reg = NULL;
VarRecord low,hgh,max_hgh;
InstrPtr *old, new, matq;
int limit;
- int (*newArg)[1000];
+ int (*newArg)[1000]=NULL;
char *used = NULL;
(void) stk;
(void) cntxt;
diff -r 2c9d965a279a -r 3bb99f7adc70 sql/src/include/sql_relation.h
--- a/sql/src/include/sql_relation.h Mon Oct 11 16:00:37 2010 +0200
+++ b/sql/src/include/sql_relation.h Tue Oct 12 09:27:07 2010 +0200
@@ -212,9 +212,9 @@
/* limit including or excluding bounds (relations only) */
#define need_including(r) \
((r->flag&TOPN_INCLUDING))
-#define set_including(e) \
+#define set_including(r) \
r->flag |= TOPN_INCLUDING
-#define set_excluding(e) \
+#define set_excluding(r) \
r->flag &= (~TOPN_INCLUDING)
/* used for expressions and relations */
diff -r 2c9d965a279a -r 3bb99f7adc70 sql/src/server/rel_bin.c
--- a/sql/src/server/rel_bin.c Mon Oct 11 16:00:37 2010 +0200
+++ b/sql/src/server/rel_bin.c Tue Oct 12 09:27:07 2010 +0200
@@ -1576,7 +1576,7 @@
if (topn && rel->r) {
list *oexps = rel->r, *npl = create_stmt_list();
/* including bounds, topn returns atleast N */
- int including = need_distinct(rel);
+ int including = need_including(topn) || need_distinct(rel);
stmt *limit = NULL;
for (n=oexps->h; n; n = n->next) {
@@ -1931,6 +1931,8 @@
if (n) {
stmt *limit = NULL;
+ sql_rel *rl = rel->l;
+ int including = (rl && need_distinct(rl)) ||
need_including(rel);
if (le)
l = exp_bin(sql, le, NULL, NULL, NULL, NULL);
@@ -1943,14 +1945,14 @@
o = stmt_atom_wrd(0);
if (order) {
- limit = stmt_limit(stmt_dup(order), o, l,
LIMIT_DIRECTION(0,0,need_including(rel)));
+ limit = stmt_limit(stmt_dup(order), o, l,
LIMIT_DIRECTION(0,0,including));
} else {
stmt *sc = stmt_dup(n->data);
char *cname = column_name(sc);
char *tname = table_name(sc);
sc = column(sc);
- limit = stmt_limit(stmt_alias(sc, tname, cname), o, l,
LIMIT_DIRECTION(0,0,need_including(rel)));
+ limit = stmt_limit(stmt_alias(sc, tname, cname), o, l,
LIMIT_DIRECTION(0,0,including));
}
limit = stmt_mirror(limit);
diff -r 2c9d965a279a -r 3bb99f7adc70 sql/src/server/rel_dump.c
--- a/sql/src/server/rel_dump.c Mon Oct 11 16:00:37 2010 +0200
+++ b/sql/src/server/rel_dump.c Tue Oct 12 09:27:07 2010 +0200
@@ -355,6 +355,8 @@
if (rel->l) {
if (need_distinct(rel))
mnstr_printf(fout, "distinct ");
+ if (need_including(rel))
+ mnstr_printf(fout, "including ");
mnstr_printf(fout, "%s (", r);
if (rel_is_ref(rel->l)) {
int nr = find_ref(refs, rel->l);
diff -r 2c9d965a279a -r 3bb99f7adc70 sql/src/server/rel_optimizer.c
--- a/sql/src/server/rel_optimizer.c Mon Oct 11 16:00:37 2010 +0200
+++ b/sql/src/server/rel_optimizer.c Tue Oct 12 09:27:07 2010 +0200
@@ -1293,9 +1293,13 @@
}
}
if (r && is_project(r->op) && !(rel_is_ref(r)) && !r->r &&
r->l) {
- r->l = rel_topn( r->l, sum_limit_offset(rel->exps));
- r = r->l; /* topn */
- r = r->l; /* under project */
+ int distinct = need_distinct(r);
+ sql_rel *t = rel_topn( r->l,
sum_limit_offset(rel->exps));
+
+ if (distinct)
+ set_including(t);
+ r->l = t; /* topn */
+ r = t->l; /* under project */
}
/* push topn under crossproduct */
diff -r 2c9d965a279a -r 3bb99f7adc70 sql/src/test/BugTracker-2010/Tests/All
--- a/sql/src/test/BugTracker-2010/Tests/All Mon Oct 11 16:00:37 2010 +0200
+++ b/sql/src/test/BugTracker-2010/Tests/All Tue Oct 12 09:27:07 2010 +0200
@@ -64,3 +64,4 @@
between-crash.Bug-2672
select-view-key.Bug-2673
select-distinct-limit.Bug-2676
+substring_display_width.Bug-2683
diff -r 2c9d965a279a -r 3bb99f7adc70
sql/src/test/BugTracker-2010/Tests/select-distinct-limit.Bug-2676.stable.out
---
a/sql/src/test/BugTracker-2010/Tests/select-distinct-limit.Bug-2676.stable.out
Mon Oct 11 16:00:37 2010 +0200
+++
b/sql/src/test/BugTracker-2010/Tests/select-distinct-limit.Bug-2676.stable.out
Tue Oct 12 09:27:07 2010 +0200
@@ -58,8 +58,8 @@
% id # name
% int # type
% 1 # length
-[ 1 ]
-[ 2 ]
+[ 4 ]
+[ 3 ]
#rollback;
# 17:16:58 >
diff -r 2c9d965a279a -r 3bb99f7adc70
sql/src/test/BugTracker-2010/Tests/substring_display_width.Bug-2683.sql
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sql/src/test/BugTracker-2010/Tests/substring_display_width.Bug-2683.sql
Tue Oct 12 09:27:07 2010 +0200
@@ -0,0 +1,1 @@
+select substring('123456789', 1, 3);
diff -r 2c9d965a279a -r 3bb99f7adc70
sql/src/test/BugTracker-2010/Tests/substring_display_width.Bug-2683.stable.err
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/BugTracker-2010/Tests/substring_display_width.Bug-2683.stable.err
Tue Oct 12 09:27:07 2010 +0200
@@ -0,0 +1,79 @@
+stderr of test 'substring_display_width.Bug-2683` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 21:48:05 >
+# 21:48:05 > 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=30286 --set
xrpc_port=49583 --set monet_prompt= --trace --forcemito --set mal_listing=2
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 21:48:05 >
+
+# 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 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 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 = 30286
+# cmdline opt xrpc_port = 49583
+# 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)
+
+# 21:48:05 >
+# 21:48:05 > mclient -lsql -ftest -i -e --host=alf --port=30286
+# 21:48:05 >
+
+
+# 21:48:05 >
+# 21:48:05 > Done.
+# 21:48:05 >
+
diff -r 2c9d965a279a -r 3bb99f7adc70
sql/src/test/BugTracker-2010/Tests/substring_display_width.Bug-2683.stable.out
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++
b/sql/src/test/BugTracker-2010/Tests/substring_display_width.Bug-2683.stable.out
Tue Oct 12 09:27:07 2010 +0200
@@ -0,0 +1,38 @@
+stdout of test 'substring_display_width.Bug-2683` in directory
'src/test/BugTracker-2010` itself:
+
+
+# 21:48:05 >
+# 21:48:05 > 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=30286 --set
xrpc_port=49583 --set monet_prompt= --trace --forcemito --set mal_listing=2
"--dbname=mTests_src_test_BugTracker-2010" --set mal_listing=0 ; echo ; echo
Over..
+# 21:48:05 >
+
+# 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:30286/
+# MonetDB/SQL module v2.40.0 loaded
+
+Ready.
+
+Over..
+
+# 21:48:05 >
+# 21:48:05 > mclient -lsql -ftest -i -e --host=alf --port=30286
+# 21:48:05 >
+
+#select substring('123456789', 1, 3);
+% . # table_name
+% substring_single_value # name
+% char # type
+% 9 # length
+[ "123" ]
+
+# 21:48:05 >
+# 21:48:05 > Done.
+# 21:48:05 >
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
