Update of /cvsroot/monetdb/MonetDB5/src/optimizer/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23482
Modified Files:
remote00.stable.out remote01.stable.out
Log Message:
Restore accidental approves
Index: remote00.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote00.stable.out,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- remote00.stable.out 27 Jan 2008 08:36:46 -0000 1.9
+++ remote00.stable.out 27 Jan 2008 11:28:17 -0000 1.10
@@ -1,25 +1,41 @@
stdout of test 'remote00` in directory 'src/optimizer` itself:
-# 09:35:05 >
-# 09:35:05 > /usr/bin/python remote00.py remote00
-# 09:35:05 >
+# 23:06:19 >
+# 23:06:19 > Mtimeout -timeout 60 mserver5
"--config=/ufs/mk/monet5/Linux/etc/MonetDB5.conf" --debug=10 --set
"monet_mod_path=/ufs/mk/monet5/Linux/lib/MonetDB5:/ufs/mk/opensource/MonetDB/Linux/lib/MonetDB"
--set "gdk_dbfarm=/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm" --set
"sql_logdir=/ufs/mk/monet5/Linux/var/MonetDB5/dblogs" --set mapi_port=30126
--set monet_prompt= --trace --dbname=mTests_src_optimizer remote00.mal <
/dev/null
+# 23:06:19 >
-# MonetDB server v5.3.0, based on kernel v1.21.0
-# Serving database 'db1'
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-2007 CWI, all rights reserved
+# MonetDB Server v4.99.19
+# Copyright (c) 1993-2006 CWI, all rights reserved
+# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
+# config:/ufs/mk/monet5/Linux/etc/MonetDB5.conf
+# dbfarm:/ufs/mk/monet5/Linux/var/MonetDB5/dbfarm
+# dbname:mTests_src_optimizer
# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://gio.ins.cwi.nl:12345/
[ 1 ]
-# MonetDB server v5.3.0, based on kernel v1.21.0
-# Serving database 'db2'
-# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
-# Copyright (c) 1993-2007 CWI, all rights reserved
+[ "12345" ]
+# MonetDB Server v4.99.19
+# Copyright (c) 1993-2006 CWI, all rights reserved
+# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
+# config:/ufs/niels/scratch/Linux-x86_64/etc/MonetDB5.conf
+# dbfarm:/ufs/niels/scratch/Linux-x86_64/var/MonetDB5/dbfarm
+# dbname:db2
# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://gio.ins.cwi.nl:12346/
+[ "12346" ]
+#-----------------#
+# h t # name
+# int int # type
+#-----------------#
+[ 1, 1 ]
+[ 2, 7 ]
+[ 1 ]
+#-----------------#
+# h t # name
+# int int # type
+#-----------------#
+[ 2, 7 ]
-# 09:35:07 >
-# 09:35:07 > Done.
-# 09:35:07 >
+# 16:36:12 >
+# 16:36:12 > Done.
+# 16:36:12 >
Index: remote01.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/Tests/remote01.stable.out,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- remote01.stable.out 27 Jan 2008 10:47:27 -0000 1.12
+++ remote01.stable.out 27 Jan 2008 11:28:18 -0000 1.13
@@ -69,21 +69,20 @@
mapi.rpc(mid,"c:=algebra.select(rb,0,4);"); # 17 SERVERquery
(_30:void)<-(mid:int)(_31:str)
c:bat[:int,:int] := mapi.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])
- mapi.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] := mapi.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)
- mapi.rpc(mid,"d:=algebra.select(b,5,10);"); # 24 SERVERquery
(_37:void)<-(mid:int)(_38:str)
- low := calc.+(5,1); # 25 CALCbinaryADDintint
(low:int)<-(_40:int)(_41:int)
- mapi.put(mid,"low",low); # 26 SERVERput
(_42:void)<-(mid:int)(_43:str)(low:int)
- mapi.rpc(mid,"e:=algebra.select(d,low,7);"); # 27 SERVERquery
(_44:void)<-(mid:int)(_45:str)
- mapi.rpc(mid,"i:=aggr.count(d);"); # 28 SERVERquery
(_46:void)<-(mid:int)(_47:str)
- i:lng := mapi.rpc(mid,"io.print(i);"); # 29 SERVERmapi_rpc_single_row
(i:lng)<-(mid:int)(_49:str)
- io.printf(" count %d\n",i); # 30 IOprint_formatted_lng
(_50:void)<-(_51:str)(i:lng)
- d:bat[:int,:int] := mapi.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])
- mapi.disconnect(mid); # 33 SERVERdisconnect (_55:void)<-(mid:int)
-end main; # 34
+ b:bat[:int,:int] := mapi.bind(mid,"rbat"); # 20 SERVERbindBAT
(b:bat[:int,:int])<-(mid:int)(_34:str)
+ io.print(b); # 21 IOprint_val (_35:void)<-(b:bat[:int,:int])
+# see if we can do some remote selections. # 22 (_36:str)
+ mapi.rpc(mid,"d:=algebra.select(b,5,10);"); # 23 SERVERquery
(_37:void)<-(mid:int)(_38:str)
+ low := calc.+(5,1); # 24 CALCbinaryADDintint
(low:int)<-(_40:int)(_41:int)
+ mapi.put(mid,"low",low); # 25 SERVERput
(_42:void)<-(mid:int)(_43:str)(low:int)
+ mapi.rpc(mid,"e:=algebra.select(d,low,7);"); # 26 SERVERquery
(_44:void)<-(mid:int)(_45:str)
+ mapi.rpc(mid,"i:=aggr.count(d);"); # 27 SERVERquery
(_46:void)<-(mid:int)(_47:str)
+ i:lng := mapi.rpc(mid,"io.print(i);"); # 28 SERVERmapi_rpc_single_row
(i:lng)<-(mid:int)(_49:str)
+ io.printf(" count %d\n",i); # 29 IOprint_formatted_lng
(_50:void)<-(_51:str)(i:lng)
+ d:bat[:int,:int] := mapi.rpc(mid,"io.print(d);"); # 30 SERVERmapi_rpc_bat
(d:bat[:int,:int])<-(mid:int)(_53:str)
+ io.print(d); # 31 IOprint_val (_54:void)<-(d:bat[:int,:int])
+ mapi.disconnect(mid); # 32 SERVERdisconnect (_55:void)<-(mid:int)
+end main; # 33
#-----------------#
# h t # name
# int int # type
@@ -99,23 +98,10 @@
#-----------------#
[ 1, 1 ]
[ 3, 3 ]
-#-----------------#
-# h t # name
-# int int # type
-#-----------------#
-[ 1, 1 ]
-[ 3, 3 ]
-[ 5, 5 ]
-[ 6, 6 ]
-[ 7, 7 ]
- count 3
-#-----------------#
-# h t # name
-# int int # type
-#-----------------#
-[ 5, 5 ]
-[ 6, 6 ]
-[ 7, 7 ]
+!MALException:mapi.bind:remote error:
SyntaxException:parseError:b:bat[int,int]:=bbp.bind("rbat");
+!MALException:mapi.bind:remote error:SyntaxException:parseError: ^','
expected
+!MALException:mapi.bind:remote error:SyntaxException:parseError:
+!MALException:mapi.bind:remote error:';' expected
# 09:35:05 >
# 09:35:05 > 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
