Update of /cvsroot/monetdb/MonetDB5/src/optimizer/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3695
Modified Files:
All FTexample.stable.out inline00.mal inline00.stable.out
inline01.mal inline01.stable.out inline02.mal inline03.mal
inline04.mal inline05.mal inline06.mal tst4001.stable.out
tst4601.stable.out tst4602.stable.out tst4610.stable.out
tst4730.stable.out
Log Message:
Approval of normalization and some prelimenary multiplex inliners
Index: tst4730.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/tst4730.stable.out,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- tst4730.stable.out 9 Dec 2007 16:21:18 -0000 1.40
+++ tst4730.stable.out 25 Dec 2007 13:22:32 -0000 1.41
@@ -165,21 +165,21 @@
V135 := aggr.avg(V83,V35,V37); # 56 AX3aggrX3_avg3_flt
(V135:bat[:oid,:dbl])<-(V83:bat[:oid,:flt])(V35:bat[:oid,:oid])(V37:bat[:oid,:oid])
V136 := mal.multiplex("calc.round",V135,100); # 57 OPTremapMultiplex
(V136:any)<-(_80:str)(V135:bat[:oid,:dbl])(_58:int)
V137 := aggr.count(V35,V35,V37); # 58 AX3aggrX3_count3Nils
(V137:bat[:oid,:int])<-(V35:bat[:oid,:oid])(V35:bat[:oid,:oid])(V37:bat[:oid,:oid])
-#sql.column(V42,"l_returnflag","varchar",1,0); # 59 (_83:str)
-#sql.column(V51,"l_linestatus","varchar",1,0); # 60 (_84:str)
-#sql.column(V59,"sum_qty","bigint",0,0); # 61 (_85:str)
-#sql.column(V66,"sum_base_price","decimal",19,2); # 62 (_86:str)
-#sql.column(V88,"sum_disc_price","decimal",19,4); # 63 (_87:str)
-#sql.column(V114,"sum_charge","decimal",19,6); # 64 (_88:str)
-#sql.column(V122,"avg_qty","double",53,0); # 65 (_89:str)
-#sql.column(V129,"avg_price","double",53,0); # 66 (_90:str)
-#sql.column(V136,"avg_disc","double",53,0); # 67 (_91:str)
-#sql.column(V137,"count_order","int",0,0); # 68 (_92:str)
-#sql.output(V52,V42,V51,V59,V66,V88,V114,V122,V129,V136,V137); # 69
(_93:str)
- yield always; # 70 (always:bit)
+#sql.column(V42,"l_returnflag","varchar",1,0); # 59 (_84:str)
+#sql.column(V51,"l_linestatus","varchar",1,0); # 60 (_85:str)
+#sql.column(V59,"sum_qty","bigint",0,0); # 61 (_86:str)
+#sql.column(V66,"sum_base_price","decimal",19,2); # 62 (_87:str)
+#sql.column(V88,"sum_disc_price","decimal",19,4); # 63 (_88:str)
+#sql.column(V114,"sum_charge","decimal",19,6); # 64 (_89:str)
+#sql.column(V122,"avg_qty","double",53,0); # 65 (_90:str)
+#sql.column(V129,"avg_price","double",53,0); # 66 (_91:str)
+#sql.column(V136,"avg_disc","double",53,0); # 67 (_92:str)
+#sql.column(V137,"count_order","int",0,0); # 68 (_93:str)
+#sql.output(V52,V42,V51,V59,V66,V88,V114,V122,V129,V136,V137); # 69
(_94:str)
+ yield qry1 := always; # 70 (qry1:bit)<-(always:bit)
redo always; # 71 (always:bit) jump 10
exit always; # 72 (always:bit)
- return always; # 73 (always:bit)
+ return qry1 := always; # 73 (qry1:bit)<-(always:bit)
end qry1; # 74
#
#optimizer.costEstimation("user","qry1");
@@ -261,10 +261,10 @@
#sql.column(V136,"avg_disc","double",53,0);
#sql.column(V137,"count_order","int",0,0);
#sql.output(V52,V42,V51,V59,V66,V88,V114,V122,V129,V136,V137);
- yield always;
+ yield qry1 := always;
redo always;
exit always;
- return always;
+ return qry1 := always;
end qry1;
# 23:52:59 >
Index: inline00.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline00.stable.out,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inline00.stable.out 3 May 2007 07:15:26 -0000 1.1
+++ inline00.stable.out 25 Dec 2007 13:22:32 -0000 1.2
@@ -56,7 +56,7 @@
#mdb.list("user","qry");
#
function user.main():void; # 0 (main:void)
- mdb.list("user","qry"); # 1 MDBlist3 (_4:void)<-(_2:str)(_3:str)
+ mdb.list("user","qry"); # 1 MDBlist3 (_5:void)<-(_2:str)(_3:str)
end main; # 2
function user.qry():void;
nil:void;
Index: inline01.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline01.stable.out,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inline01.stable.out 3 May 2007 07:15:27 -0000 1.1
+++ inline01.stable.out 25 Dec 2007 13:22:32 -0000 1.2
@@ -64,7 +64,7 @@
#mdb.list("user","qry");
#
function user.main():void; # 0 (main:void)
- mdb.list("user","qry"); # 1 MDBlist3 (_4:void)<-(_2:str)(_3:str)
+ mdb.list("user","qry"); # 1 MDBlist3 (_5:void)<-(_2:str)(_3:str)
end main; # 2
function user.qry():void;
nil:void;
Index: All
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/All,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- All 24 Dec 2007 12:28:25 -0000 1.57
+++ All 25 Dec 2007 13:22:32 -0000 1.58
@@ -63,11 +63,12 @@
inline00
inline01
-#inline02
-#inline03
-#inline04
-#inline05
-#inline06
+inline02
+inline03
+inline04
+inline05
+inline06
+inline07
CXerror1
#the remainder are snippets used in the reference manual
Index: tst4602.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/tst4602.stable.out,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- tst4602.stable.out 15 Dec 2006 08:27:48 -0000 1.17
+++ tst4602.stable.out 25 Dec 2007 13:22:32 -0000 1.18
@@ -29,7 +29,7 @@
io.print("Welcome"); # 3 IOprint_val (_5:void)<-(_6:str)
i := calc.+(i,1); # 4 CALCbinaryADDintint (i:int)<-(i:int)(_7:int)
redo j := calc.<(i,lim); # 5 CALCcompLTintint (j:bit)<-(i:int)(lim:int)
jump 3
- return i; # 6 (i:int)
+ return welcome := i; # 6 (welcome:int)<-(i:int)
exit j; # 7 (j:bit)
end welcome; # 8
#
Index: tst4601.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/tst4601.stable.out,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- tst4601.stable.out 20 Mar 2007 18:27:40 -0000 1.14
+++ tst4601.stable.out 25 Dec 2007 13:22:32 -0000 1.15
@@ -29,7 +29,7 @@
i := calc.+(i,1); # 4 CALCbinaryADDintint (i:int)<-(i:int)(_7:int)
redo j := calc.<(i,lim); # 5 CALCcompLTintint (j:bit)<-(i:int)(lim:int)
jump 3
exit j; # 6 (j:bit)
- return i; # 7 (i:int)
+ return welcome := i; # 7 (welcome:int)<-(i:int)
end welcome; # 8
#
#optimizer.macroExpansion("user","welcome");
@@ -42,13 +42,13 @@
# the first test for macro expansions and inversions # 1 (_1:str)
io.print("test expansion"); # 2 IOprint_val (_5:void)<-(_6:str)
a := nil:int; # 3 (a:int)<-(_19:int)
- a := 0; # 4 (a:int)<-(_14:int)
-barrier _15 := calc.<(a,2); # 5 CALCcompLTintint (_15:bit)<-(a:int)(_8:int)
jump 9
+ _13 := 0; # 4 (_13:int)<-(_14:int)
+barrier _15 := calc.<(_13,2); # 5 CALCcompLTintint
(_15:bit)<-(_13:int)(_8:int) jump 9
io.print("Welcome"); # 6 IOprint_val (_16:void)<-(_17:str)
- a := calc.+(a,1); # 7 CALCbinaryADDintint (a:int)<-(a:int)(_18:int)
- redo _15 := calc.<(a,2); # 8 CALCcompLTintint (_15:bit)<-(a:int)(_8:int)
jump 6
+ _13 := calc.+(_13,1); # 7 CALCbinaryADDintint
(_13:int)<-(_13:int)(_18:int)
+ redo _15 := calc.<(_13,2); # 8 CALCcompLTintint
(_15:bit)<-(_13:int)(_8:int) jump 6
exit _15; # 9 (_15:bit)
- a; # 10 (a:int)
+ a := _13; # 10 (a:int)<-(_13:int)
io.print(a); # 11 IOprint_val (_9:void)<-(a:int)
mdb.list(); # 12 MDBlist (_10:void)
end main; # 13
@@ -60,13 +60,13 @@
# the first test for macro expansions and inversions
io.print("test expansion");
a := nil:int;
- a := 0;
-barrier _15 := calc.<(a,2);
+ _13 := 0;
+barrier _15 := calc.<(_13,2);
io.print("Welcome");
- a := calc.+(a,1);
- redo _15 := calc.<(a,2);
+ _13 := calc.+(_13,1);
+ redo _15 := calc.<(_13,2);
exit _15;
- a;
+ a := _13;
io.print(a);
mdb.list();
end main;
Index: inline05.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline05.mal,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inline05.mal 24 Dec 2007 12:28:25 -0000 1.1
+++ inline05.mal 25 Dec 2007 13:22:32 -0000 1.2
@@ -10,8 +10,9 @@
b:= bat.new(:oid,:int);
bat.insert(b,[EMAIL PROTECTED],1);
z:bat[:oid,:int]:= mal.multiplex("user","foo",b,b);
- z:bat[:oid,:int]:= mal.multiplex("user","foo",b,2);
+ z:bat[:oid,:dbl]:= mal.multiplex("user","foo",b,2);
end qry;
optimizer.inline("user","qry");
+ optimizer.remap("user","qry");
mdb.list("user","qry");
Index: inline04.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline04.mal,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inline04.mal 24 Dec 2007 12:28:25 -0000 1.1
+++ inline04.mal 25 Dec 2007 13:22:32 -0000 1.2
@@ -20,4 +20,5 @@
end qry;
optimizer.inline("user","qry");
+ optimizer.remap("user","qry");
mdb.list("user","qry");
Index: inline06.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline06.mal,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inline06.mal 24 Dec 2007 12:28:25 -0000 1.1
+++ inline06.mal 25 Dec 2007 13:22:32 -0000 1.2
@@ -2,7 +2,7 @@
# the crucial part is to recognize valid inlines
function foo{inline}(a:int,b:int):int;
c:= a+b;
- base:=mmath.rand(c); # this has a memory-side effect
+ base:=mmath.rand(); # this has a memory-side effect
c:= c*base;
return c;
end foo;
@@ -15,4 +15,5 @@
end qry;
optimizer.inline("user","qry");
+ optimizer.remap("user","qry");
mdb.list("user","qry");
Index: inline01.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline01.mal,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- inline01.mal 3 May 2007 07:15:27 -0000 1.2
+++ inline01.mal 25 Dec 2007 13:22:32 -0000 1.3
@@ -27,4 +27,5 @@
end qry;
optimizer.inline("user","qry");
+optimizer.remap("user","qry");
mdb.list("user","qry");
Index: inline00.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline00.mal,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inline00.mal 2 May 2007 22:19:03 -0000 1.1
+++ inline00.mal 25 Dec 2007 13:22:32 -0000 1.2
@@ -22,4 +22,5 @@
end qry;
optimizer.inline("user","qry");
+optimizer.remap("user","qry");
mdb.list("user","qry");
Index: inline03.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline03.mal,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inline03.mal 24 Dec 2007 12:28:25 -0000 1.1
+++ inline03.mal 25 Dec 2007 13:22:32 -0000 1.2
@@ -14,4 +14,5 @@
z:bat[:oid,:int]:= mal.multiplex("user","foo",b,2);
end qry;
optimizer.inline("user","qry");
+ optimizer.remap("user","qry");
mdb.list("user","qry");
Index: inline02.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline02.mal,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inline02.mal 24 Dec 2007 12:28:25 -0000 1.1
+++ inline02.mal 25 Dec 2007 13:22:32 -0000 1.2
@@ -1,15 +1,18 @@
# remapping inline functions
function foo{inline}(a:int,b:int):int;
c:= a+b;
- return c;
+ return foo:=c;
end foo;
function qry();
b:= bat.new(:oid,:int);
bat.insert(b,[EMAIL PROTECTED],1);
+ zz:= user.foo(1,2); # base line test for inlining
+
z:bat[:oid,:int]:= mal.multiplex("user","foo",b,b);
z:bat[:oid,:int]:= mal.multiplex("user","foo",b,2);
end qry;
optimizer.inline("user","qry");
+ optimizer.remap("user","qry");
mdb.list("user","qry");
Index: tst4610.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/tst4610.stable.out,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- tst4610.stable.out 24 Sep 2006 18:44:37 -0000 1.13
+++ tst4610.stable.out 25 Dec 2007 13:22:32 -0000 1.14
@@ -22,7 +22,7 @@
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("user","joinPath");
@@ -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)
- h := user.joinPath(a,b,c); # 5
(h:bat[:int,:int])<-(a:bat[:int,:int])(b:bat[:int,:int])(c:bat[:int,:int])
+ r := user.joinPath(a,b,c); # 5
(r:bat[:any,:any])<-(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);
- h := user.joinPath(a,b,c);
+ r := user.joinPath(a,b,c);
r := algebra.joinPath(a,b,c);
mdb.list();
Index: FTexample.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/FTexample.stable.out,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- FTexample.stable.out 2 Dec 2005 23:01:25 -0000 1.9
+++ FTexample.stable.out 25 Dec 2007 13:22:32 -0000 1.10
@@ -25,7 +25,7 @@
bat.insert(b,1,"hello"); # 2 BKCinsert_bun
(_5:void)<-(b:bat[:int,:str])(_6:int)(_7:str)
z := algebra.select(b,s,s); # 3 ALGselect
(z:bat[:int,:str])<-(b:bat[:int,:str])(s:str)(s:str)
i := aggr.count(z); # 4 ALGcount_bat (i:int)<-(z:bat[:int,:str])
- return i; # 5 (i:int)
+ return test := i; # 5 (test:int)<-(i:int)
end test; # 6
#optimizer.factorize("user","test");
#mdb.list("user","test");
@@ -40,7 +40,7 @@
barrier always := true;
z := algebra.select(b,s,s);
i := aggr.count(z);
- yield i;
+ yield test := i;
redo always;
exit always;
end test;
Index: tst4001.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/tst4001.stable.out,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- tst4001.stable.out 3 Dec 2006 22:44:03 -0000 1.12
+++ tst4001.stable.out 25 Dec 2007 13:22:32 -0000 1.13
@@ -29,7 +29,7 @@
j := 1:dbl; # 3 (j:dbl)<-(_2:dbl)
k := mmath.sin(j); # 4 MATHunary_SINdbl (k:dbl)<-(j:dbl)
l := calc.+(k,i); # 5 CALCbinaryADDdbldbl (l:dbl)<-(k:dbl)(i:dbl)
- return z; # 6 (z:dbl)
+ return qry := z; # 6 (qry:dbl)<-(z:dbl)
end qry; # 7
#t0:= alarm.usec();
#optimizer.aliasRemoval("user","qry");
@@ -62,7 +62,7 @@
function user.qry(i:dbl):dbl;
z := mmath.sin(1:dbl);
l := calc.+(z,1:dbl);
- return z;
+ return qry := z;
end qry;
function user.main():void;
#tesing the optimizers
-------------------------------------------------------------------------
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
