Changeset: f4aeb322038c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f4aeb322038c
Modified Files:
monetdb5/optimizer/Tests/GCexample01.stable.out
monetdb5/optimizer/Tests/JPexample.stable.out
monetdb5/optimizer/Tests/dataflow.stable.out
monetdb5/optimizer/Tests/joinpath.stable.out
monetdb5/optimizer/Tests/leftjoinpath.stable.out
monetdb5/optimizer/Tests/tst4630.stable.out
Branch: Dec2011
Log Message:
approved extended type annotation in (optimzed) MAL plans,
assuming these were intended and are correct
diffs (127 lines):
diff --git a/monetdb5/optimizer/Tests/GCexample01.stable.out
b/monetdb5/optimizer/Tests/GCexample01.stable.out
--- a/monetdb5/optimizer/Tests/GCexample01.stable.out
+++ b/monetdb5/optimizer/Tests/GCexample01.stable.out
@@ -34,25 +34,25 @@ function user.main():void;
mdb.List("user","qry");
end main;
function user.qry():void; # 0 qry:void := user.qry() {G}
- b := bat.new(:int,:int); # 1 b:bat[:int,:int] :=
CMDBATnew(_2:int, _2:int) {G}
- c := bat.new(:int,:int); # 2 c:bat[:int,:int] :=
CMDBATnew(_2:int, _2:int) {G}
- d := bat.new(:int,:int); # 3 d:bat[:int,:int] :=
CMDBATnew(_2:int, _2:int) {G}
+ b:bat[:int,:int] := bat.new(:int,:int);# 1 b:bat[:int,:int] :=
CMDBATnew(_2:int, _2:int) {G}
+ c:bat[:int,:int] := bat.new(:int,:int);# 2 c:bat[:int,:int] :=
CMDBATnew(_2:int, _2:int) {G}
+ d:bat[:int,:int] := bat.new(:int,:int);# 3 d:bat[:int,:int] :=
CMDBATnew(_2:int, _2:int) {G}
bat.insert(b,1,1); # 4 _5:bat[:int,:int] :=
BKCinsert_bun(b:bat[:int,:int], _6:int, _6:int) {G}
barrier (x,y,z) := bat.newIterator(b); # 5 (x:lng, y:int, z:int) :=
CHPbunIterator(b:bat[:int,:int]) {GJ7}
io.print(x); # 6 _10:void := IOprint_val(x:lng)
exit (x,y,z); # 7 (x:lng, y:int, z:int)
- b := nil:BAT; # 8 b:bat[:int,:int] := _17:BAT {G}
+ b:bat[:int,:int] := nil:bat[:int,:int];# 8 b:bat[:int,:int] :=
_17:bat[:int,:int] {G}
barrier (x,y,z) := bat.newIterator(c); # 9 (x:lng, y:int, z:int) :=
CHPbunIterator(c:bat[:int,:int]) {GJ12}
io.print(x); # 10 _11:void := IOprint_val(x:lng)
redo (x,y,z) := bat.hasMoreElements(c);# 11 (x:lng, y:int, z:int) :=
CHPbunHasMoreElements(c:bat[:int,:int]) {GJ10}
exit (x,y,z); # 12 (x:lng, y:int, z:int)
- c := nil:BAT; # 13 c:bat[:int,:int] := _17:BAT {G}
+ c:bat[:int,:int] := nil:bat[:int,:int];# 13 c:bat[:int,:int] :=
_19:bat[:int,:int] {G}
# do not close d, it may be reused
barrier go := true; # 15 go:bit := _14:bit {J18}
io.print(d); # 16 _15:void :=
IOprint_val(d:bat[:int,:int]) {G}
redo go := true; # 17 go:bit := _14:bit {J16}
exit go; # 18 go:bit
- d := nil:BAT; # 19 d:bat[:int,:int] := _17:BAT {G}
+ d:bat[:int,:int] := nil:bat[:int,:int];# 19 d:bat[:int,:int] :=
_21:bat[:int,:int] {G}
end qry; # 20
# 23:17:49 >
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
@@ -19,10 +19,10 @@ function user.main():void;
b := bat.new(:oid,:oid);
c := bat.new(:oid,:str);
j1 := algebra.join(a,b);
- j2 := algebra.joinPath(a,b,c);
+ j2:bat[:void,:str] := algebra.joinPath(a,b,c);
j3 := algebra.join(b,b);
X_14 := algebra.join(b,b);
- j4 := algebra.join(X_14,b);
+ j4:bat[:oid,:oid] := algebra.join(X_14,b);
mdb.List();
end main;
function user.main():void; # 0 main:void := user.main() {G}
@@ -31,10 +31,10 @@ function user.main():void;
b := bat.new(:oid,:oid); # 3 b:bat[:oid,:oid] :=
CMDBATnew(_4:oid, _4:oid) {G}
c := bat.new(:oid,:str); # 4 c:bat[:oid,:str] :=
CMDBATnew(_4:oid, _7:str) {G}
j1 := algebra.join(a,b); # 5 j1:bat[:void,:oid] :=
ALGjoin(a:bat[:void,:oid], b:bat[:oid,:oid]) {G}
- j2 := algebra.joinPath(a,b,c); # 6 j2:bat[:void,:str] :=
ALGjoinPath(a:bat[:void,:oid], b:bat[:oid,:oid], c:bat[:oid,:str]) {G}
+ j2:bat[:void,:str] := algebra.joinPath(a,b,c);# 6 j2:bat[:void,:str] :=
ALGjoinPath(a:bat[:void,:oid], b:bat[:oid,:oid], c:bat[:oid,:str]) {G}
j3 := algebra.join(b,b); # 7 j3:bat[:oid,:oid] :=
ALGjoin(b:bat[:oid,:oid], b:bat[:oid,:oid]) {G}
X_14 := algebra.join(b,b); # 8 _14:bat[:oid,:oid] :=
ALGjoin(b:bat[:oid,:oid], b:bat[:oid,:oid]) {G}
- j4 := algebra.join(X_14,b); # 9 j4:bat[:oid,:oid] :=
ALGjoin(_14:bat[:oid,:oid], b:bat[:oid,:oid]) {G}
+ j4:bat[:oid,:oid] := algebra.join(X_14,b);# 9 j4:bat[:oid,:oid] :=
ALGjoin(_14:bat[:oid,:oid], b:bat[:oid,:oid]) {G}
mdb.List(); # 10 _13:void := MDBlistDetail()
end main; # 11
diff --git a/monetdb5/optimizer/Tests/dataflow.stable.out
b/monetdb5/optimizer/Tests/dataflow.stable.out
--- a/monetdb5/optimizer/Tests/dataflow.stable.out
+++ b/monetdb5/optimizer/Tests/dataflow.stable.out
@@ -47,7 +47,7 @@ function user.main():void;
user.tst();
end main;
function user.tst():void; # 0 tst:void := user.tst() {G}
- s := microbenchmark.uniform(0@0:oid,10000000,10000000);# 1
s:bat[:oid,:int] := MBMuniform(_2:oid, _3:int, _3:int) {G}
+ s:bat[:oid,:int] := microbenchmark.uniform(0@0:oid,10000000,10000000);#
1 s:bat[:oid,:int] := MBMuniform(_2:oid, _3:int, _3:int) {G}
l := aggr.min(s); # 2 l:int :=
ALGmin_int(s:bat[:oid,:int]) {G}
h := l; # 3 h:int := l:int
#mdb.setTimer(true);
@@ -64,7 +64,7 @@ barrier go := language.dataflow();
t8 := algebra.select(s,l,h); # 15 t8:bat[:oid,:int] :=
ALGselect(s:bat[:oid,:int], l:int, h:int) {G}
z := mat.pack(t1,t2,t3,t4,t5,t6,t7,t8);# 16 z:bat[:oid,:int] :=
MATpack(t1:bat[:oid,:int], t2:bat[:oid,:int], t3:bat[:oid,:int],
t4:bat[:oid,:int], t5:bat[:oid,:int], t6:bat[:oid,:int], t7:bat[:oid,:int],
t8:bat[:oid,:int]) {G}
exit go; # 17 go:int
- s := nil:BAT; # 18 s:bat[:oid,:int] := _25:BAT {G}
+ s:bat[:oid,:int] := nil:bat[:oid,:int];# 18 s:bat[:oid,:int] :=
_25:bat[:oid,:int] {G}
mdb.var(); # 19 _19:void := MDBvar()
c := aggr.count(z); # 20 c:wrd :=
ALGcount_bat(z:bat[:oid,:int]) {G}
io.print(c); # 21 _21:void := IOprint_val(c:wrd)
diff --git a/monetdb5/optimizer/Tests/joinpath.stable.out
b/monetdb5/optimizer/Tests/joinpath.stable.out
--- a/monetdb5/optimizer/Tests/joinpath.stable.out
+++ b/monetdb5/optimizer/Tests/joinpath.stable.out
@@ -42,8 +42,8 @@ function user.tst1():void;
b := bat.new(:oid,:oid);
c := bat.new(:oid,:oid);
X_11 := algebra.join(c,a);
- j2 := algebra.join(X_11,b);
- j4 := algebra.join(X_11,c);
+ j2:bat[:oid,:oid] := algebra.join(X_11,b);
+ j4:bat[:oid,:oid] := algebra.join(X_11,c);
io.print(j2);
io.print(j4);
end tst1;
diff --git a/monetdb5/optimizer/Tests/leftjoinpath.stable.out
b/monetdb5/optimizer/Tests/leftjoinpath.stable.out
--- a/monetdb5/optimizer/Tests/leftjoinpath.stable.out
+++ b/monetdb5/optimizer/Tests/leftjoinpath.stable.out
@@ -43,8 +43,8 @@ function user.tst1():void;
b := bat.new(:oid,:oid);
c := bat.new(:oid,:oid);
X_11 := algebra.leftjoin(c,a);
- j2 := algebra.leftjoin(X_11,b);
- j4 := algebra.leftjoin(X_11,c);
+ j2:bat[:oid,:oid] := algebra.leftjoin(X_11,b);
+ j4:bat[:oid,:oid] := algebra.leftjoin(X_11,c);
io.print(j2);
io.print(j4);
end tst1;
diff --git a/monetdb5/optimizer/Tests/tst4630.stable.out
b/monetdb5/optimizer/Tests/tst4630.stable.out
--- a/monetdb5/optimizer/Tests/tst4630.stable.out
+++ b/monetdb5/optimizer/Tests/tst4630.stable.out
@@ -35,8 +35,8 @@ function user.qry(a:bat[:any_1,:any_2],b
zz := algebra.join(z,c); # 5 zz:bat[:any,:any] :=
ALGjoin(z:bat[:any,:any], c:bat[:any_3,:any_4]) {G}
ww := algebra.join(z,a1); # 6 ww:bat[:any,:any] :=
ALGjoin(z:bat[:any,:any], a1:bat[:any_1,:any_2]) {G}
X_12 := algebra.join(z,a1); # 7 _12:bat[:any,:any] :=
ALGjoin(z:bat[:any,:any], a1:bat[:any_1,:any_2]) {G}
- yy := algebra.join(X_12,b1); # 8 yy:bat[:any,:any] :=
ALGjoin(_12:bat[:any,:any], b1:bat[:any_2,:any_3]) {G}
- xx := algebra.joinPath(X_12,b1,c1); # 9 xx:bat[:any,:any] :=
ALGjoinPath(_12:bat[:any,:any], b1:bat[:any_2,:any_3], c1:bat[:any_3,:any_4])
{G}
+ yy:bat[:any,:any] := algebra.join(X_12,b1);# 8 yy:bat[:any,:any] :=
ALGjoin(_12:bat[:any,:any], b1:bat[:any_2,:any_3]) {G}
+ xx:bat[:any,:any] := algebra.joinPath(X_12,b1,c1);# 9 xx:bat[:any,:any]
:= ALGjoinPath(_12:bat[:any,:any], b1:bat[:any_2,:any_3],
c1:bat[:any_3,:any_4]) {G}
return qry := xx; # 10 qry:bat[:any_1,:any_4] :=
xx:bat[:any,:any] {G}
end qry; # 11
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
