Changeset: da0bcb4d1f6b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da0bcb4d1f6b
Added Files:
sql/server/rel_partition.c
sql/server/rel_partition.h
sql/test/BugTracker-2016/Tests/create_table_from_complex_query.Bug-3921.stable.err
sql/test/BugTracker-2016/Tests/create_table_from_complex_query.Bug-3921.stable.out
Modified Files:
clients/mapiclient/stethoscope.c
gdk/gdk_project.c
geom/sql/Tests/conformance_load.stable.out
monetdb5/ChangeLog.Jul2015
monetdb5/mal/Tests/dynamicload.stable.err
monetdb5/mal/Tests/tst903.stable.out
monetdb5/mal/Tests/tst904.stable.out
monetdb5/mal/Tests/tst905.stable.out
monetdb5/mal/Tests/tst907.stable.out
monetdb5/modules/mal/Tests/manifold.stable.out
monetdb5/modules/mal/Tests/manifoldstr.stable.out
monetdb5/optimizer/Tests/JPexample.stable.out
monetdb5/optimizer/Tests/Mexample.stable.out
monetdb5/optimizer/Tests/inline04.stable.out
monetdb5/optimizer/Tests/inline07.stable.out
monetdb5/optimizer/Tests/inline09.stable.out
monetdb5/optimizer/Tests/inline10.stable.out
monetdb5/optimizer/Tests/inlineFunction2.stable.out
monetdb5/optimizer/Tests/manifold2.stable.out
monetdb5/optimizer/Tests/manifold2.stable.out.single
monetdb5/optimizer/Tests/projectionchain.stable.out
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_multiplex.c
monetdb5/optimizer/opt_pushselect.c
sql/backends/monet5/Tests/rapi12.stable.out
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_optimizer.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/vaults/bam/Tests/query2.5.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.5.stable.out.int128
sql/backends/monet5/vaults/bam/Tests/query2.6.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out
sql/benchmarks/ssbm/Tests/04-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/05-explain.stable.out
sql/benchmarks/ssbm/Tests/05-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/06-explain.stable.out
sql/benchmarks/ssbm/Tests/06-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/07-explain.stable.out
sql/benchmarks/ssbm/Tests/07-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/08-explain.stable.out
sql/benchmarks/ssbm/Tests/08-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/09-explain.stable.out
sql/benchmarks/ssbm/Tests/09-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/10-explain.stable.out
sql/benchmarks/ssbm/Tests/10-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/11-explain.stable.out
sql/benchmarks/ssbm/Tests/11-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/12-explain.stable.out
sql/benchmarks/ssbm/Tests/12-explain.stable.out.int128
sql/benchmarks/ssbm/Tests/13-explain.stable.out
sql/benchmarks/ssbm/Tests/13-explain.stable.out.int128
sql/benchmarks/tpch/Tests/02-explain.stable.out
sql/benchmarks/tpch/Tests/02-plan.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/03-explain.stable.out.int128
sql/benchmarks/tpch/Tests/05-explain.stable.out.int128
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out.int128
sql/benchmarks/tpch/Tests/08-explain.stable.out.int128
sql/benchmarks/tpch/Tests/09-explain.stable.out.int128
sql/benchmarks/tpch/Tests/10-explain.stable.out.int128
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/17-plan.stable.out
sql/benchmarks/tpch/Tests/17-plan.stable.out.int128
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/19-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-plan.stable.out
sql/benchmarks/tpch/Tests/20-plan.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/21-plan.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
sql/include/sql_relation.h
sql/server/Makefile.ag
sql/server/rel_exp.c
sql/server/rel_optimizer.c
sql/server/rel_rel.c
sql/test/BugTracker-2013/Tests/correlated_select.Bug-3250.stable.out
sql/test/BugTracker-2014/Tests/nil_2dec_lng.Bug-3592.stable.out
sql/test/BugTracker-2015/Tests/ambiguous.Bug-3803.stable.out.int128
sql/test/BugTracker-2015/Tests/apply_merge_distinct.Bug-3760.stable.out
sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
sql/test/BugTracker-2015/Tests/div_zero.Bug-3742.stable.out
sql/test/BugTracker-2015/Tests/missed-error.Bug-3842.stable.out
sql/test/BugTracker-2015/Tests/msqldump-merge-and-remote-tables.Bug-3774.stable.out
sql/test/BugTracker-2015/Tests/msqldump_generates_incorrect_syntax_ON_UPDATE_null.Bug-3839.stable.out
sql/test/BugTracker-2015/Tests/reserved_keywords.Bug-3613.stable.out
sql/test/BugTracker-2015/Tests/sys_tracelog.Bug-3887.stable.out
sql/test/BugTracker-2016/Tests/DISTINCT_with_correlated_scalar_subquery_crashes_mserver.Bug-3920.stable.out
sql/test/BugTracker-2016/Tests/projectionpath-prefix.Bug.stable.out
sql/test/BugTracker-2016/Tests/storagemodel.Bug-3923.stable.out
sql/test/bugs/Tests/apply_with_union_assertion.stable.out
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/remote/Tests/partition_elim.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
sql/test/testdb-upgrade-hge/Tests/dump.stable.out
Branch: embedded
Log Message:
merge with default
diffs (truncated from 4378 to 300 lines):
diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -525,14 +525,18 @@ BATprojectchain(BAT **bats)
/* only dense-tailed BATs before last: we can return a
* slice and manipulate offsets and head seqbase */
ALGODEBUG fprintf(stderr, "#BATprojectchain with %d BATs, size
"BUNFMT", type %s, using BATslice("BUNFMT","BUNFMT")\n", n, cnt, ATOMname(tpe),
off, off + cnt);
- bn = BATslice(b, off, off + cnt);
- if (bn == NULL) {
- GDKfree(ba);
- return NULL;
+ if (BATtdense(b)) {
+ bn = BATdense(hseq, tseq, cnt);
+ } else {
+ bn = BATslice(b, off, off + cnt);
+ if (bn == NULL) {
+ GDKfree(ba);
+ return NULL;
+ }
+ BATseqbase(bn, hseq);
+ if (bn->ttype == TYPE_void)
+ BATseqbase(BATmirror(bn), tseq);
}
- BATseqbase(bn, hseq);
- if (bn->ttype == TYPE_void)
- BATseqbase(BATmirror(bn), tseq);
GDKfree(ba);
return bn;
}
diff --git a/geom/sql/Tests/conformance_load.stable.out
b/geom/sql/Tests/conformance_load.stable.out
--- a/geom/sql/Tests/conformance_load.stable.out
+++ b/geom/sql/Tests/conformance_load.stable.out
@@ -20,30 +20,6 @@ stdout of test 'conformance_load` in dir
# MonetDB/SQL module loaded
Ready.
-#WARNING To speedup geom.Dimension a bulk operator implementation is needed
-#WARNING To speedup geom.AsText a bulk operator implementation is needed
-#WARNING To speedup geom.SRID a bulk operator implementation is needed
-#WARNING To speedup geom.IsEmpty a bulk operator implementation is needed
-#WARNING To speedup geom.IsSimple a bulk operator implementation is needed
-#WARNING To speedup geom.Length a bulk operator implementation is needed
-#WARNING To speedup geom.Area a bulk operator implementation is needed
-#WARNING To speedup geom.Length a bulk operator implementation is needed
-#WARNING To speedup geom.Area a bulk operator implementation is needed
-#WARNING To speedup geom.Equals a bulk operator implementation is needed
-#WARNING To speedup geom.Disjoint a bulk operator implementation is needed
-#WARNING To speedup geom.Touches a bulk operator implementation is needed
-#WARNING To speedup geom.Within a bulk operator implementation is needed
-#WARNING To speedup geom.Overlaps a bulk operator implementation is needed
-#WARNING To speedup geom.Contains a bulk operator implementation is needed
-#WARNING To speedup geom.Relate a bulk operator implementation is needed
-#WARNING To speedup geom.Intersection a bulk operator implementation is needed
-#WARNING To speedup geom.AsText a bulk operator implementation is needed
-#WARNING To speedup geom.Difference a bulk operator implementation is needed
-#WARNING To speedup geom.AsText a bulk operator implementation is needed
-#WARNING To speedup geom.SymDifference a bulk operator implementation is needed
-#WARNING To speedup geom.AsText a bulk operator implementation is needed
-#WARNING To speedup geom.ConvexHull a bulk operator implementation is needed
-#WARNING To speedup geom.AsText a bulk operator implementation is needed
# 14:27:16 >
# 14:27:16 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-17423" "--port=30565"
diff --git a/monetdb5/ChangeLog.Jul2015 b/monetdb5/ChangeLog.Jul2015
--- a/monetdb5/ChangeLog.Jul2015
+++ b/monetdb5/ChangeLog.Jul2015
@@ -1,3 +1,7 @@
# ChangeLog file for MonetDB5
# This file is updated with Maddlog
+* Tue Sep 8 2015 Martin Kersten <[email protected]>
+- Fixed potential crash in MAL debugger when accessing BATs by
+ index. Functionality dropped as it is also a security leak.
+
diff --git a/monetdb5/mal/Tests/dynamicload.stable.err
b/monetdb5/mal/Tests/dynamicload.stable.err
--- a/monetdb5/mal/Tests/dynamicload.stable.err
+++ b/monetdb5/mal/Tests/dynamicload.stable.err
@@ -80,7 +80,7 @@ stderr of test 'dynamicload` in director
# 13:21:38 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-18020" "--port=37961"
# 13:21:38 >
-MAPI = (monetdb) /var/tmp/mtest-16561/.s.monetdb.38261
+MAPI = (monetdb) /var/tmp/mtest-30911/.s.monetdb.34033
QUERY = # examples of non-bindable instructions
#load unknown library
@@ -93,7 +93,7 @@ QUERY = # examples of non-bindable instr
wrong();
ERROR = !TypeException:user.main[3]:object code for command user.wrong missing
!TypeException:user.main[3]:'user.wrong' undefined in:
user.wrong();
-
+
# 13:26:24 >
# 13:26:24 > "Done."
# 13:26:24 >
diff --git a/monetdb5/mal/Tests/tst903.stable.out
b/monetdb5/mal/Tests/tst903.stable.out
--- a/monetdb5/mal/Tests/tst903.stable.out
+++ b/monetdb5/mal/Tests/tst903.stable.out
@@ -20,10 +20,6 @@ stdout of test 'tst903` in directory 'mo
# MonetDB/R module loaded
Ready.
-#WARNING To speedup calc.+ a bulk operator implementation is needed
-# x:bat[:oid,:lng] := mal.multiplex("calc":str,"+":str,b:any,c:any);
-#WARNING To speedup calc.+ a bulk operator implementation is needed
-# x:bat[:oid,:lng] :=
mal.multiplex("calc":str,"+":str,b:bat[:oid,:lng],c:bat[:oid,:lng]);
#mdb.list("user","foo");
diff --git a/monetdb5/mal/Tests/tst904.stable.out
b/monetdb5/mal/Tests/tst904.stable.out
--- a/monetdb5/mal/Tests/tst904.stable.out
+++ b/monetdb5/mal/Tests/tst904.stable.out
@@ -24,10 +24,6 @@ stdout of test 'tst904` in directory 'mo
# MonetDB/R module loaded
Ready.
-#WARNING To speedup calc.+ a bulk operator implementation is needed
-# xz:bat[:oid,:lng] := mal.multiplex("calc":str,"+":str,b:any,c:any);
-#WARNING To speedup calc.+ a bulk operator implementation is needed
-# xz:bat[:oid,:lng] :=
mal.multiplex("calc":str,"+":str,b:bat[:oid,:lng],c:int);
# 22:45:39 >
# 22:45:39 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7101" "--port=34631"
diff --git a/monetdb5/mal/Tests/tst905.stable.out
b/monetdb5/mal/Tests/tst905.stable.out
--- a/monetdb5/mal/Tests/tst905.stable.out
+++ b/monetdb5/mal/Tests/tst905.stable.out
@@ -24,10 +24,6 @@ stdout of test 'tst905` in directory 'mo
# MonetDB/R module loaded
Ready.
-#WARNING To speedup calc.+ a bulk operator implementation is needed
-# x:bat[:oid,:lng] := mal.multiplex("calc":str,"+":str,b:any,c:any);
-#WARNING To speedup calc.+ a bulk operator implementation is needed
-# x:bat[:oid,:lng] :=
mal.multiplex("calc":str,"+":str,b:bat[:oid,:lng],c:bat[:oid,:lng]);
# 22:45:39 >
# 22:45:39 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7101" "--port=34631"
diff --git a/monetdb5/mal/Tests/tst907.stable.out
b/monetdb5/mal/Tests/tst907.stable.out
--- a/monetdb5/mal/Tests/tst907.stable.out
+++ b/monetdb5/mal/Tests/tst907.stable.out
@@ -24,12 +24,6 @@ stdout of test 'tst907` in directory 'mo
# MonetDB/R module loaded
Ready.
-#WARNING To speedup user.three a bulk operator implementation is needed
-# z:bat[:oid,:int] :=
mal.multiplex("user":str,"three":str,b:any,2:int,3:int);
-#WARNING To speedup user.three a bulk operator implementation is needed
-#WARNING To speedup user.one a bulk operator implementation is needed
-#WARNING To speedup user.pow a bulk operator implementation is needed
-# z:bat[:oid,:int] :=
mal.multiplex("user":str,"pow":str,b:bat[:oid,:int],2:int);
# 22:45:40 >
# 22:45:40 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7101" "--port=34631"
diff --git a/monetdb5/optimizer/Tests/JPexample.stable.out
b/monetdb5/optimizer/Tests/JPexample.stable.out
--- a/monetdb5/optimizer/Tests/JPexample.stable.out
+++ b/monetdb5/optimizer/Tests/JPexample.stable.out
@@ -31,17 +31,7 @@ Ready.
#mdb.List("user","foo");
function user.foo():void; #[0] 0
- a:bat[:oid] := bat.new(:oid,:oid); #[1] CMDBATnew 1 <- 2 2
- b:bat[:oid] := bat.new(:oid,:oid); #[2] CMDBATnew 3 <- 2 2
- c:bat[:oid] := bat.new(:oid,:oid); #[3] CMDBATnew 4 <- 2 2
- d:bat[:oid] := bat.new(:oid,:oid); #[4] CMDBATnew 5 <- 2 2
- j1:bat[:oid] := algebra.projection(a:bat[:oid],b:bat[:oid]); #[5]
ALGprojection 6 <- 1 3
- X_11:bat[:oid] :=
algebra.projectionpath(a:bat[:oid],b:bat[:oid],c:bat[:oid]); #[6]
ALGprojectionpath 11 <- 1 3 4
- j2:bat[:oid] := X_11:bat[:oid]; #[7] 7 <- 11
- j3:bat[:any] := algebra.projectionpath(X_11:bat[:oid],d:bat[:oid]);
#[8] ALGprojectionpath 8 <- 11 5
- j4:bat[:any] := X_11:bat[:oid]; #[9] 9 <- 11
- j5:bat[:oid] := algebra.projectionpath(X_11:bat[:oid],b:bat[:oid]);
#[10] ALGprojectionpath 10 <- 11 3
-end user.foo; #[11]
+end user.foo; #[1]
# 06:41:06 >
# 06:41:06 > "Done."
diff --git a/monetdb5/optimizer/Tests/Mexample.stable.out
b/monetdb5/optimizer/Tests/Mexample.stable.out
--- a/monetdb5/optimizer/Tests/Mexample.stable.out
+++ b/monetdb5/optimizer/Tests/Mexample.stable.out
@@ -22,10 +22,6 @@ stdout of test 'Mexample` in directory '
# MonetDB/R module loaded
Ready.
-#WARNING To speedup calc.+ a bulk operator implementation is needed
-# c:bat[:oid,:int] := mal.multiplex("calc":str,"+":str,b:any,1:int);
-#WARNING To speedup calc.+ a bulk operator implementation is needed
-# c:bat[:oid,:int] :=
mal.multiplex("calc":str,"+":str,b:bat[:oid,:int],1:int);
# 15:36:19 >
# 15:36:19 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27236" "--port=37175"
diff --git a/monetdb5/optimizer/Tests/inline04.stable.out
b/monetdb5/optimizer/Tests/inline04.stable.out
--- a/monetdb5/optimizer/Tests/inline04.stable.out
+++ b/monetdb5/optimizer/Tests/inline04.stable.out
@@ -24,12 +24,6 @@ stdout of test 'inline04` in directory '
# MonetDB/R module loaded
Ready.
-#WARNING To speedup user.foo a bulk operator implementation is needed
-# z:bat[:oid,:int] := mal.multiplex("user":str,"foo":str,b:any,b:any);
-#WARNING To speedup user.foo a bulk operator implementation is needed
-# z:bat[:oid,:int] :=
mal.multiplex("user":str,"foo":str,b:bat[:oid,:int],b:bat[:oid,:int]);
-#WARNING To speedup user.foo a bulk operator implementation is needed
-# z:bat[:oid,:int] :=
mal.multiplex("user":str,"foo":str,b:bat[:oid,:int],2:int);
# 15:49:03 >
# 15:49:03 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-29846" "--port=34870"
diff --git a/monetdb5/optimizer/Tests/inline07.stable.out
b/monetdb5/optimizer/Tests/inline07.stable.out
--- a/monetdb5/optimizer/Tests/inline07.stable.out
+++ b/monetdb5/optimizer/Tests/inline07.stable.out
@@ -24,8 +24,6 @@ stdout of test 'inline07` in directory '
# MonetDB/R module loaded
Ready.
-#WARNING To speedup user.foo a bulk operator implementation is needed
-# z:bat[:oid,:dbl] := mal.multiplex("user":str,"foo":str,b:any,b:any);
# 06:41:00 >
# 06:41:00 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-8837" "--port=33343"
diff --git a/monetdb5/optimizer/Tests/inline09.stable.out
b/monetdb5/optimizer/Tests/inline09.stable.out
--- a/monetdb5/optimizer/Tests/inline09.stable.out
+++ b/monetdb5/optimizer/Tests/inline09.stable.out
@@ -24,8 +24,6 @@ stdout of test 'inline09` in directory '
# MonetDB/R module loaded
Ready.
-#WARNING To speedup user.bar a bulk operator implementation is needed
-# z:bat[:oid,:str] := mal.multiplex("user":str,"bar":str,b:any,b:any);
# 06:41:01 >
# 06:41:01 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-8837" "--port=33343"
diff --git a/monetdb5/optimizer/Tests/inline10.stable.out
b/monetdb5/optimizer/Tests/inline10.stable.out
--- a/monetdb5/optimizer/Tests/inline10.stable.out
+++ b/monetdb5/optimizer/Tests/inline10.stable.out
@@ -24,8 +24,6 @@ stdout of test 'inline10` in directory '
# MonetDB/R module loaded
Ready.
-#WARNING To speedup user.bar a bulk operator implementation is needed
-# z:bat[:oid,:int] := mal.multiplex("user":str,"bar":str,b:any,b:any);
# 06:41:01 >
# 06:41:01 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-8837" "--port=33343"
diff --git a/monetdb5/optimizer/Tests/inlineFunction2.stable.out
b/monetdb5/optimizer/Tests/inlineFunction2.stable.out
--- a/monetdb5/optimizer/Tests/inlineFunction2.stable.out
+++ b/monetdb5/optimizer/Tests/inlineFunction2.stable.out
@@ -19,10 +19,6 @@ stdout of test 'inlineFunction2` in dire
# MonetDB/R module loaded
Ready.
-#WARNING To speedup user.my a bulk operator implementation is needed
-# z:bat[:oid,:int] := mal.multiplex("user":str,"my":str,b:any,1:int);
-#WARNING To speedup user.my a bulk operator implementation is needed
-# z:bat[:oid,:int] :=
mal.multiplex("user":str,"my":str,b:bat[:oid,:int],1:int);
# 16:09:45 >
# 16:09:45 > "mclient" "-lmal" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-32223" "--port=39816"
diff --git a/monetdb5/optimizer/Tests/manifold2.stable.out
b/monetdb5/optimizer/Tests/manifold2.stable.out
--- a/monetdb5/optimizer/Tests/manifold2.stable.out
+++ b/monetdb5/optimizer/Tests/manifold2.stable.out
@@ -20,7 +20,6 @@ stdout of test 'manifold2` in directory
# MonetDB/R module loaded
Ready.
-#WARNING To speedup calc.max a bulk operator implementation is needed
# z:bat[:oid,:dbl] :=
mal.multiplex("calc":str,"max":str,b:bat[:oid,:dbl],b2:bat[:oid,:dbl]);
# 15:36:15 >
diff --git a/monetdb5/optimizer/Tests/manifold2.stable.out.single
b/monetdb5/optimizer/Tests/manifold2.stable.out.single
--- a/monetdb5/optimizer/Tests/manifold2.stable.out.single
+++ b/monetdb5/optimizer/Tests/manifold2.stable.out.single
@@ -20,7 +20,6 @@ stdout of test 'manifold2` in directory
# MonetDB/R module loaded
Ready.
-#WARNING To speedup calc.max a bulk operator implementation is needed
# z:bat[:dbl] :=
mal.multiplex("calc":str,"max":str,b:bat[:dbl],b2:bat[:dbl]);
# 12:52:57 >
diff --git a/monetdb5/optimizer/Tests/projectionchain.stable.out
b/monetdb5/optimizer/Tests/projectionchain.stable.out
--- a/monetdb5/optimizer/Tests/projectionchain.stable.out
+++ b/monetdb5/optimizer/Tests/projectionchain.stable.out
@@ -63,29 +63,17 @@ function user.qry():void;
bat.append(k,7);
bat.append(k,8);
bat.append(k,9);
- e := algebra.projection(a,b);
- X_91:bat[:oid] := algebra.projectionpath(a,b);
- X_89:bat[:oid] := algebra.projectionpath(X_91,c);
+ X_89:bat[:oid] := algebra.projectionpath(a,b,c);
f:bat[:oid] := X_89;
g := algebra.projection(f,d);
l := algebra.projection(f,k);
io.print(g);
io.print(l);
-# recognize common heads
- e1 := algebra.projection(a,b);
- X_90:bat[:oid] := algebra.projectionpath(X_91,b);
- e2:bat[:oid] := X_90;
- f1 := algebra.projection(a,b);
- f2:bat[:oid] := X_90;
- g1:bat[:str] := algebra.projectionpath(X_90,d);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
