Update of /cvsroot/monetdb/MonetDB5/src/optimizer/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7721/optimizer/Tests

Modified Files:
        remote00.py remote01.mal 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:
A renaming action to better reflect the actual status of the
old mserver module. It is a wrapper around mapilib.


Index: remote05.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote05.stable.out,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- remote05.stable.out 2 Jan 2008 08:23:27 -0000       1.12
+++ remote05.stable.out 21 Jan 2008 08:05:48 -0000      1.13
@@ -29,11 +29,11 @@
     cat := inspect.getEnvironment();   # 3 INSPECTgetEnvironment 
(cat:bat[:str,:str])
     fs := algebra.find(cat,"mapi_port");       # 4 ALGfind 
(fs:str)<-(cat:bat[:str,:str])(_5:str)
     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(1);"); # 8 SERVERquery 
(_13:int)<-(mid:int)(_14:str)
+    mid := mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");  
# 6 SERVERreconnectAlias 
(mid:int)<-(_8:str)(port:int)(_9:str)(_10:str)(_10:str)(_11:str)
+#mapi.trace(mid,1);    # 7  (_12:str)
+    mapi.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)
+    mapi.disconnect(mid);      # 10 SERVERdisconnect (_17:void)<-(mid:int)
 end main;      # 11  
 [ "done" ]
 

Index: remote04.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote04.stable.out,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- remote04.stable.out 8 Jun 2007 08:47:31 -0000       1.4
+++ remote04.stable.out 21 Jan 2008 08:05:48 -0000      1.5
@@ -28,11 +28,11 @@
     fs := algebra.find(cat,"mapi_port");       # 3 ALGfind 
(fs:str)<-(cat:bat[:str,:str])(_4:str)
     port := calc.int(fs);      # 4 CALCstr2int (port:int)<-(fs:str)
 #io.printf("port %d\n",port);  # 5  (_6: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)
-    s:str  := mserver.rpc(mid,"io.print(123456);");    # 8 
SERVERmapi_rpc_single_row (s:str)<-(mid:int)(_14:str)
+    mid := mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");  
# 6 SERVERreconnectAlias 
(mid:int)<-(_8:str)(port:int)(_9:str)(_10:str)(_10:str)(_11:str)
+#mapi.trace(mid,1);    # 7  (_12:str)
+    s:str  := mapi.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)
-    mserver.disconnect(mid);   # 10 SERVERdisconnect (_16:void)<-(mid:int)
+    mapi.disconnect(mid);      # 10 SERVERdisconnect (_16:void)<-(mid:int)
 end main;      # 11  
 [ "123456" ]
 

Index: remote07.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote07.stable.out,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- remote07.stable.out 2 Jan 2008 08:23:27 -0000       1.11
+++ remote07.stable.out 21 Jan 2008 08:05:48 -0000      1.12
@@ -44,21 +44,21 @@
     fs := algebra.find(cat,"mapi_port");       # 4 ALGfind 
(fs:str)<-(cat:bat[:str,:str])(_5:str)
     port := calc.int(fs);      # 5 CALCstr2int (port:int)<-(fs:str)
 #io.printf("port %d\n",port);  # 6  (_7:str)
