Changeset: 1ff7c18cd4ec for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1ff7c18cd4ec
Added Files:
sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.sql
sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.stable.err
sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.stable.out
Modified Files:
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_support.c
sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
sql/test/BugTracker-2013/Tests/All
tools/merovingian/ChangeLog.Feb2013
tools/merovingian/client/monetdb.c
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (truncated from 470 to 300 lines):
diff --git a/monetdb5/optimizer/opt_mergetable.c
b/monetdb5/optimizer/opt_mergetable.c
--- a/monetdb5/optimizer/opt_mergetable.c
+++ b/monetdb5/optimizer/opt_mergetable.c
@@ -22,8 +22,8 @@
typedef enum mat_type_t {
mat_none = 0, /* Simple mat aligned operations (ie batcalc etc) */
mat_grp = 1, /* result of phase one of a mat - group.new/derive */
- mat_ext = 2, /* after mat_grp the extend gets a mat.mirror */
- mat_cnt = 3, /* after mat_grp the extend gets a mat.mirror */
+ mat_ext = 2, /* mat_grp extend */
+ mat_cnt = 3, /* mat_grp count */
mat_tpn = 4, /* Phase one of topn on a mat */
mat_slc = 5, /* Last phase of topn (or just slice) on a mat */
mat_rdr = 6 /* Phase one of sorting, ie sorted the parts sofar */
@@ -258,7 +258,9 @@ static InstrPtr
mat_apply1(MalBlkPtr mb, InstrPtr p, mat_t *mat, int m, int var)
{
int tpe, k, is_select = isSubSelect(p), is_mirror = (getFunctionId(p)
== mirrorRef);
- InstrPtr r = NULL;
+ int is_identity = (getFunctionId(p) == identityRef && getModuleId(p) ==
batcalcRef);
+ int ident_var = 0;
+ InstrPtr r = NULL, q;
//printf("# %s.%s(%d)", getModuleId(p), getFunctionId(p), m);
@@ -268,13 +270,35 @@ mat_apply1(MalBlkPtr mb, InstrPtr p, mat
getArg(r, 0) = getArg(p,0);
tpe = getArgType(mb,p,0);
+ if (is_identity) {
+ q = newInstruction(mb, ASSIGNsymbol);
+ getArg(q, 0) = newTmpVariable(mb, TYPE_oid);
+ q->retc = 1;
+ q->argc = 1;
+ q = pushOid(mb, q, 0);
+ ident_var = getArg(q, 0);
+ pushInstruction(mb, q);
+ }
for(k=1; k < mat[m].mi->argc; k++) {
- InstrPtr q = copyInstruction(p);
+ q = copyInstruction(p);
getArg(q, 0) = newTmpVariable(mb, tpe);
- getArg(q, var) = getArg(mat[m].mi, k);
+ if (is_identity)
+ getArg(q, 1) = newTmpVariable(mb, TYPE_oid);
+ getArg(q, var+is_identity) = getArg(mat[m].mi, k);
+ if (is_identity) {
+ getArg(q, 3) = ident_var;
+ q->retc = 2;
+ q->argc = 4;
+ /* make sure to resolve again */
+ q->token = ASSIGNsymbol;
+ q->typechk = TYPE_UNKNOWN;
+ q->fcn = NULL;
+ q->blk = NULL;
+ }
+ ident_var = getArg(q, 1);
pushInstruction(mb, q);
- if (is_mirror) {
+ if (is_mirror || is_identity) {
propagateMirror(mb, getArg(mat[m].mi, k), getArg(q,0));
} else if (is_select)
propagatePartnr(mb, getArg(mat[m].mi, k), getArg(q,0),
k);
@@ -765,6 +789,44 @@ group_by_ext(mat_t *mat, int mtop, int g
return 0;
}
+/* In some cases we have non groupby attribute columns, these require
+ * gext.leftfetchjoin(mat.pack(per partition ext.leftfetchjoins(x)))
+ */
+
+static int
+mat_group_project(MalBlkPtr mb, InstrPtr p, mat_t *mat, int mtop, int e, int a)
+{
+ int tp = getArgType(mb,p,0), k;
+ int tail = getTailType(tp);
+ InstrPtr ai1 = newInstruction(mb, ASSIGNsymbol), r;
+
+ setModuleId(ai1,matRef);
+ setFunctionId(ai1,packRef);
+ getArg(ai1,0) = newTmpVariable(mb, tp);
+
+ assert(mat[e].mi->argc == mat[a].mi->argc);
+ for(k=1; k<mat[a].mi->argc; k++) {
+ InstrPtr q = copyInstruction(p);
+
+ getArg(q,0) = newTmpVariable(mb, tp);
+ getArg(q,1) = getArg(mat[e].mi,k);
+ getArg(q,2) = getArg(mat[a].mi,k);
+ pushInstruction(mb,q);
+
+ /* pack the result into a mat */
+ ai1 = pushArgument(mb,ai1,getArg(q,0));
+ }
+ pushInstruction(mb, ai1);
+
+ r = copyInstruction(p);
+ getArg(r,1) = mat[e].mv;
+ getArg(r,2) = getArg(ai1,0);
+ pushInstruction(mb,r);
+ if (tail == TYPE_oid)
+ mtop = mat_add_var(mat, mtop, ai1, r, getArg(r, 0), mat_ext,
-1, -1);
+ return mtop;
+}
+
/* Per partition aggregates are merged and aggregated together. For
* most (handled) aggregates thats relatively simple. AVG is somewhat
* more complex. */
@@ -1468,7 +1530,11 @@ OPTmergetableImplementation(Client cntxt
(m=is_a_mat(getArg(p,1), mat, mtop)) >= 0 &&
(n=is_a_mat(getArg(p,2), mat, mtop)) >= 0 &&
(mat[m].type == mat_ext || mat[n].type == mat_grp)) {
- pushInstruction(mb, copyInstruction(p));
+ assert(mat[m].pushed);
+ if (!mat[n].pushed)
+ mtop = mat_group_project(mb, p, mat, mtop, m,
n);
+ else
+ pushInstruction(mb, copyInstruction(p));
continue;
}
diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -831,6 +831,7 @@ int isMapOp(InstrPtr p){
(getModuleId(p)== batcalcRef && getFunctionId(p) != mark_grpRef
&& getFunctionId(p) != rank_grpRef) ||
(getModuleId(p)== batmtimeRef) ||
(getModuleId(p)== batstrRef) ||
+ (getModuleId(p)== batmmathRef) ||
(getModuleId(p)== mkeyRef);
}
diff --git
a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
--- a/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
+++ b/sql/test/BugTracker-2011/Tests/func_iter_vs_bulk.Bug-2826.stable.out
@@ -36,16 +36,16 @@ Ready.
% 90 # length
function user.s5_1{autoCommit=true}(A0:flt):void;
X_3 := sql.mvc();
- X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","tab_2826");
X_7 := sql.bind(X_3,"sys","tab_2826","d",0);
(X_10,r1_10) := sql.bind(X_3,"sys","tab_2826","d",2);
X_13 := sql.bind(X_3,"sys","tab_2826","d",1);
X_15 := sql.delta(X_7,X_10,r1_10,X_13);
- X_16 := algebra.leftfetchjoin(X_4,X_15);
+ X_16 := X_15;
X_17 := batcalc.flt(X_16);
- X_40 := batmmath.log10(X_17);
- X_18 := algebra.thetasubselect(X_40,A0,">");
- X_20 := algebra.leftfetchjoin(X_18,X_16);
+ X_37 := batmmath.log10(X_17);
+ X_4:bat[:oid,:oid] := sql.tid(X_3,"sys","tab_2826");
+ X_18 := algebra.thetasubselect(X_37,X_4,A0,">");
+ X_20 := sql.projectdelta(X_18,X_7,X_10,r1_10,X_13);
X_21 := sql.resultSet(1,1,X_20);
sql.rsColumn(X_21,"sys.tab_2826","d","double",53,0,X_20);
X_26 := io.stdout();
diff --git a/sql/test/BugTracker-2013/Tests/All
b/sql/test/BugTracker-2013/Tests/All
--- a/sql/test/BugTracker-2013/Tests/All
+++ b/sql/test/BugTracker-2013/Tests/All
@@ -27,3 +27,4 @@ prepare-smallint.Bug-3297
psm_functions_and_accessrights.Bug-3300
decimal-cast.Bug-3310
hashed_exp.Bug-3313
+mitosis-floor.Bug-3330
diff --git a/sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.sql
b/sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.sql
@@ -0,0 +1,26 @@
+create table error (x int, y int, intensity int);
+copy 2 records into error from stdin delimiters ',','\n';
+1,2,3
+4,5,6
+
+select
+ tilex,
+ tiley,
+ intensity,
+ count(*) as count
+from (
+ select
+ floor(x/16) as tilex,
+ floor(y/16) as tiley,
+ intensity
+ from
+ error
+) as image
+group by
+ tilex,
+ tiley,
+ intensity
+;
+
+
+drop table error;
diff --git a/sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.stable.err
b/sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.stable.err
@@ -0,0 +1,35 @@
+stderr of test 'mitosis-floor.Bug-3330` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 20:31:24 >
+# 20:31:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38400" "--set"
"mapi_usock=/var/tmp/mtest-25950/.s.monetdb.38400" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 20:31:24 >
+
+# builtin opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = yes
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 38400
+# cmdline opt mapi_usock = /var/tmp/mtest-25950/.s.monetdb.38400
+# cmdline opt monet_prompt =
+# cmdline opt mal_listing = 2
+# cmdline opt gdk_dbpath =
/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013
+# cmdline opt mal_listing = 0
+
+# 20:31:25 >
+# 20:31:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25950" "--port=38400"
+# 20:31:25 >
+
+
+# 20:31:25 >
+# 20:31:25 > "Done."
+# 20:31:25 >
+
diff --git a/sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.stable.out
b/sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2013/Tests/mitosis-floor.Bug-3330.stable.out
@@ -0,0 +1,63 @@
+stdout of test 'mitosis-floor.Bug-3330` in directory
'sql/test/BugTracker-2013` itself:
+
+
+# 20:31:24 >
+# 20:31:24 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=38400" "--set"
"mapi_usock=/var/tmp/mtest-25950/.s.monetdb.38400" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_test_BugTracker-2013"
"--set" "mal_listing=0"
+# 20:31:24 >
+
+# MonetDB 5 server v11.15.12
+# This is an unreleased version
+# Serving database 'mTests_sql_test_BugTracker-2013', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.775 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2013 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:38400/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-25950/.s.monetdb.38400
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 20:31:25 >
+# 20:31:25 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25950" "--port=38400"
+# 20:31:25 >
+
+#create table error (x int, y int, intensity int);
+#copy 2 records into error from stdin delimiters ',','\n';
+#1,2,3
+#4,5,6
+#
+[ 2 ]
+#select
+# tilex,
+# tiley,
+# intensity,
+# count(*) as count
+#from (
+# select
+# floor(x/16) as tilex,
+# floor(y/16) as tiley,
+# intensity
+# from
+# error
+#) as image
+#group by
+# tilex,
+# tiley,
+# intensity
+#;
+% sys.image, sys.image, sys.image, sys.L1 # table_name
+% tilex, tiley, intensity, count # name
+% real, real, int, wrd # type
+% 15, 15, 1, 1 # length
+[ 0, 0, 3, 1 ]
+[ 0, 0, 6, 1 ]
+#drop table error;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
