Changeset: d387d1e74759 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d387d1e74759
Modified Files:
monetdb5/optimizer/Tests/tst4300.mal
monetdb5/optimizer/Tests/tst4300.stable.out
monetdb5/optimizer/Tests/tst4610.mal
monetdb5/optimizer/Tests/tst4610.stable.out
Branch: Feb2013
Log Message:
updated tests to meet stricter joinPath signature (changeset 9ac4a1b83d56)
diffs (73 lines):
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
