Update of /cvsroot/monetdb/MonetDB5/src/optimizer/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv3788/optimizer/Tests
Modified Files:
emptyset01.stable.out inline00.stable.out inline01.stable.out
inline02.mal inline02.stable.out inline03.stable.out
inline04.stable.out inline06.stable.out
Log Message:
Approve the output.
Index: inline00.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline00.stable.out,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- inline00.stable.out 26 Dec 2007 14:34:04 -0000 1.3
+++ inline00.stable.out 27 Dec 2007 12:35:43 -0000 1.4
@@ -59,6 +59,7 @@
mdb.list("user","qry"); # 1 MDBlist3 (_5:void)<-(_2:str)(_3:str)
end main; # 2
function user.qry():void;
+ nil:void;
_3 := bat.new(:int,:int);
_5 := bat.new(:int,:int);
bat.insert(_3,1,1);
Index: inline01.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline01.stable.out,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- inline01.stable.out 26 Dec 2007 14:34:04 -0000 1.3
+++ inline01.stable.out 27 Dec 2007 12:35:43 -0000 1.4
@@ -67,7 +67,23 @@
mdb.list("user","qry"); # 1 MDBlist3 (_5:void)<-(_2:str)(_3:str)
end main; # 2
function user.qry():void;
- user.help();
+ nil:void;
+ nil:void;
+ _6 := bat.new(:int,:int);
+ _8 := bat.new(:int,:int);
+ _9:int := 1;
+ bat.insert(_6,1,1);
+barrier (_12,_13,_9:int ):= bat.newIterator(_6);
+ io.print(_12);
+catch MALException:str ;
+exit MALException:str ;
+exit (_12,_13,_9:int );
+barrier (_12,_13,_9:int ):= bat.newIterator(_8);
+ io.print(_12);
+ redo (_12,_13,_9:int ):= bat.hasMoreElements(_8);
+catch MALException:str ;
+exit MALException:str ;
+exit (_12,_13,_9:int );
end qry;
# 00:18:07 >
Index: inline02.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline02.stable.out,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inline02.stable.out 26 Dec 2007 17:24:41 -0000 1.1
+++ inline02.stable.out 27 Dec 2007 12:35:43 -0000 1.2
@@ -44,18 +44,22 @@
#
function user.main():void; # 0 (main:void)
# remapping inline functions # 1 (_1:str)
- mdb.list("user","qry"); # 2 MDBlist3 (_6:void)<-(_3:str)(_4:str)
-end main; # 3
+# inspired by SQL module # 2 (_2:str)
+ mdb.list("user","qry"); # 3 MDBlist3 (_7:void)<-(_4:str)(_5:str)
+end main; # 4
function user.qry():void;
b := bat.new(:oid,:int);
bat.insert(b,[EMAIL PROTECTED],1);
+ zz := nil:int;
_16 := calc.+(1,2);
zz := _16;
# base line test for inlining
- _20 := batcalc.+(b,b);
- z:bat[:oid,:int]{inline} := _20;
- _24 := batcalc.+(b,2);
- z:bat[:oid,:int]{inline} := _24;
+ z:bat[:oid,:int]{inline} := nil;
+ _21 := batcalc.+(b,b);
+ z:bat[:oid,:int]{inline} := _21;
+ z:bat[:oid,:int]{inline} := nil;
+ _26 := batcalc.+(b,2);
+ z:bat[:oid,:int]{inline} := _26;
end qry;
# 18:00:43 >
Index: emptyset01.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/emptyset01.stable.out,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- emptyset01.stable.out 26 Dec 2007 14:34:04 -0000 1.4
+++ emptyset01.stable.out 27 Dec 2007 12:35:42 -0000 1.5
@@ -70,14 +70,15 @@
V16 := algebra.markT(V12); # 6 ALGtmark_default
(V16:bat[:oid,:oid])<-(V12:bat[:oid,:int])
V17 := algebra.join(V16,V7); # 7 ALGjoin
(V17:bat[:oid,:int])<-(V16:bat[:oid,:oid])(V7:bat[:oid,:int])
bat.append(V1,V17); # 8 BKCappend_wrap
(_11:void)<-(V1:bat[:oid,:int])(V17:bat[:oid,:int])
-barrier (_17,_18,_19):= bat.newIterator(V1); # 9 CHPbunIterator
(_17:lng)(_18:oid)(_19:int)<-(V1:bat[:oid,:int]) jump 14
- io.print("loop"); # 10 IOprint_val (_20:void)<-(_21:str)
-catch MALException:str ; # 11 (MALException:str) jump 13
- io.print(MALException); # 12 IOprint_val (_23:void)<-(MALException:str)
-exit MALException:str ; # 13 (MALException:str)
-exit (_17,_18,_19); # 14 (_17:lng)(_18:oid)(_19:int)
- io.print("done"); # 15 IOprint_val (_13:void)<-(_14:str)
-end tst; # 16
+ nil:void; # 9 (_12:void)<-(_24:void)
+barrier (_17,_18,_19):= bat.newIterator(V1); # 10 CHPbunIterator
(_17:lng)(_18:oid)(_19:int)<-(V1:bat[:oid,:int]) jump 15
+ io.print("loop"); # 11 IOprint_val (_20:void)<-(_21:str)
+catch MALException:str ; # 12 (MALException:str) jump 14
+ io.print(MALException); # 13 IOprint_val (_23:void)<-(MALException:str)
+exit MALException:str ; # 14 (MALException:str)
+exit (_17,_18,_19); # 15 (_17:lng)(_18:oid)(_19:int)
+ io.print("done"); # 16 IOprint_val (_13:void)<-(_14:str)
+end tst; # 17
# 08:05:29 >
# 08:05:29 > Done.
Index: inline02.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline02.mal,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- inline02.mal 25 Dec 2007 13:22:32 -0000 1.2
+++ inline02.mal 27 Dec 2007 12:35:43 -0000 1.3
@@ -1,4 +1,5 @@
# remapping inline functions
+# inspired by SQL module
function foo{inline}(a:int,b:int):int;
c:= a+b;
return foo:=c;
Index: inline04.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline04.stable.out,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inline04.stable.out 26 Dec 2007 17:24:41 -0000 1.1
+++ inline04.stable.out 27 Dec 2007 12:35:43 -0000 1.2
@@ -62,6 +62,7 @@
function user.qry():void;
b := bat.new(:oid,:int);
bat.insert(b,[EMAIL PROTECTED],1);
+ z:bat[:oid,:int]{inline} := nil;
_14 := batcalc.+(b,b);
_15 := 1;
barrier _16 := true;
@@ -70,14 +71,15 @@
redo _16 := calc.<(_15,3);
exit _16;
z:bat[:oid,:int]{inline} := _14;
- _22 := batcalc.+(b,2);
- _23 := 1;
-barrier _24 := true;
- _22 := batcalc.*(_22,_22);
- _23 := calc.+(_23,1);
- redo _24 := calc.<(_23,3);
-exit _24;
- z:bat[:oid,:int]{inline} := _22;
+ z:bat[:oid,:int]{inline} := nil;
+ _23 := batcalc.+(b,2);
+ _24 := 1;
+barrier _25 := true;
+ _23 := batcalc.*(_23,_23);
+ _24 := calc.+(_24,1);
+ redo _25 := calc.<(_24,3);
+exit _25;
+ z:bat[:oid,:int]{inline} := _23;
end qry;
# 18:00:43 >
Index: inline06.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline06.stable.out,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inline06.stable.out 26 Dec 2007 17:24:41 -0000 1.1
+++ inline06.stable.out 27 Dec 2007 12:35:43 -0000 1.2
@@ -52,16 +52,18 @@
function user.qry():void;
b := bat.new(:oid,:int);
bat.insert(b,[EMAIL PROTECTED],1);
+ z:bat[:oid,:int]{inline} := nil;
_14 := batcalc.+(b,b);
_15 := mmath.rand();
# this has a memory-side effect
_14 := batcalc.*(_14,_15);
z:bat[:oid,:int]{inline} := _14;
- _20 := batcalc.+(b,2);
- _21 := mmath.rand();
+ z:bat[:oid,:int]{inline} := nil;
+ _21 := batcalc.+(b,2);
+ _22 := mmath.rand();
# this has a memory-side effect
- _20 := batcalc.*(_20,_21);
- z:bat[:oid,:int]{inline} := _20;
+ _21 := batcalc.*(_21,_22);
+ z:bat[:oid,:int]{inline} := _21;
end qry;
# 18:00:44 >
Index: inline03.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/inline03.stable.out,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inline03.stable.out 26 Dec 2007 17:24:41 -0000 1.1
+++ inline03.stable.out 27 Dec 2007 12:35:43 -0000 1.2
@@ -50,14 +50,16 @@
function user.qry():void;
b := bat.new(:oid,:int);
bat.insert(b,[EMAIL PROTECTED],1);
+ z:bat[:oid,:int]{inline} := nil;
_14 := 1;
_15 := batcalc.+(b,b);
_15 := batcalc.*(_15,_14);
z:bat[:oid,:int]{inline} := _15;
- _19 := 1;
- _20 := batcalc.+(b,2);
- _20 := batcalc.*(_20,_19);
- z:bat[:oid,:int]{inline} := _20;
+ z:bat[:oid,:int]{inline} := nil;
+ _20 := 1;
+ _21 := batcalc.+(b,2);
+ _21 := batcalc.*(_21,_20);
+ z:bat[:oid,:int]{inline} := _21;
end qry;
# 18:00:43 >
-------------------------------------------------------------------------
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