-    mid := 
mserver.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");       # 7 
SERVERreconnectAlias 
(mid:int)<-(_9:str)(port:int)(_10:str)(_11:str)(_11:str)(_12:str)
-    mserver.rpc(mid,"rb:= bat.new(:int,:int); bat.setName(rb,\"rbat\");");     
# 8 SERVERquery (_13:void)<-(mid:int)(_14:str)
-    mserver.rpc(mid,"bat.insert(rb,1,1);");    # 9 SERVERquery 
(_15:void)<-(mid:int)(_16:str)
-    mserver.rpc(mid,"bat.insert(rb,3,3);");    # 10 SERVERquery 
(_17:void)<-(mid:int)(_18:str)
-    mserver.rpc(mid,"bat.insert(rb,5,5);");    # 11 SERVERquery 
(_19:void)<-(mid:int)(_20:str)
-    mserver.rpc(mid,"bat.insert(rb,6,6);");    # 12 SERVERquery 
(_21:void)<-(mid:int)(_22:str)
-    mserver.rpc(mid,"bat.insert(rb,7,7);");    # 13 SERVERquery 
(_23:void)<-(mid:int)(_24:str)
-    mserver.rpc(mid,"c:=algebra.select(rb,0,12);");    # 14 SERVERquery 
(_25:void)<-(mid:int)(_26:str)
+    mid := mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");  
# 7 SERVERreconnectAlias 
(mid:int)<-(_9:str)(port:int)(_10:str)(_11:str)(_11:str)(_12:str)
+    mapi.rpc(mid,"rb:= bat.new(:int,:int); bat.setName(rb,\"rbat\");");        
# 8 SERVERquery (_13:void)<-(mid:int)(_14:str)
+    mapi.rpc(mid,"bat.insert(rb,1,1);");       # 9 SERVERquery 
(_15:void)<-(mid:int)(_16:str)
+    mapi.rpc(mid,"bat.insert(rb,3,3);");       # 10 SERVERquery 
(_17:void)<-(mid:int)(_18:str)
+    mapi.rpc(mid,"bat.insert(rb,5,5);");       # 11 SERVERquery 
(_19:void)<-(mid:int)(_20:str)
+    mapi.rpc(mid,"bat.insert(rb,6,6);");       # 12 SERVERquery 
(_21:void)<-(mid:int)(_22:str)
+    mapi.rpc(mid,"bat.insert(rb,7,7);");       # 13 SERVERquery 
(_23:void)<-(mid:int)(_24:str)
+    mapi.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(rb,low,7); i:=aggr.count(e); 
io.print(i);");  # 17 SERVERmapi_rpc_single_row (i:lng)<-(mid:int)(_33:str)
+    mapi.put(mid,"low",low);   # 16 SERVERput 
(_30:void)<-(mid:int)(_31:str)(low:int)
+    i:lng  := mapi.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(i);");      # 19 
SERVERmapi_rpc_bat (d:bat[:int,:int])<-(mid:int)(_37:str)
+    d:bat[:int,:int]  := mapi.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)
+    mapi.disconnect(mid);      # 21 SERVERdisconnect (_39:void)<-(mid:int)
 end main;      # 22  
  count 2
 #-----------------#

Index: remote01.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote01.mal,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- remote01.mal        8 Jun 2007 08:47:31 -0000       1.6
+++ remote01.mal        21 Jan 2008 08:05:48 -0000      1.7
@@ -6,32 +6,32 @@
 port := calc.int(fs);
 #io.printf("port %d\n",port);
 
-mid:= mserver.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
-mserver.rpc(mid,"rb:= bat.new(:int,:int); bat.setName(rb,\"rbat\");");
-mserver.rpc(mid,"bat.insert(rb,1,1);");
-mserver.rpc(mid,"bat.insert(rb,3,3);");
-mserver.rpc(mid,"bat.insert(rb,5,5);");
-mserver.rpc(mid,"bat.insert(rb,6,6);");
-mserver.rpc(mid,"bat.insert(rb,7,7);");
-mserver.rpc(mid,"c:=algebra.select(rb,0,12);");
-c:bat[:int,:int]:= mserver.rpc(mid, "io.print(c);");
+mid:= mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
+mapi.rpc(mid,"rb:= bat.new(:int,:int); bat.setName(rb,\"rbat\");");
+mapi.rpc(mid,"bat.insert(rb,1,1);");
+mapi.rpc(mid,"bat.insert(rb,3,3);");
+mapi.rpc(mid,"bat.insert(rb,5,5);");
+mapi.rpc(mid,"bat.insert(rb,6,6);");
+mapi.rpc(mid,"bat.insert(rb,7,7);");
+mapi.rpc(mid,"c:=algebra.select(rb,0,12);");
+c:bat[:int,:int]:= mapi.rpc(mid, "io.print(c);");
 io.print(c);
