Update of /cvsroot/monetdb/MonetDB5/src/optimizer/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5567/optimizer/Tests
Modified Files:
GCexample01.stable.out SRexample.mal SRexample.stable.out
emptyset00.stable.out partitions00.stable.out
partitions01.stable.out partitions04.stable.out
partitions05.stable.out partitions06.stable.out
rangePush01.stable.out remote05.mal remote05.stable.out
remote07.mal remote07.stable.out tst4004.mal
tst4004.stable.out tst4631.stable.out tst4730.stable.out
tst4900.stable.out
Added Files:
inline08.stable.err inline08.stable.out
Log Message:
Approvals of the changes due to major code patch.
Index: tst4730.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/tst4730.stable.out,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- tst4730.stable.out 25 Dec 2007 13:22:32 -0000 1.41
+++ tst4730.stable.out 2 Jan 2008 08:23:29 -0000 1.42
@@ -20,13 +20,13 @@
# return bbp.new(:any_1,:any_2);
#end bind;
function user.bind(s:str,t:str,c:str,i:int):bat[:any_1,:any_2]; # 0
dynamic (bind:bat[:any_1,:any_2])<-(s:str)(t:str)(c:str)(i:int)
- return bat.new(:any_1,:any_2); # 1 CMDBATnew
(_5:bat[:any,:any])<-(_6:any_1)(_7:any_2)
+ return _5 := bat.new(:any_1,:any_2); # 1 CMDBATnew
(_5:bat[:any,:any])<-(_6:any_1)(_7:any_2)
end bind; # 2
#function user.bind_dbat(s:str,t:str,i:int):bat[:any_1,:any_2];
# return bbp.new(:any_1,:any_2);
#end bind_dbat;
function user.bind_dbat(s:str,t:str,i:int):bat[:any_1,:any_2]; # 0 dynamic
(bind_dbat:bat[:any_1,:any_2])<-(s:str)(t:str)(i:int)
- return bat.new(:any_1,:any_2); # 1 CMDBATnew
(_4:bat[:any,:any])<-(_5:any_1)(_6:any_2)
+ return _4 := bat.new(:any_1,:any_2); # 1 CMDBATnew
(_4:bat[:any,:any])<-(_5:any_1)(_6:any_2)
end bind_dbat; # 2
#function user.column(b:bat[:void,:any_1],s:str,t:str,i:int,j:int):void;
#end column;
Index: remote05.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote05.stable.out,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- remote05.stable.out 8 Jun 2007 08:47:31 -0000 1.11
+++ remote05.stable.out 2 Jan 2008 08:23:27 -0000 1.12
@@ -31,11 +31,11 @@
port := calc.int(fs); # 5 CALCstr2int (port:int)<-(fs:str)
mid :=
mserver.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal"); # 6
SERVERreconnectAlias
(mid:int)<-(_8:str)(port:int)(_9:str)(_10:str)(_10:str)(_11:str)
#mserver.trace(mid,1); # 7 (_12:str)
- mserver.query(mid,"io.print(d);"); # 8 SERVERquery
(_13:int)<-(mid:int)(_14:str)
+ mserver.query(mid,"io.print(1);"); # 8 SERVERquery
(_13:int)<-(mid:int)(_14:str)
io.print("done"); # 9 IOprint_val (_15:void)<-(_16:str)
mserver.disconnect(mid); # 10 SERVERdisconnect (_17:void)<-(mid:int)
end main; # 11
-!MALException:mserver.query:remote error: TypeException:user.main[1]:'d' may
not be used before being initialized
+[ "done" ]
# 15:27:53 >
# 15:27:53 > Done.
--- NEW FILE: inline08.stable.err ---
stderr of test 'inline08` in directory 'src/optimizer` itself:
# 20:02:17 >
# 20:02:17 > mserver5 "--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf"
--debug=10 --set
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set mapi_open=true
--set xrpc_open=true --set mapi_port=30645 --set xrpc_port=40491 --set
monet_prompt= --trace --dbname=mTests_src_optimizer inline08.mal
# 20:02:17 >
#warning: please don't forget to set your vault key!
#(see /ufs/mk/monet5/Linux/etc/monetdb5.conf)
# 20:02:17 >
# 20:02:17 > Done.
# 20:02:17 >
Index: remote07.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote07.stable.out,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- remote07.stable.out 8 Jun 2007 08:47:31 -0000 1.10
+++ remote07.stable.out 2 Jan 2008 08:23:27 -0000 1.11
@@ -54,16 +54,18 @@
mserver.rpc(mid,"c:=algebra.select(rb,0,12);"); # 14 SERVERquery
(_25:void)<-(mid:int)(_26:str)
low := calc.+(5,1); # 15 CALCbinaryADDintint
(low:int)<-(_28:int)(_29:int)
mserver.put(mid,"low",low); # 16 SERVERput
(_30:void)<-(mid:int)(_31:str)(low:int)
- i:lng := mserver.rpc(mid,"e:=algebra.select(d,low,7); i:=aggr.count(d);
io.print(i);"); # 17 SERVERmapi_rpc_single_row (i:lng)<-(mid:int)(_33:str)
+ i:lng := mserver.rpc(mid,"e:=algebra.select(rb,low,7); i:=aggr.count(e);
io.print(i);"); # 17 SERVERmapi_rpc_single_row (i:lng)<-(mid:int)(_33:str)
io.printf(" count %d\n",i); # 18 IOprint_formatted_lng
(_34:void)<-(_35:str)(i:lng)
- d:bat[:int,:int] := mserver.rpc(mid,"io.print(d);"); # 19
SERVERmapi_rpc_bat (d:bat[:int,:int])<-(mid:int)(_37:str)
+ d:bat[:int,:int] := mserver.rpc(mid,"io.print(i);"); # 19
SERVERmapi_rpc_bat (d:bat[:int,:int])<-(mid:int)(_37:str)
io.print(d); # 20 IOprint_val (_38:void)<-(d:bat[:int,:int])
mserver.disconnect(mid); # 21 SERVERdisconnect (_39:void)<-(mid:int)
end main; # 22
-!MALException:mserver.rpc:remote error:
TypeException:user.main[1]:'algebra.select' undefined in: e:any :=
algebra.select(d:any, low:int, _6:int)
-!MALException:mserver.rpc:remote error:TypeException:user.main[2]:'aggr.count'
undefined in: i:any := aggr.count(d:any)
-!MALException:mserver.rpc:remote error:TypeException:user.main[1]:'d' may not
be used before being initialized
-!MALException:mserver.rpc:remote error:TypeException:user.main[2]:'d' may not
be used before being initialized
+ count 2
+#-----------------#
+# h t # name
+# int int # type
+#-----------------#
+[ 2, nil ]
# 15:27:54 >
# 15:27:54 > Done.
--- NEW FILE: inline08.stable.out ---
stdout of test 'inline08` in directory 'src/optimizer` itself:
# 20:02:17 >
# 20:02:17 > mserver5 "--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf"
--debug=10 --set
"monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin"
--set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set mapi_open=true
--set xrpc_open=true --set mapi_port=30645 --set xrpc_port=40491 --set
monet_prompt= --trace --dbname=mTests_src_optimizer inline08.mal
# 20:02:17 >
# MonetDB server v5.3.0, based on kernel v1.21.0
# Serving database 'mTests_src_optimizer'
# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
# Copyright (c) 1993-2007 CWI, all rights reserved
# Visit http://monetdb.cwi.nl/ for further information
# Listening for connection requests on mapi:monetdb://gio.ins.cwi.nl:30645/
#
## remapping inline functions
#function foo{inline}(a:str):str;
# a:= str.replace(a,"A","");
# a:= str.replace(a,"E","");
# a:= str.replace(a,"I","");
# a:= str.replace(a,"O","");
# a:= str.replace(a,"U","");
# a:= str.replace(a," ","");
# return foo:=a;
#end foo;
function user.foo{inline}(a:str):str; # 0 (foo:str)<-(a:str)
a := str.replace(a,"A",""); # 1 STRreplace (a:str)<-(a:str)(_2:str)(_3:str)
a := str.replace(a,"E",""); # 2 STRreplace (a:str)<-(a:str)(_4:str)(_3:str)
a := str.replace(a,"I",""); # 3 STRreplace (a:str)<-(a:str)(_5:str)(_3:str)
a := str.replace(a,"O",""); # 4 STRreplace (a:str)<-(a:str)(_6:str)(_3:str)
a := str.replace(a,"U",""); # 5 STRreplace (a:str)<-(a:str)(_7:str)(_3:str)
a := str.replace(a," ",""); # 6 STRreplace (a:str)<-(a:str)(_8:str)(_3:str)
return foo{inline} := a; # 7 (foo:str)<-(a:str)
end foo; # 8
#
#function bar{inline}(a:str,b:str):str;
# sa:= user.foo(a);
# sb:= user.foo(b);
# c:= sa+sb;
# return bar:=c;
#end bar;
function user.bar{inline}(a:str,b:str):str; # 0 (bar:str)<-(a:str)(b:str)
sa := user.foo(a); # 1 (sa:str)<-(a:str)
sb := user.foo(b); # 2 (sb:str)<-(b:str)
c := calc.+(sa,sb); # 3 CALCstrConcat (c:str)<-(sa:str)(sb:str)
return bar{inline} := c; # 4 (bar:str)<-(c:str)
end bar; # 5
#
#function qry();
# b:= bat.new(:oid,:str);
# bat.insert(b,[EMAIL PROTECTED],1);
# z:bat[:oid,:str]:= mal.multiplex("user","bar",b,b);
#end qry;
!TypeException:user.qry[2]:'bat.insert' undefined in: _4:any :=
bat.insert(b:bat[:oid,:str], _5:oid, _6:int)
function user.qry():void; # 0 (qry:void)
b := bat.new(:oid,:str); # 1 CMDBATnew
(b:bat[:oid,:str])<-(_2:oid)(_3:str)
bat.insert(b,[EMAIL PROTECTED],1); # 2 unknown
(_4:any)<-(b:bat[:oid,:str])(_5:oid)(_6:int)
z:bat[:oid,:str] := mal.multiplex("user","bar",b,b); # 3
OPTremapMultiplex
(z:bat[:oid,:str])<-(_8:str)(_9:str)(b:bat[:oid,:str])(b:bat[:oid,:str])
end qry; # 4
#
# optimizer.inline("user","bar");
# optimizer.inline("user","qry");
# optimizer.remap("user","qry");
# mdb.list("user","qry");
#
function user.main():void; # 0 (main:void)
# remapping inline functions # 1 (_1:str)
mdb.list("user","qry"); # 2 MDBlist3 (_8:void)<-(_3:str)(_6:str)
end main; # 3
function user.qry():void;
b := bat.new(:oid,:str);
bat.insert(b,[EMAIL PROTECTED],1);
z:bat[:oid,:str] := mal.multiplex("user","bar",b,b);
end qry;
# 20:02:17 >
# 20:02:17 > Done.
# 20:02:17 >
Index: rangePush01.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/rangePush01.stable.out,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rangePush01.stable.out 19 May 2007 06:07:43 -0000 1.8
+++ rangePush01.stable.out 2 Jan 2008 08:23:26 -0000 1.9
@@ -26,26 +26,26 @@
#
function user.main():void; # 0 (main:void)
# detect empty ranges # 1 (_1:str)
- b := bat.new(nil:void,nil:int); # 2 CMDBATnew
(b:bat[:void,:int])<-(_3:void)(_4:int)
+ b := bat.new(:void,:int); # 2 CMDBATnew
(b:bat[:void,:int])<-(_3:void)(_4:int)
s1 := algebra.select(b,80,90); # 3 ALGselect
(s1:bat[:void,:int])<-(b:bat[:void,:int])(_6:int)(_7:int)
- s2{rows=0:lng} := bat.new(nil:void,nil:int); # 4 CMDBATnew
(s2:bat[:void,:int])<-(_3:void)(_4:int)
+ s2{rows=0:lng} := bat.new(:void,:int); # 4 CMDBATnew
(s2:bat[:void,:int])<-(_3:void)(_4:int)
s3 := algebra.select(b,80,80); # 5 ALGselect
(s3:bat[:void,:int])<-(b:bat[:void,:int])(_6:int)(_6:int)
s4 := algebra.select(b,80,80,true,true); # 6 ALGselectInclusive
(s4:bat[:void,:int])<-(b:bat[:void,:int])(_6:int)(_6:int)(_11:bit)(_11:bit)
- s5{rows=0:lng} := bat.new(nil:void,nil:int); # 7 CMDBATnew
(s5:bat[:void,:int])<-(_3:void)(_4:int)
- s6{rows=0:lng} := bat.new(nil:void,nil:int); # 8 CMDBATnew
(s6:bat[:void,:int])<-(_3:void)(_4:int)
- s7{rows=0:lng} := bat.new(nil:void,nil:int); # 9 CMDBATnew
(s7:bat[:void,:int])<-(_3:void)(_4:int)
+ s5{rows=0:lng} := bat.new(:void,:int); # 7 CMDBATnew
(s5:bat[:void,:int])<-(_3:void)(_4:int)
+ s6{rows=0:lng} := bat.new(:void,:int); # 8 CMDBATnew
(s6:bat[:void,:int])<-(_3:void)(_4:int)
+ s7{rows=0:lng} := bat.new(:void,:int); # 9 CMDBATnew
(s7:bat[:void,:int])<-(_3:void)(_4:int)
mdb.list(); # 10 MDBlist (_17:void)
end main; # 11
function user.main():void;
# detect empty ranges
- b := bat.new(nil:void,nil:int);
+ b := bat.new(:void,:int);
s1 := algebra.select(b,80,90);
- s2{rows=0:lng} := bat.new(nil:void,nil:int);
+ s2{rows=0:lng} := bat.new(:void,:int);
s3 := algebra.select(b,80,80);
s4 := algebra.select(b,80,80,true,true);
- s5{rows=0:lng} := bat.new(nil:void,nil:int);
- s6{rows=0:lng} := bat.new(nil:void,nil:int);
- s7{rows=0:lng} := bat.new(nil:void,nil:int);
+ s5{rows=0:lng} := bat.new(:void,:int);
+ s6{rows=0:lng} := bat.new(:void,:int);
+ s7{rows=0:lng} := bat.new(:void,:int);
mdb.list();
end main;
Index: tst4004.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/tst4004.mal,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tst4004.mal 11 Aug 2006 21:06:46 -0000 1.4
+++ tst4004.mal 2 Jan 2008 08:23:27 -0000 1.5
@@ -2,6 +2,7 @@
A :=23;
D :=22;
+F := 1;
B:= true;
barrier c:= B;
Index: partitions06.stable.out
===================================================================
RCS file:
/cvsroot/monetdb/MonetDB5/src/optimizer/Tests/partitions06.stable.out,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- partitions06.stable.out 9 Dec 2007 16:21:17 -0000 1.4
+++ partitions06.stable.out 2 Jan 2008 08:23:26 -0000 1.5
@@ -90,18 +90,20 @@
x15{rows=1:lng} := bat.reverse(x14);
x16{rows=1:lng} := algebra.join(x15,x1);
_46 := bpm.new(:oid,:int);
+ x19{rows=1:lng} := nil;
barrier x17:bat[:oid,:int]{notnil=true,rows=1:lng,bid=772} :=
bpm.newIterator(bpm19);
x19{rows=1:lng} := algebra.join(x15,x17);
bpm.addPartition(_46,x19);
redo x17:bat[:oid,:int]{notnil=true,rows=1:lng,bid=772} :=
bpm.hasMoreElements(bpm19);
exit x17:bat[:oid,:int]{notnil=true,rows=1:lng,bid=772} ;
- _52 := bpm.new(:oid,:int);
+ _54 := bpm.new(:oid,:int);
+ x33 := nil;
barrier x19{rows=1:lng} := bpm.newIterator(_46);
x33 := algebra.reuse(x19);
- bpm.addPartition(_52,x33);
+ bpm.addPartition(_54,x33);
redo x19{rows=1:lng} := bpm.hasMoreElements(_46);
exit x19{rows=1:lng};
- x33 := bpm.fold(_52);
+ x33 := bpm.fold(_54);
x19{rows=1:lng} := bpm.fold(_46);
x20:bat[:oid,:int]{rows=1:lng} := batcalc.+(x33,x16,x19);
x20:bat[:oid,:int]{rows=1:lng} := batcalc.+(x20,x20,x16);
Index: partitions01.stable.out
===================================================================
RCS file:
/cvsroot/monetdb/MonetDB5/src/optimizer/Tests/partitions01.stable.out,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- partitions01.stable.out 9 Dec 2007 16:21:16 -0000 1.8
+++ partitions01.stable.out 2 Jan 2008 08:23:23 -0000 1.9
@@ -77,6 +77,7 @@
x19{rows=1} := bat.reverse(x18);
x20{rows=1} := algebra.join(x19,x1);
_39 := bpm.new(:oid,:int);
+ x28{rows=1} := nil;
barrier x21:bat[:oid,:int]{bid=815,rows=1,notnil=true} :=
bpm.newIterator(bpm17);
x28{rows=1} := algebra.join(x19,x21);
bpm.addPartition(_39,x28);
Index: tst4900.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/tst4900.stable.out,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- tst4900.stable.out 4 Oct 2007 10:37:42 -0000 1.36
+++ tst4900.stable.out 2 Jan 2008 08:23:29 -0000 1.37
@@ -189,11 +189,6 @@
# ##f1();
#
#
-!TypeException:user.f1[93]:'t59' may not be used before being initialized
-!TypeException:user.f1[93]:'t59' may not be used before being initialized
-!TypeException:user.f1[93]:'t59' may not be used before being initialized
-!TypeException:user.f1[120]:'t85' may not be used before being initialized
-!TypeException:user.f1[120]:'t85' may not be used before being initialized
function user.main():void; # 0 (main:void)
mdb.list("user","f1"); # 1 MDBlist3 (_6:void)<-(_2:str)(_3:str)
##f1(); # 2 (_8:str)
Index: GCexample01.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/GCexample01.stable.out,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- GCexample01.stable.out 3 May 2007 10:29:37 -0000 1.3
+++ GCexample01.stable.out 2 Jan 2008 08:23:20 -0000 1.4
@@ -56,15 +56,18 @@
d := bat.new(:int,:int);
bat.insert(b,1,1);
barrier (x,y,z):= bat.newIterator(b);
+ b := nil;
io.print(x);
exit (x,y,z);
barrier (x,y,z):= bat.newIterator(c);
io.print(x);
redo (x,y,z):= bat.hasMoreElements(c);
+ c := nil;
exit (x,y,z);
# do not close d, it may be reused
barrier go := true;
io.print(d);
+ d := nil;
redo go := true;
exit go;
end qry;
Index: remote07.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote07.mal,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- remote07.mal 8 Jun 2007 08:47:31 -0000 1.3
+++ remote07.mal 2 Jan 2008 08:23:27 -0000 1.4
@@ -17,9 +17,9 @@
low:= 5+1;
mserver.put(mid,"low",low);
-i:lng:= mserver.rpc(mid,"e:=algebra.select(d,low,7); i:=aggr.count(d);
io.print(i);");
+i:lng:= mserver.rpc(mid,"e:=algebra.select(rb,low,7); i:=aggr.count(e);
io.print(i);");
io.printf(" count %d\n",i);
-d:bat[:int,:int]:= mserver.rpc(mid,"io.print(d);");
+d:bat[:int,:int]:= mserver.rpc(mid,"io.print(i);");
io.print(d);
mserver.disconnect(mid);
optimizer.remoteQueries();
Index: tst4631.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/tst4631.stable.out,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- tst4631.stable.out 17 Aug 2007 13:56:57 -0000 1.39
+++ tst4631.stable.out 2 Jan 2008 08:23:29 -0000 1.40
@@ -19,13 +19,13 @@
# return bat.new(:any_1,:any_2);
#end bind;
function user.bind(s:str,t:str,c:str,i:int):bat[:any_1,:any_2]; # 0
dynamic (bind:bat[:any_1,:any_2])<-(s:str)(t:str)(c:str)(i:int)
- return bat.new(:any_1,:any_2); # 1 CMDBATnew
(_5:bat[:any,:any])<-(_6:any_1)(_7:any_2)
+ return _5 := bat.new(:any_1,:any_2); # 1 CMDBATnew
(_5:bat[:any,:any])<-(_6:any_1)(_7:any_2)
end bind; # 2
#function user.bind_dbat(s:str,t:str,i:int):bat[:any_1,:any_2];
# return bat.new(:any_1,:any_2);
#end bind_dbat;
function user.bind_dbat(s:str,t:str,i:int):bat[:any_1,:any_2]; # 0 dynamic
(bind_dbat:bat[:any_1,:any_2])<-(s:str)(t:str)(i:int)
- return bat.new(:any_1,:any_2); # 1 CMDBATnew
(_4:bat[:any,:any])<-(_5:any_1)(_6:any_2)
+ return _4 := bat.new(:any_1,:any_2); # 1 CMDBATnew
(_4:bat[:any,:any])<-(_5:any_1)(_6:any_2)
end bind_dbat; # 2
#
#function qry1();
Index: emptyset00.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/emptyset00.stable.out,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- emptyset00.stable.out 19 May 2007 06:07:43 -0000 1.11
+++ emptyset00.stable.out 2 Jan 2008 08:23:21 -0000 1.12
@@ -22,10 +22,10 @@
#mdb.list();
#
function user.main():void; # 0 (main:void)
- b := bat.new([EMAIL PROTECTED]:oid,nil:int); # 1 CMDBATnew
(b:bat[:oid,:int])<-(_2:oid)(_3:int)
+ b := bat.new(:oid,:int); # 1 CMDBATnew
(b:bat[:oid,:int])<-(_2:oid)(_3:int)
s1 := algebra.select(b,80,90); # 2 ALGselect
(s1:bat[:oid,:int])<-(b:bat[:oid,:int])(_5:int)(_6:int)
- s2{rows=0:lng} := bat.new([EMAIL PROTECTED]:oid,nil:int); # 3 CMDBATnew
(s2:bat[:oid,:int])<-(_2:oid)(_3:int)
- s3{rows=0:lng} := bat.new([EMAIL PROTECTED]:oid,nil:int); # 4 CMDBATnew
(s3:bat[:oid,:int])<-(_2:oid)(_3:int)
+ s2{rows=0:lng} := bat.new(:oid,:int); # 3 CMDBATnew
(s2:bat[:oid,:int])<-(_2:oid)(_3:int)
+ s3{rows=0:lng} := bat.new(:oid,:int); # 4 CMDBATnew
(s3:bat[:oid,:int])<-(_2:oid)(_3:int)
io.print(s3); # 5 IOprint_val (_9:void)<-(s3:bat[:oid,:int])
mdb.list(); # 6 MDBlist (_12:void)
end main; # 7
@@ -34,10 +34,10 @@
# void int # type
#-----------------#
function user.main():void;
- b := bat.new([EMAIL PROTECTED]:oid,nil:int);
+ b := bat.new(:oid,:int);
s1 := algebra.select(b,80,90);
- s2{rows=0:lng} := bat.new([EMAIL PROTECTED]:oid,nil:int);
- s3{rows=0:lng} := bat.new([EMAIL PROTECTED]:oid,nil:int);
+ s2{rows=0:lng} := bat.new(:oid,:int);
+ s3{rows=0:lng} := bat.new(:oid,:int);
io.print(s3);
mdb.list();
end main;
Index: SRexample.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/SRexample.stable.out,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- SRexample.stable.out 3 Dec 2006 22:44:02 -0000 1.7
+++ SRexample.stable.out 2 Jan 2008 08:23:21 -0000 1.8
@@ -24,33 +24,35 @@
#mdb.list();
#
function user.main():void; # 0 (main:void)
- i := 23; # 1 (i:int)<-(_7:int)
+ i := 23; # 1 (i:int)<-(_9:int)
# simple strength reduction # 2 (_1:str)
j := "hello world"; # 3 (j:str)<-(_3:str)
-barrier go := true; # 4 (go:bit)<-(_5:bit) jump 9
- j := "not moved"; # 5 (j:str)<-(_8:str)
- k := j; # 6 (k:str)<-(j:str)
- io.print(i); # 7 IOprint_val (_10:void)<-(i:int)
- redo go := false; # 8 (go:bit)<-(_11:bit) jump 5
-exit go; # 9 (go:bit)
- z := j; # 10 (z:str)<-(j:str)
-# This shows it should not work for blocks in general # 11 (_13:str)
- r := "hello world"; # 12 (r:str)<-(_3:str)
-barrier go := true; # 13 (go:bit)<-(_5:bit) jump 18
- s := 23; # 14 (s:int)<-(_7:int)
- r := "not moved"; # 15 (r:str)<-(_8:str)
- k := r; # 16 (k:str)<-(r:str)
- io.print(s); # 17 IOprint_val (_16:void)<-(s:int)
-exit go; # 18 (go:bit)
- z := r; # 19 (z:str)<-(r:str)
- mdb.list(); # 20 MDBlist (_18:void)
-end main; # 21
+ k := nil:str; # 4 (k:str)<-(_5:str)
+barrier go := true; # 5 (go:bit)<-(_7:bit) jump 10
+ j := "not moved"; # 6 (j:str)<-(_10:str)
+ k := j; # 7 (k:str)<-(j:str)
+ io.print(i); # 8 IOprint_val (_11:void)<-(i:int)
+ redo go := false; # 9 (go:bit)<-(_12:bit) jump 6
+exit go; # 10 (go:bit)
+ z := j; # 11 (z:str)<-(j:str)
+# This shows it should not work for blocks in general # 12 (_14:str)
+ r := "hello world"; # 13 (r:str)<-(_3:str)
+barrier go := true; # 14 (go:bit)<-(_7:bit) jump 19
+ s := 23; # 15 (s:int)<-(_9:int)
+ r := "not moved"; # 16 (r:str)<-(_10:str)
+ k := r; # 17 (k:str)<-(r:str)
+ io.print(s); # 18 IOprint_val (_17:void)<-(s:int)
+exit go; # 19 (go:bit)
+ z := r; # 20 (z:str)<-(r:str)
+ mdb.list(); # 21 MDBlist (_19:void)
+end main; # 22
[ 23 ]
[ 23 ]
function user.main():void;
i := 23;
# simple strength reduction
j := "hello world";
+ k := nil:str;
barrier go := true;
j := "not moved";
k := j;
Index: partitions04.stable.out
===================================================================
RCS file:
/cvsroot/monetdb/MonetDB5/src/optimizer/Tests/partitions04.stable.out,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- partitions04.stable.out 9 Dec 2007 16:21:17 -0000 1.5
+++ partitions04.stable.out 2 Jan 2008 08:23:25 -0000 1.6
@@ -84,6 +84,7 @@
x11{rows=1} := algebra.markT(x1,[EMAIL PROTECTED]);
x12{rows=1} := bat.reverse(x11);
_40 := bpm.new(:oid,:int);
+ x15{rows=1} := nil;
barrier x13:bat[:oid,:int]{notnil=true,rows=1,bid=2201} :=
bpm.newIterator(bpm17);
x15{rows=1} := algebra.join(x12,x13);
bpm.addPartition(_40,x15);
Index: SRexample.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/SRexample.mal,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- SRexample.mal 17 Sep 2005 11:32:14 -0000 1.3
+++ SRexample.mal 2 Jan 2008 08:23:20 -0000 1.4
@@ -1,5 +1,6 @@
# simple strength reduction
j:= "hello world";
+ k:= nil:str;
barrier go:=true;
i:=23;
j:= "not moved";
Index: tst4004.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/tst4004.stable.out,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- tst4004.stable.out 3 Dec 2006 22:44:03 -0000 1.8
+++ tst4004.stable.out 2 Jan 2008 08:23:28 -0000 1.9
@@ -39,16 +39,16 @@
function user.main():void; # 0 (main:void)
A := 23; # 1 (A:int)<-(_3:int)
D := 22; # 2 (D:int)<-(_5:int)
- B := true; # 3 (B:bit)<-(_7:bit)
+ B := true; # 3 (B:bit)<-(_9:bit)
barrier c := B; # 4 (c:bit)<-(B:bit) jump 7
- A := 1; # 5 (A:int)<-(_9:int)
- D := 3; # 6 (D:int)<-(_10:int)
+ A := 1; # 5 (A:int)<-(_7:int)
+ D := 3; # 6 (D:int)<-(_11:int)
exit c; # 7 (c:bit)
barrier c := calc.not(B); # 8 CALCunarybitNOT (c:bit)<-(B:bit) jump 10
A := 2; # 9 (A:int)<-(_17:int)
exit c; # 10 (c:bit)
- io.print(A); # 11 IOprint_val (_19:void)<-(A:int)
- io.print(D); # 12 IOprint_val (_20:void)<-(D:int)
+ io.print(A); # 11 IOprint_val (_20:void)<-(A:int)
+ io.print(D); # 12 IOprint_val (_21:void)<-(D:int)
end main; # 13
[ 1 ]
[ 3 ]
Index: partitions00.stable.out
===================================================================
RCS file:
/cvsroot/monetdb/MonetDB5/src/optimizer/Tests/partitions00.stable.out,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- partitions00.stable.out 19 Aug 2007 21:02:18 -0000 1.7
+++ partitions00.stable.out 2 Jan 2008 08:23:23 -0000 1.8
@@ -51,39 +51,42 @@
t1:bat[:oid,:int] := sql.bind("sys","t","i",1);
bpm1:bat[:oid,:int] := bpm.unfold(t1);
_20 := bpm.new(:oid,:oid);
+ t11 := nil;
barrier t1:bat[:oid,:int] := bpm.newIterator(bpm1);
t11 := algebra.markT(t1,[EMAIL PROTECTED]);
bpm.addPartition(_20,t11);
redo t1:bat[:oid,:int] := bpm.hasMoreElements(bpm1);
exit t1:bat[:oid,:int] ;
- _26 := bpm.new(:oid,:oid);
+ _28 := bpm.new(:oid,:oid);
+ t12 := nil;
barrier t11 := bpm.newIterator(_20);
t12 := bat.reverse(t11);
- bpm.addPartition(_26,t12);
+ bpm.addPartition(_28,t12);
redo t11 := bpm.hasMoreElements(_20);
exit t11;
- _32 := bpm.new(:oid,:int);
-barrier t12 := bpm.newIterator(_26);
+ _35 := bpm.new(:oid,:int);
+ t13 := nil;
+barrier t12 := bpm.newIterator(_28);
barrier t1:bat[:oid,:int] := bpm.newIterator(bpm1);
t13 := algebra.join(t12,t1);
- bpm.addPartition(_32,t13);
+ bpm.addPartition(_35,t13);
redo t1:bat[:oid,:int] := bpm.hasMoreElements(bpm1);
- redo t12 := bpm.hasMoreElements(_26);
+ redo t12 := bpm.hasMoreElements(_28);
exit t1:bat[:oid,:int] ;
exit t12;
- t13 := bpm.fold(_32);
+ t13 := bpm.fold(_35);
t14 := sql.resultSet(1,1,t13);
sql.rsColumn(t14,"sys.t","i","int",32,0,t13);
sql.exportResult(t14,"");
catch SQLexception;
bpm.garbage(bpm1);
bpm.garbage(_20);
- bpm.garbage(_26);
+ bpm.garbage(_28);
raise SQLexception;
exit SQLexception;
bpm.garbage(bpm1);
bpm.garbage(_20);
- bpm.garbage(_26);
+ bpm.garbage(_28);
end query;
# 09:48:30 >
Index: remote05.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote05.mal,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- remote05.mal 8 Jun 2007 08:47:31 -0000 1.3
+++ remote05.mal 2 Jan 2008 08:23:26 -0000 1.4
@@ -6,6 +6,6 @@
port := calc.int(fs);
mid:= mserver.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
#mserver.trace(mid,1);
-mserver.query(mid,"io.print(d);");
+mserver.query(mid,"io.print(1);");
io.print("done");
mserver.disconnect(mid);
Index: partitions05.stable.out
===================================================================
RCS file:
/cvsroot/monetdb/MonetDB5/src/optimizer/Tests/partitions05.stable.out,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- partitions05.stable.out 9 Dec 2007 16:21:17 -0000 1.5
+++ partitions05.stable.out 2 Jan 2008 08:23:25 -0000 1.6
@@ -88,6 +88,7 @@
x15{rows=1} := bat.reverse(x14);
x16{rows=1} := algebra.join(x15,x1);
_44 := bpm.new(:oid,:int);
+ x19{rows=1} := nil;
barrier x17:bat[:oid,:int]{notnil=true,rows=1,bid=2201} :=
bpm.newIterator(bpm17);
x19{rows=1} := algebra.join(x15,x17);
bpm.addPartition(_44,x19);
-------------------------------------------------------------------------
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
