Update of /cvsroot/monetdb/MonetDB5/src/optimizer/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26016/Tests
Modified Files:
tst4610.mal tst4610.stable.out tst4611.mal tst4611.stable.out
tst4620.stable.out
Log Message:
Removing left over bug of the RETURN/YIELD normalization step.
Index: tst4620.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/tst4620.stable.out,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- tst4620.stable.out 3 Dec 2006 22:44:03 -0000 1.19
+++ tst4620.stable.out 27 Dec 2007 13:23:23 -0000 1.20
@@ -21,7 +21,7 @@
function
algebra.joinPath(a:bat[:any_1,:any_2],b:bat[:any_2,:any_3],c:bat[:any_3,:any_4]):bat[:any_1,:any_4];
# 0 dynamic
(joinPath:bat[:any_1,:any_4])<-(a:bat[:any_1,:any_2])(b:bat[:any_2,:any_3])(c:bat[:any_3,:any_4])
z := algebra.join(a,b); # 1 ALGjoin
(z:bat[:any,:any])<-(a:bat[:any_1,:any_2])(b:bat[:any_2,:any_3])
zz := algebra.join(z,c); # 2 ALGjoin
(zz:bat[:any,:any])<-(z:bat[:any,:any])(c:bat[:any_3,:any_4])
- return zz; # 3 (zz:bat[:any,:any])
+ return joinPath := zz; # 3
(joinPath:bat[:any_1,:any_4])<-(zz:bat[:any,:any])
end joinPath; # 4
#
#b:= bat.new(:int,:int);
Index: tst4611.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/tst4611.stable.out,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- tst4611.stable.out 15 Jun 2006 18:29:32 -0000 1.14
+++ tst4611.stable.out 27 Dec 2007 13:23:23 -0000 1.15
@@ -19,10 +19,10 @@
# zz:= algebra.join(z,c);
# return zz;
#end joinPath;
-function
algebra.joinPath(a:bat[:any_1,:any_2],b:bat[:any_2,:any_3],c:bat[:any_3,:any_4]):bat[:any_1,:any_4];
# 0 dynamic
(joinPath:bat[:any_1,:any_4])<-(a:bat[:any_1,:any_2])(b:bat[:any_2,:any_3])(c:bat[:any_3,:any_4])
+function
user.joinPath(a:bat[:any_1,:any_2],b:bat[:any_2,:any_3],c:bat[:any_3,:any_4]):bat[:any_1,:any_4];
# 0 dynamic
(joinPath:bat[:any_1,:any_4])<-(a:bat[:any_1,:any_2])(b:bat[:any_2,:any_3])(c:bat[:any_3,:any_4])
z := algebra.join(a,b); # 1 ALGjoin
(z:bat[:any,:any])<-(a:bat[:any_1,:any_2])(b:bat[:any_2,:any_3])
zz := algebra.join(z,c); # 2 ALGjoin
(zz:bat[:any,:any])<-(z:bat[:any,:any])(c:bat[:any_3,:any_4])
- return zz; # 3 (zz:bat[:any,:any])
+ return joinPath := zz; # 3
(joinPath:bat[:any_1,:any_4])<-(zz:bat[:any,:any])
end joinPath; # 4
#
#optimizer.macroContraction("algebra","joinPath");
@@ -37,17 +37,17 @@
#
function user.main():void; # 0 (main:void)
# the first test for macro expansions and inversions # 1 (_1:str)
- a := bat.new(:int,:int); # 2 CMDBATnew
(a:bat[:int,:int])<-(_6:int)(_6:int)
- b := bat.new(:int,:int); # 3 CMDBATnew
(b:bat[:int,:int])<-(_6:int)(_6:int)
- c := bat.new(:int,:int); # 4 CMDBATnew
(c:bat[:int,:int])<-(_6:int)(_6:int)
- h := algebra.joinPath(a,b,c); # 5
(h:bat[:int,:int])<-(a:bat[:int,:int])(b:bat[:int,:int])(c:bat[:int,:int])
+ a := bat.new(:int,:int); # 2 CMDBATnew
(a:bat[:int,:int])<-(_3:int)(_3:int)
+ b := bat.new(:int,:int); # 3 CMDBATnew
(b:bat[:int,:int])<-(_3:int)(_3:int)
+ c := bat.new(:int,:int); # 4 CMDBATnew
(c:bat[:int,:int])<-(_3:int)(_3:int)
+ h := user.joinPath(a,b,c); # 5
(h:bat[:int,:int])<-(a:bat[:int,:int])(b:bat[:int,:int])(c:bat[:int,:int])
mdb.list(); # 6 MDBlist (_11:void)
function user.main():void;
# the first test for macro expansions and inversions
a := bat.new(:int,:int);
b := bat.new(:int,:int);
c := bat.new(:int,:int);
- h := algebra.joinPath(a,b,c);
+ h := user.joinPath(a,b,c);
mdb.list();
# 19:36:05 >
Index: tst4611.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/tst4611.mal,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- tst4611.mal 11 Aug 2006 21:06:46 -0000 1.6
+++ tst4611.mal 27 Dec 2007 13:23:23 -0000 1.7
@@ -1,19 +1,16 @@
# the first test for macro expansions and inversions
-function algebra.joinPath( a:bat[:any_1,:any_2],
- b:bat[:any_2,:any_3],
- c:bat[:any_3,:any_4]):bat[:any_1,:any_4];
+function user.joinPath( a:bat[:any_1,:any_2], b:bat[:any_2,:any_3],
c:bat[:any_3,:any_4]):bat[:any_1,:any_4];
z:= algebra.join(a,b);
zz:= algebra.join(z,c);
return zz;
end joinPath;
-optimizer.orcam("algebra","joinPath");
-
a:= bat.new(:int,:int);
b:= bat.new(:int,:int);
c:= bat.new(:int,:int);
g:= algebra.join(a,b);
h:= algebra.join(g,c);
+optimizer.orcam("user","joinPath");
mdb.list();
Index: tst4610.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/tst4610.stable.out,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- tst4610.stable.out 25 Dec 2007 13:22:32 -0000 1.14
+++ tst4610.stable.out 27 Dec 2007 13:23:23 -0000 1.15
@@ -41,7 +41,7 @@
a := bat.new(:int,:int); # 2 CMDBATnew
(a:bat[:int,:int])<-(_6:int)(_6:int)
b := bat.new(:int,:int); # 3 CMDBATnew
(b:bat[:int,:int])<-(_6:int)(_6:int)
c := bat.new(:int,:int); # 4 CMDBATnew
(c:bat[:int,:int])<-(_6:int)(_6:int)
- r := user.joinPath(a,b,c); # 5
(r:bat[:any,:any])<-(a:bat[:int,:int])(b:bat[:int,:int])(c:bat[:int,:int])
+ h := user.joinPath(a,b,c); # 5
(h:bat[:int,:int])<-(a:bat[:int,:int])(b:bat[:int,:int])(c:bat[:int,:int])
r := algebra.joinPath(a,b,c); # 6 ALGjoinPath
(r:bat[:any,:any])<-(a:bat[:int,:int])(b:bat[:int,:int])(c:bat[:int,:int])
mdb.list(); # 7 MDBlist (_12:void)
function user.main():void;
@@ -49,7 +49,7 @@
a := bat.new(:int,:int);
b := bat.new(:int,:int);
c := bat.new(:int,:int);
- r := user.joinPath(a,b,c);
+ h := user.joinPath(a,b,c);
r := algebra.joinPath(a,b,c);
mdb.list();
Index: tst4610.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/tst4610.mal,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- tst4610.mal 11 Aug 2006 21:06:46 -0000 1.6
+++ tst4610.mal 27 Dec 2007 13:23:23 -0000 1.7
@@ -1,8 +1,6 @@
# the first test for macro expansions and inversions
-function joinPath( a:bat[:any_1,:any_2],
- b:bat[:any_2,:any_3],
- c:bat[:any_3,:any_4]):bat[:any_1,:any_4];
+function joinPath( a:bat[:any_1,:any_2], b:bat[:any_2,:any_3],
c:bat[:any_3,:any_4]):bat[:any_1,:any_4];
z:= algebra.join(a,b);
zz:= algebra.join(z,c);
return zz;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