-mserver.rpc(mid,"c:=algebra.select(rb,0,4);");
-c:bat[:int,:int]:= mserver.rpc(mid, "io.print(c);");
+mapi.rpc(mid,"c:=algebra.select(rb,0,4);");
+c:bat[:int,:int]:= mapi.rpc(mid, "io.print(c);");
 io.print(c);
 
-b:bat[:int,:int]:= mserver.bind(mid,"rbat");
+b:bat[:int,:int]:= mapi.bind(mid,"rbat");
 io.print(b);
 
 # see if we can do some remote selections.
-mserver.rpc(mid,"d:=algebra.select(b,5,10);");
+mapi.rpc(mid,"d:=algebra.select(b,5,10);");
 low:= 5+1;
-mserver.put(mid,"low",low);
-mserver.rpc(mid,"e:=algebra.select(d,low,7);");
-mserver.rpc(mid,"i:=aggr.count(d);");
-i:lng:= mserver.rpc(mid,"io.print(i);");
+mapi.put(mid,"low",low);
+mapi.rpc(mid,"e:=algebra.select(d,low,7);");
+mapi.rpc(mid,"i:=aggr.count(d);");
+i:lng:= mapi.rpc(mid,"io.print(i);");
 io.printf(" count %d\n",i);
-d:bat[:int,:int]:= mserver.rpc(mid,"io.print(d);");
+d:bat[:int,:int]:= mapi.rpc(mid,"io.print(d);");
 io.print(d);
-mserver.disconnect(mid);
+mapi.disconnect(mid);
 optimizer.remoteQueries();

Index: remote02.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote02.mal,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- remote02.mal        8 Jun 2007 08:47:31 -0000       1.3
+++ remote02.mal        21 Jan 2008 08:05:48 -0000      1.4
@@ -6,11 +6,11 @@
 port := calc.int(fs);
 io.printf("port %d\n",port);
 
-mid:= mserver.reconnect("s0_0","localhost",port,"monetdb","monetdb","mal");
-mserver.rpc(mid,"include sql;sql.init();");
+mid:= mapi.reconnect("s0_0","localhost",port,"monetdb","monetdb","mal");
+mapi.rpc(mid,"include sql;sql.init();");
 io.print("ready for remote SQL interaction");
 
-b:bat[:void,:int] := mserver.bind(mid,"sys","ptables","schema_id",0);
+b:bat[:void,:int] := mapi.bind(mid,"sys","ptables","schema_id",0);
 c:=algebra.select(b,0,6000);
 io.print(c);
 d:=algebra.select(b,5,6000);
@@ -21,5 +21,5 @@
 i:=aggr.count(e);
 io.printf(" count %d\n",i);
 io.print(d);
-mserver.disconnect(mid);
+mapi.disconnect(mid);
 optimizer.remoteQueries();

Index: remote03.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote03.mal,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- remote03.mal        8 Jun 2007 08:47:31 -0000       1.3
+++ remote03.mal        21 Jan 2008 08:05:48 -0000      1.4
@@ -1,17 +1,17 @@
 include sql;
 factory sql_cache.s0_0():void;
-    mserver.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
+    mapi.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
     Z9:bat[:void,:int]  := sql.bind("sys","t1","id","test1",0);
-    mserver.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
+    mapi.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
     Z17:bat[:void,:int]  := sql.bind("sys","t1","id","test1",1);
     Z20 := bat.setWriteMode(Z17);
     Z22 := algebra.kunion(Z9,Z20);
-    mserver.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
+    mapi.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
     Z26:bat[:oid,:int]  := sql.bind("sys","t1","id","test1",3);
     Z29 := bat.setWriteMode(Z26);
     Z31 := algebra.kdifference(Z22,Z29);
     Z33 := algebra.kunion(Z31,Z29);
-    mserver.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
+    mapi.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
     Z37:bat[:void,:oid]  := sql.bind_dbat("sys","t1","test1",0);
     Z39 := bat.reverse(Z37);
     Z41 := algebra.kdifference(Z33,Z39);
@@ -19,13 +19,13 @@
     Z46 := algebra.markT(Z41,Z43);
     Z48 := bat.reverse(Z46);
     Z50 := algebra.join(Z48,Z33);
