Update of /cvsroot/monetdb/MonetDB5/src/optimizer/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1361/optimizer/Tests
Modified Files:
remote01.mal remote01.stable.out remote02.mal remote03.mal
remote04.mal remote04.stable.out remote05.mal
remote05.stable.out remote06.mal remote06.stable.out
remote07.mal remote07.stable.out
Log Message:
Properly disconnect to avoid hanging clients.
Index: remote05.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote05.stable.out,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- remote05.stable.out 17 Jan 2007 15:45:09 -0000 1.10
+++ remote05.stable.out 8 Jun 2007 08:47:31 -0000 1.11
@@ -33,7 +33,8 @@
#mserver.trace(mid,1); # 7 (_12:str)
mserver.query(mid,"io.print(d);"); # 8 SERVERquery
(_13:int)<-(mid:int)(_14:str)
io.print("done"); # 9 IOprint_val (_15:void)<-(_16:str)
-end main; # 10
+ 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
# 15:27:53 >
Index: remote04.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote04.stable.out,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- remote04.stable.out 17 Jan 2007 15:45:09 -0000 1.3
+++ remote04.stable.out 8 Jun 2007 08:47:31 -0000 1.4
@@ -32,7 +32,8 @@
#mserver.trace(mid,1); # 7 (_12:str)
s:str := mserver.rpc(mid,"io.print(123456);"); # 8
SERVERmapi_rpc_single_row (s:str)<-(mid:int)(_14:str)
io.print(s); # 9 IOprint_val (_15:void)<-(s:str)
-end main; # 10
+ mserver.disconnect(mid); # 10 SERVERdisconnect (_16:void)<-(mid:int)
+end main; # 11
[ "123456" ]
# 18:22:21 >
Index: remote07.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote07.stable.out,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- remote07.stable.out 17 Jan 2007 15:45:09 -0000 1.9
+++ remote07.stable.out 8 Jun 2007 08:47:31 -0000 1.10
@@ -58,7 +58,8 @@
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)
io.print(d); # 20 IOprint_val (_38:void)<-(d:bat[:int,:int])
-end main; # 21
+ 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
Index: remote01.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote01.mal,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- remote01.mal 17 Jan 2007 15:45:09 -0000 1.5
+++ remote01.mal 8 Jun 2007 08:47:31 -0000 1.6
@@ -33,4 +33,5 @@
io.printf(" count %d\n",i);
d:bat[:int,:int]:= mserver.rpc(mid,"io.print(d);");
io.print(d);
+mserver.disconnect(mid);
optimizer.remoteQueries();
Index: remote02.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote02.mal,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- remote02.mal 4 Aug 2006 19:31:12 -0000 1.2
+++ remote02.mal 8 Jun 2007 08:47:31 -0000 1.3
@@ -21,4 +21,5 @@
i:=aggr.count(e);
io.printf(" count %d\n",i);
io.print(d);
+mserver.disconnect(mid);
optimizer.remoteQueries();
Index: remote03.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote03.mal,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- remote03.mal 13 May 2006 20:29:49 -0000 1.2
+++ remote03.mal 8 Jun 2007 08:47:31 -0000 1.3
@@ -40,5 +40,6 @@
redo Z99;
exit Z99;
end s0_0;
+mserver.disconnect(mid);
optimizer.remoteQueries("sql_cache","s0_0");
mdb.List("sql_cache","s0_0");
Index: remote04.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote04.mal,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- remote04.mal 17 Jan 2007 15:45:09 -0000 1.2
+++ remote04.mal 8 Jun 2007 08:47:31 -0000 1.3
@@ -7,3 +7,4 @@
#mserver.trace(mid,1);
s:str:= mserver.rpc(mid,"io.print(123456);");
io.print(s);
+mserver.disconnect(mid);
Index: remote05.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote05.mal,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- remote05.mal 17 Jan 2007 15:45:09 -0000 1.2
+++ remote05.mal 8 Jun 2007 08:47:31 -0000 1.3
@@ -8,3 +8,4 @@
#mserver.trace(mid,1);
mserver.query(mid,"io.print(d);");
io.print("done");
+mserver.disconnect(mid);
Index: remote06.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote06.mal,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- remote06.mal 17 Jan 2007 15:45:09 -0000 1.2
+++ remote06.mal 8 Jun 2007 08:47:31 -0000 1.3
@@ -8,3 +8,4 @@
#mserver.trace(mid,1);
mserver.rpc(mid,"io.print(d);");
io.print("done");
+mserver.disconnect(mid);
Index: remote07.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote07.mal,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- remote07.mal 17 Jan 2007 15:45:09 -0000 1.2
+++ remote07.mal 8 Jun 2007 08:47:31 -0000 1.3
@@ -21,4 +21,5 @@
io.printf(" count %d\n",i);
d:bat[:int,:int]:= mserver.rpc(mid,"io.print(d);");
io.print(d);
+mserver.disconnect(mid);
optimizer.remoteQueries();
Index: remote01.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote01.stable.out,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- remote01.stable.out 7 May 2007 07:50:15 -0000 1.9
+++ remote01.stable.out 8 Jun 2007 08:47:31 -0000 1.10
@@ -52,8 +52,8 @@
mserver.rpc(mid,"c:=algebra.select(rb,0,4);"); # 17 SERVERquery
(_30:void)<-(mid:int)(_31:str)
c:bat[:int,:int] := mserver.rpc(mid,"io.print(c);"); # 18
SERVERmapi_rpc_bat (c:bat[:int,:int])<-(mid:int)(_28:str)
io.print(c); # 19 IOprint_val (_32:void)<-(c:bat[:int,:int])
- mserver.rpc(mid,"b:bat[:int,:int] := bbp.bind(\"rbat\":str);"); # 20
SERVERmapi_rpc_bat (_56:bat[:int,:int])<-(mid:int)(_57:str)
- b:bat[:int,:int] := mserver.rpc(mid,"io.print(b);"); # 21
SERVERmapi_rpc_bat (b:bat[:int,:int])<-(mid:int)(_59:str)
+ mserver.rpc(mid,"b:bat[:int,:int] := bbp.bind(\"rbat\":str);"); # 20
SERVERmapi_rpc_bat (_57:bat[:int,:int])<-(mid:int)(_58:str)
+ b:bat[:int,:int] := mserver.rpc(mid,"io.print(b);"); # 21
SERVERmapi_rpc_bat (b:bat[:int,:int])<-(mid:int)(_60:str)
io.print(b); # 22 IOprint_val (_35:void)<-(b:bat[:int,:int])
# see if we can do some remote selections. # 23 (_36:str)
mserver.rpc(mid,"d:=algebra.select(b,5,10);"); # 24 SERVERquery
(_37:void)<-(mid:int)(_38:str)
@@ -65,7 +65,8 @@
io.printf(" count %d\n",i); # 30 IOprint_formatted_lng
(_50:void)<-(_51:str)(i:lng)
d:bat[:int,:int] := mserver.rpc(mid,"io.print(d);"); # 31
SERVERmapi_rpc_bat (d:bat[:int,:int])<-(mid:int)(_53:str)
io.print(d); # 32 IOprint_val (_54:void)<-(d:bat[:int,:int])
-end main; # 33
+ mserver.disconnect(mid); # 33 SERVERdisconnect (_55:void)<-(mid:int)
+end main; # 34
#-----------------#
# h t # name
# int int # type
Index: remote06.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote06.stable.out,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- remote06.stable.out 17 Jan 2007 15:45:09 -0000 1.10
+++ remote06.stable.out 8 Jun 2007 08:47:31 -0000 1.11
@@ -33,7 +33,8 @@
#mserver.trace(mid,1); # 7 (_12:str)
mserver.rpc(mid,"io.print(d);"); # 8 SERVERquery
(_13:void)<-(mid:int)(_14:str)
io.print("done"); # 9 IOprint_val (_15:void)<-(_16:str)
-end main; # 10
+ 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
# 15:27:53 >
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
