Changeset: 4ceda50c7eb1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4ceda50c7eb1
Modified Files:
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/optimizer/Tests/tst4300.mal
monetdb5/optimizer/Tests/tst4300.stable.out
monetdb5/optimizer/Tests/tst4610.mal
monetdb5/optimizer/Tests/tst4610.stable.out
Branch: default
Log Message:
Merge from Feb2013 branch.
diffs (109 lines):
diff --git
a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
--- a/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
+++ b/monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
@@ -55,8 +55,8 @@ Ready.
% . # table_name
% def # name
% clob # type
-% 427 # length
-[
"optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();"
]
+% 447 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.garbageCollector();"
]
#explain copy into ttt from '/:\tmp/xyz';
% .explain # table_name
% mal # name
@@ -66,8 +66,8 @@ function user.s2_1{autoCommit=true}():vo
X_2 := sql.mvc();
(X_5:bat[:oid,:int] ,X_6:bat[:oid,:int] ,X_7:bat[:oid,:int] ) :=
sql.copy_from("sys":str,"ttt":str,"|":str,"\\n":str,nil:str,"null":str,"/:\\tmp/xyz":str,-1:lng,0:lng,0:int);
X_9 := sql.append(X_2,"sys","ttt","a",X_5);
- X_11 := sql.append(X_9,"sys":str,"ttt":str,"b",X_6);
- X_15 := sql.append(X_11,"sys":str,"ttt":str,"c",X_7);
+ X_11 := sql.append(X_9,"sys","ttt","b",X_6);
+ X_15 := sql.append(X_11,"sys","ttt","c",X_7);
X_16 := aggr.count(X_7);
sql.affectedRows(X_15,X_16,"");
end s2_1;
@@ -83,8 +83,8 @@ end s2_1;
% . # table_name
% def # name
% clob # type
-% 450 # length
-[
"optimizer.inline();optimizer.remap();optimizer.evaluate();optimizer.costModel();optimizer.coercions();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();"
]
+% 470 # length
+[
"optimizer.inline();optimizer.remap();optimizer.costModel();optimizer.coercions();optimizer.evaluate();optimizer.emptySet();optimizer.aliases();optimizer.pushselect();optimizer.mitosis();optimizer.mergetable();optimizer.deadcode();optimizer.commonTerms();optimizer.joinPath();optimizer.reorder();optimizer.deadcode();optimizer.reduce();optimizer.matpack();optimizer.dataflow();optimizer.history();optimizer.multiplex();optimizer.sql_append();optimizer.garbageCollector();"
]
#explain copy into ttt from '/:\tmp/xyz';
% .explain # table_name
% mal # name
diff --git a/monetdb5/optimizer/Tests/tst4300.mal
b/monetdb5/optimizer/Tests/tst4300.mal
--- a/monetdb5/optimizer/Tests/tst4300.mal
+++ b/monetdb5/optimizer/Tests/tst4300.mal
@@ -17,7 +17,9 @@ d:= algebra.select(b,0:lng,49:lng);
i:= aggr.count(d);
io.print(i);
-cr:= bat.reverse(c);
-zz:= algebra.joinPath(b,cr,d);
+bo := batcalc.oid(b);
+co := batcalc.oid(c);
+cor:= bat.reverse(co);
+zz:= algebra.joinPath(bo,cor,d);
i:= aggr.count(zz);
io.print(i);
diff --git a/monetdb5/optimizer/Tests/tst4300.stable.out
b/monetdb5/optimizer/Tests/tst4300.stable.out
--- a/monetdb5/optimizer/Tests/tst4300.stable.out
+++ b/monetdb5/optimizer/Tests/tst4300.stable.out
@@ -28,8 +28,10 @@ exit v;
d := algebra.select(b,0:lng,49:lng);
i := aggr.count(d);
io.print(i);
- cr := bat.reverse(c);
- zz := algebra.joinPath(b,cr,d);
+ bo := batcalc.oid(b);
+ co := batcalc.oid(c);
+ cor := bat.reverse(co);
+ zz := algebra.joinPath(bo,cor,d);
i := aggr.count(zz);
io.print(i);
#to be detected by join inversion
diff --git a/monetdb5/optimizer/Tests/tst4610.mal
b/monetdb5/optimizer/Tests/tst4610.mal
--- a/monetdb5/optimizer/Tests/tst4610.mal
+++ b/monetdb5/optimizer/Tests/tst4610.mal
@@ -15,5 +15,8 @@ c:= bat.new(:oid,:int);
g:= algebra.join(a,br);
h:= algebra.join(g,c);
-r:= algebra.joinPath(a,br,c);
+ao := batcalc.oid(a);
+bo := batcalc.oid(b);
+bor := bat.reverse(bo);
+r:= algebra.joinPath(ao,bor,c);
mdb.List();
diff --git a/monetdb5/optimizer/Tests/tst4610.stable.out
b/monetdb5/optimizer/Tests/tst4610.stable.out
--- a/monetdb5/optimizer/Tests/tst4610.stable.out
+++ b/monetdb5/optimizer/Tests/tst4610.stable.out
@@ -25,7 +25,10 @@ function user.main():void;
br := bat.reverse(b);
c := bat.new(:oid,:int);
h := user.joinPath(a,br,c);
- r := algebra.joinPath(a,br,c);
+ ao := batcalc.oid(a);
+ bo := batcalc.oid(b);
+ bor := bat.reverse(bo);
+ r := algebra.joinPath(ao,bor,c);
mdb.List();
function user.main():void; # 0 main:void := user.main() {G}
# the first test for macro expansions and inversions
@@ -34,8 +37,11 @@ function user.main():void;
br := bat.reverse(b); # 4 br:bat[:int,:oid] :=
BKCreverse(b:bat[:oid,:int]) {G}
c := bat.new(:oid,:int); # 5 c:bat[:oid,:int] :=
CMDBATnew(_6:oid, _7:int) {G}
h := user.joinPath(a,br,c); # 6 h:bat[:oid,:int] :=
user.joinPath(a:bat[:oid,:int], br:bat[:int,:oid], c:bat[:oid,:int]) {PG}
- r := algebra.joinPath(a,br,c); # 7 r:bat[:any,:any] :=
ALGjoinPath(a:bat[:oid,:int], br:bat[:int,:oid], c:bat[:oid,:int]) {G}
- mdb.List(); # 8 _14:void := MDBlistDetail()
+ ao := batcalc.oid(a); # 7 ao:bat[:oid,:oid] :=
CMDconvertsignal_oid(a:bat[:oid,:int]) {G}
+ bo := batcalc.oid(b); # 8 bo:bat[:oid,:oid] :=
CMDconvertsignal_oid(b:bat[:oid,:int]) {G}
+ bor := bat.reverse(bo); # 9 bor:bat[:oid,:oid] :=
BKCreverse(bo:bat[:oid,:oid]) {G}
+ r := algebra.joinPath(ao,bor,c); # 10 r:bat[:oid,:any] :=
ALGjoinPath(ao:bat[:oid,:oid], bor:bat[:oid,:oid], c:bat[:oid,:int]) {G}
+ mdb.List(); # 11 _17:void := MDBlistDetail()
# 19:36:05 >
# 19:36:05 > Done.
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