-    mserver.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
+    mapi.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
     Z59:bat[:void,:str]  := sql.bind("sys","t1","name","test1",0);
-    mserver.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
+    mapi.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
     Z67:bat[:void,:str]  := sql.bind("sys","t1","name","test1",1);
     Z70 := bat.setWriteMode(Z67);
     Z72 := algebra.kunion(Z59,Z70);
-    mserver.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
+    mapi.reconnect("test1","127.0.0.1",40000,"monetdb","monetdb","mal");
     Z76:bat[:oid,:str]  := sql.bind("sys","t1","name","test1",3);
     Z79 := bat.setWriteMode(Z76);
 barrier Z99:= true;
@@ -40,6 +40,6 @@
        redo Z99;
 exit Z99;
 end s0_0; 
-mserver.disconnect(mid);
+mapi.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.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- remote04.mal        8 Jun 2007 08:47:31 -0000       1.3
+++ remote04.mal        21 Jan 2008 08:05:48 -0000      1.4
@@ -3,8 +3,8 @@
 fs := algebra.find(cat,"mapi_port");
 port := calc.int(fs);
 #io.printf("port %d\n",port);
-mid:= mserver.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
-#mserver.trace(mid,1);
-s:str:= mserver.rpc(mid,"io.print(123456);");
+mid:= mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
+#mapi.trace(mid,1);
+s:str:= mapi.rpc(mid,"io.print(123456);");
 io.print(s);
-mserver.disconnect(mid);
+mapi.disconnect(mid);

Index: remote05.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote05.mal,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- remote05.mal        2 Jan 2008 08:23:26 -0000       1.4
+++ remote05.mal        21 Jan 2008 08:05:48 -0000      1.5
@@ -1,11 +1,11 @@
-# Checking correctness of mserver library
+# Checking correctness of mapi library
 # we expect an exception from this query
 
 cat:= inspect.getEnvironment();
 fs := algebra.find(cat,"mapi_port");
 port := calc.int(fs);
-mid:= mserver.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
-#mserver.trace(mid,1);
-mserver.query(mid,"io.print(1);");
+mid:= mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
+#mapi.trace(mid,1);
+mapi.query(mid,"io.print(1);");
 io.print("done");
-mserver.disconnect(mid);
+mapi.disconnect(mid);

Index: remote06.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote06.mal,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- remote06.mal        8 Jun 2007 08:47:31 -0000       1.3
+++ remote06.mal        21 Jan 2008 08:05:48 -0000      1.4
@@ -1,11 +1,11 @@
-# Checking correctness of mserver library
+# Checking correctness of mapi library
 # we expect an exception from this query
 
 cat:= inspect.getEnvironment();
 fs := algebra.find(cat,"mapi_port");
 port := calc.int(fs);
-mid:= mserver.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
-#mserver.trace(mid,1);
-mserver.rpc(mid,"io.print(d);");
+mid:= mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
+#mapi.trace(mid,1);
+mapi.rpc(mid,"io.print(d);");
 io.print("done");
-mserver.disconnect(mid);
+mapi.disconnect(mid);

Index: remote07.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote07.mal,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- remote07.mal        2 Jan 2008 08:23:27 -0000       1.4
+++ remote07.mal        21 Jan 2008 08:05:48 -0000      1.5
@@ -6,20 +6,20 @@
 port := calc.int(fs);
 #io.printf("port %d\n",port);
 
-mid:= mserver.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
-mserver.rpc(mid,"rb:= bat.new(:int,:int); bat.setName(rb,\"rbat\");");
-mserver.rpc(mid,"bat.insert(rb,1,1);");
-mserver.rpc(mid,"bat.insert(rb,3,3);");
-mserver.rpc(mid,"bat.insert(rb,5,5);");
-mserver.rpc(mid,"bat.insert(rb,6,6);");
-mserver.rpc(mid,"bat.insert(rb,7,7);");
-mserver.rpc(mid,"c:=algebra.select(rb,0,12);");
+mid:= mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");
+mapi.rpc(mid,"rb:= bat.new(:int,:int); bat.setName(rb,\"rbat\");");
+mapi.rpc(mid,"bat.insert(rb,1,1);");
+mapi.rpc(mid,"bat.insert(rb,3,3);");
+mapi.rpc(mid,"bat.insert(rb,5,5);");
+mapi.rpc(mid,"bat.insert(rb,6,6);");
+mapi.rpc(mid,"bat.insert(rb,7,7);");
+mapi.rpc(mid,"c:=algebra.select(rb,0,12);");
 
 low:= 5+1;
-mserver.put(mid,"low",low);
-i:lng:= mserver.rpc(mid,"e:=algebra.select(rb,low,7); i:=aggr.count(e); 
io.print(i);");
+mapi.put(mid,"low",low);
+i:lng:= mapi.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(i);");
+d:bat[:int,:int]:= mapi.rpc(mid,"io.print(i);");
 io.print(d);
-mserver.disconnect(mid);
+mapi.disconnect(mid);
 optimizer.remoteQueries();

Index: remote00.py
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote00.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- remote00.py 22 Oct 2007 12:22:56 -0000      1.8
+++ remote00.py 21 Jan 2008 08:05:48 -0000      1.9
@@ -30,7 +30,7 @@
 mapi_port := algebra.find(env, "mapi_port");
 io.print(mapi_port);
 
-mid:= mserver.reconnect("localhost",%d,"s0_0","monetdb","monetdb","mal"); 
mserver.rpc(mid,"rb:= bat.new(:int,:int); bat.setName(rb,\\\"rbat\\\"); 
bat.insert(rb,1,1); bat.insert(rb,2,7);"); b:bat[:int,:int]:= 
mserver.bind(mid,"rbat"); c:=algebra.select(b,0,12); io.print(c); 
d:=algebra.select(b,5,10); low:= 5+1; e:=algebra.select(d,low,7); 
i:=aggr.count(e); io.print(i); io.print(d); optimizer.remoteQueries();
+mid:= mapi.reconnect("localhost",%d,"s0_0","monetdb","monetdb","mal"); 
mapi.rpc(mid,"rb:= bat.new(:int,:int); bat.setName(rb,\\\"rbat\\\"); 
bat.insert(rb,1,1); bat.insert(rb,2,7);"); b:bat[:int,:int]:= 
mapi.bind(mid,"rbat"); c:=algebra.select(b,0,12); io.print(c); 
d:=algebra.select(b,5,10); low:= 5+1; e:=algebra.select(d,low,7); 
i:=aggr.count(e); io.print(i); io.print(d); optimizer.remoteQueries();
 '''
 
 def main():

Index: remote06.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote06.stable.out,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- remote06.stable.out 8 Jun 2007 08:47:31 -0000       1.11
+++ remote06.stable.out 21 Jan 2008 08:05:48 -0000      1.12
@@ -29,13 +29,13 @@
     cat := inspect.getEnvironment();   # 3 INSPECTgetEnvironment 
(cat:bat[:str,:str])
     fs := algebra.find(cat,"mapi_port");       # 4 ALGfind 
(fs:str)<-(cat:bat[:str,:str])(_5:str)
     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.rpc(mid,"io.print(d);");   # 8 SERVERquery 
(_13:void)<-(mid:int)(_14:str)
+    mid := mapi.reconnect("localhost",port,"s0_0","monetdb","monetdb","mal");  
# 6 SERVERreconnectAlias 
(mid:int)<-(_8:str)(port:int)(_9:str)(_10:str)(_10:str)(_11:str)
+#mapi.trace(mid,1);    # 7  (_12:str)
+    mapi.rpc(mid,"io.print(d);");      # 8 SERVERquery 
(_13:void)<-(mid:int)(_14:str)
     io.print("done");  # 9 IOprint_val (_15:void)<-(_16:str)
-    mserver.disconnect(mid);   # 10 SERVERdisconnect (_17:void)<-(mid:int)
+    mapi.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
+!MALException:mapi.query:remote error: TypeException:user.main[1]:'d' may not 
be used before being initialized
 
 # 15:27:53 >  
 # 15:27:53 >  Done.


-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to