Update of /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5567/modules/mal/Tests
Modified Files:
mserver00.mal mserver00.stable.out statistics01.stable.out
xml10.stable.out
Log Message:
Approvals of the changes due to major code patch.
Index: xml10.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/xml10.stable.out,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xml10.stable.out 29 Sep 2007 21:18:30 -0000 1.3
+++ xml10.stable.out 2 Jan 2008 08:23:20 -0000 1.4
@@ -76,50 +76,50 @@
# </author> # 7 (_7:str)
# <author> mary # 8 (_8:str)
# <title> autum</title> # 9 (_9:str)
-# </author> # 10 (_7:str)
-#</books> # 11 (_10:str)
-# the intermediate tabular result produced by SQL # 12 (_11:str)
- a := bat.new(:oid,:str); # 13 CMDBATnew
(a:bat[:oid,:str])<-(_13:oid)(_14:str)
- bat.insert(a,[EMAIL PROTECTED],"john"); # 14 BKCinsert_bun
(_15:void)<-(a:bat[:oid,:str])(_16:oid)(_17:str)
- bat.insert(a,[EMAIL PROTECTED],"john"); # 15 BKCinsert_bun
(_18:void)<-(a:bat[:oid,:str])(_19:oid)(_17:str)
- bat.insert(a,[EMAIL PROTECTED],"marie"); # 16 BKCinsert_bun
(_20:void)<-(a:bat[:oid,:str])(_21:oid)(_22:str)
- t := bat.new(:oid,:str); # 17 CMDBATnew
(t:bat[:oid,:str])<-(_13:oid)(_24:str)
- bat.insert(t,[EMAIL PROTECTED],"spring"); # 18 BKCinsert_bun
(_25:void)<-(t:bat[:oid,:str])(_16:oid)(_26:str)
- bat.insert(t,[EMAIL PROTECTED],"summer"); # 19 BKCinsert_bun
(_27:void)<-(t:bat[:oid,:str])(_19:oid)(_28:str)
- bat.insert(t,[EMAIL PROTECTED],"autum"); # 20 BKCinsert_bun
(_29:void)<-(t:bat[:oid,:str])(_21:oid)(_30:str)
-# SQL rendering request # 21 (_31:str)
-#xmlelement('books', # 22 (_32:str)
-# xmlelement('author',a, # 23 (_33:str)
-# xmlagg(xmlelement('title',t)) # 24 (_34:str)
-# ) ) # 25 (_35:str)
-# every nesting implies a groupby # 26 (_36:str)
+# </author> # 10 (_10:str)
+#</books> # 11 (_11:str)
+# the intermediate tabular result produced by SQL # 12 (_12:str)
+ a := bat.new(:oid,:str); # 13 CMDBATnew
(a:bat[:oid,:str])<-(_14:oid)(_15:str)
+ bat.insert(a,[EMAIL PROTECTED],"john"); # 14 BKCinsert_bun
(_16:void)<-(a:bat[:oid,:str])(_17:oid)(_18:str)
+ bat.insert(a,[EMAIL PROTECTED],"john"); # 15 BKCinsert_bun
(_19:void)<-(a:bat[:oid,:str])(_20:oid)(_18:str)
+ bat.insert(a,[EMAIL PROTECTED],"marie"); # 16 BKCinsert_bun
(_21:void)<-(a:bat[:oid,:str])(_22:oid)(_23:str)
+ t := bat.new(:oid,:str); # 17 CMDBATnew
(t:bat[:oid,:str])<-(_14:oid)(_25:str)
+ bat.insert(t,[EMAIL PROTECTED],"spring"); # 18 BKCinsert_bun
(_26:void)<-(t:bat[:oid,:str])(_17:oid)(_27:str)
+ bat.insert(t,[EMAIL PROTECTED],"summer"); # 19 BKCinsert_bun
(_28:void)<-(t:bat[:oid,:str])(_20:oid)(_29:str)
+ bat.insert(t,[EMAIL PROTECTED],"autum"); # 20 BKCinsert_bun
(_30:void)<-(t:bat[:oid,:str])(_22:oid)(_31:str)
+# SQL rendering request # 21 (_32:str)
+#xmlelement('books', # 22 (_33:str)
+# xmlelement('author',a, # 23 (_34:str)
+# xmlagg(xmlelement('title',t)) # 24 (_35:str)
+# ) ) # 25 (_36:str)
+# every nesting implies a groupby # 26 (_37:str)
ax := xml.xml(a); # 27 BATXMLstr2xml
(ax:bat[:oid,:xml])<-(a:bat[:oid,:str])
tx := xml.xml(t); # 28 BATXMLstr2xml
(tx:bat[:oid,:xml])<-(t:bat[:oid,:str])
- te := xml.element("title",tx); # 29 BATXMLtag
(te:bat[:oid,:xml])<-(_40:str)(tx:bat[:oid,:xml])
- g := bat.new(:oid,:oid); # 30 CMDBATnew
(g:bat[:oid,:oid])<-(_13:oid)(_13:oid)
- bat.insert(g,[EMAIL PROTECTED],[EMAIL PROTECTED]); # 31 BKCinsert_bun
(_42:void)<-(g:bat[:oid,:oid])(_16:oid)(_16:oid)
- bat.insert(g,[EMAIL PROTECTED],[EMAIL PROTECTED]); # 32 BKCinsert_bun
(_43:void)<-(g:bat[:oid,:oid])(_19:oid)(_16:oid)
- bat.insert(g,[EMAIL PROTECTED],[EMAIL PROTECTED]); # 33 BKCinsert_bun
(_44:void)<-(g:bat[:oid,:oid])(_21:oid)(_19:oid)
+ te := xml.element("title",tx); # 29 BATXMLtag
(te:bat[:oid,:xml])<-(_41:str)(tx:bat[:oid,:xml])
+ g := bat.new(:oid,:oid); # 30 CMDBATnew
(g:bat[:oid,:oid])<-(_14:oid)(_14:oid)
+ bat.insert(g,[EMAIL PROTECTED],[EMAIL PROTECTED]); # 31 BKCinsert_bun
(_43:void)<-(g:bat[:oid,:oid])(_17:oid)(_17:oid)
+ bat.insert(g,[EMAIL PROTECTED],[EMAIL PROTECTED]); # 32 BKCinsert_bun
(_44:void)<-(g:bat[:oid,:oid])(_20:oid)(_17:oid)
+ bat.insert(g,[EMAIL PROTECTED],[EMAIL PROTECTED]); # 33 BKCinsert_bun
(_45:void)<-(g:bat[:oid,:oid])(_22:oid)(_20:oid)
k := algebra.join(g,te); # 34 ALGjoin
(k:bat[:oid,:xml])<-(g:bat[:oid,:oid])(te:bat[:oid,:xml])
- io.print(k); # 35 IOprint_val (_46:void)<-(k:bat[:oid,:xml])
+ io.print(k); # 35 IOprint_val (_47:void)<-(k:bat[:oid,:xml])
l := algebra.sort(k); # 36 ALGhsort
(l:bat[:oid,:xml])<-(k:bat[:oid,:xml])
- io.print(l); # 37 IOprint_val (_48:void)<-(l:bat[:oid,:xml])
+ io.print(l); # 37 IOprint_val (_49:void)<-(l:bat[:oid,:xml])
ag := xml.agg(te,g); # 38 BATXMLagg
(ag:bat[:oid,:xml])<-(te:bat[:oid,:xml])(g:bat[:oid,:oid])
- io.print(ag); # 39 IOprint_val (_50:void)<-(ag:bat[:oid,:xml])
+ io.print(ag); # 39 IOprint_val (_51:void)<-(ag:bat[:oid,:xml])
gr := bat.reverse(g); # 40 BKCreverse
(gr:bat[:oid,:oid])<-(g:bat[:oid,:oid])
j2 := algebra.join(gr,ax); # 41 ALGjoin
(j2:bat[:oid,:xml])<-(gr:bat[:oid,:oid])(ax:bat[:oid,:xml])
k2 := algebra.kunique(j2); # 42 ALGkunique
(k2:bat[:oid,:xml])<-(j2:bat[:oid,:xml])
- io.print(k2); # 43 IOprint_val (_54:void)<-(k2:bat[:oid,:xml])
+ io.print(k2); # 43 IOprint_val (_55:void)<-(k2:bat[:oid,:xml])
cc := xml.concat(k2,ag); # 44 BATXMLconcat
(cc:bat[:oid,:xml])<-(k2:bat[:oid,:xml])(ag:bat[:oid,:xml])
- io.print(cc); # 45 IOprint_val (_56:void)<-(cc:bat[:oid,:xml])
- io.print("author construction"); # 46 IOprint_val (_57:void)<-(_58:str)
- ae := xml.element("author",cc); # 47 BATXMLtag
(ae:bat[:oid,:xml])<-(_60:str)(cc:bat[:oid,:xml])
- io.print(ae); # 48 IOprint_val (_61:void)<-(ae:bat[:oid,:xml])
- io.print("book construction"); # 49 IOprint_val (_62:void)<-(_63:str)
+ io.print(cc); # 45 IOprint_val (_57:void)<-(cc:bat[:oid,:xml])
+ io.print("author construction"); # 46 IOprint_val (_58:void)<-(_59:str)
+ ae := xml.element("author",cc); # 47 BATXMLtag
(ae:bat[:oid,:xml])<-(_61:str)(cc:bat[:oid,:xml])
+ io.print(ae); # 48 IOprint_val (_62:void)<-(ae:bat[:oid,:xml])
+ io.print("book construction"); # 49 IOprint_val (_63:void)<-(_64:str)
be := xml.agg(ae); # 50 BATXMLgroup
(be:bat[:oid,:xml])<-(ae:bat[:oid,:xml])
- io.print(be); # 51 IOprint_val (_65:void)<-(be:bat[:oid,:xml])
- doc := xml.element("books",be); # 52 BATXMLtag
(doc:bat[:oid,:xml])<-(_67:str)(be:bat[:oid,:xml])
- io.print(doc); # 53 IOprint_val (_68:void)<-(doc:bat[:oid,:xml])
+ io.print(be); # 51 IOprint_val (_66:void)<-(be:bat[:oid,:xml])
+ doc := xml.element("books",be); # 52 BATXMLtag
(doc:bat[:oid,:xml])<-(_68:str)(be:bat[:oid,:xml])
+ io.print(doc); # 53 IOprint_val (_69:void)<-(doc:bat[:oid,:xml])
end main; # 54
#---------------------------------#
# h t # name
Index: mserver00.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/mserver00.mal,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mserver00.mal 8 Jun 2007 08:47:36 -0000 1.10
+++ mserver00.mal 2 Jan 2008 08:23:18 -0000 1.11
@@ -31,6 +31,7 @@
io.printf("field 1 %s\n",s);
mserver.query(mid,"r:= bat.new(:oid,:int);");
+io.printf("shipped first query\n");
mserver.query(mid,"bat.insert(r, [EMAIL PROTECTED],311);");
mserver.query(mid,"bat.insert(r,[EMAIL PROTECTED],433);");
b:bat[:oid,:int]:= mserver.rpc(mid,"io.print(r);");
Index: statistics01.stable.out
===================================================================
RCS file:
/cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/statistics01.stable.out,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- statistics01.stable.out 12 Oct 2007 17:40:25 -0000 1.11
+++ statistics01.stable.out 2 Jan 2008 08:23:19 -0000 1.12
@@ -60,32 +60,32 @@
b := statistics.getHotset(); # 7 STATgetHotset (b:bat[:int,:str])
#io.print(b); # 8 (_8:str)
l := statistics.getCount("timezones"); # 9 STATgetCount
(l:lng)<-(_3:str)
- io.print(l); # 10 IOprint_val (_10:void)<-(l:lng)
+ io.print(l); # 10 IOprint_val (_11:void)<-(l:lng)
catch MALException:str ; # 11 (MALException:str) jump 13
- io.print("could not get count from timezones"); # 12 IOprint_val
(_12:void)<-(_13:str)
+ io.print("could not get count from timezones"); # 12 IOprint_val
(_13:void)<-(_14:str)
exit MALException:str ; # 13 (MALException:str)
m := statistics.getMin("timezones"); # 14 STATgetMin
(m:lng)<-(_3:str)
catch MALException:str ; # 15 (MALException:str) jump 17
- io.print("could not get minimum from timezones"); # 16 IOprint_val
(_15:void)<-(_16:str)
+ io.print("could not get minimum from timezones"); # 16 IOprint_val
(_16:void)<-(_17:str)
exit MALException:str ; # 17 (MALException:str)
- io.print(m); # 18 IOprint_val (_17:void)<-(m:lng)
+ io.print(m); # 18 IOprint_val (_18:void)<-(m:lng)
h := statistics.getHistogram("timezones"); # 19 STATgetHistogram
(h:bat[:any,:any])<-(_3:str)
catch MALException:str ; # 20 (MALException:str) jump 24
- io.print("could not get histogram from timezones"); # 21
IOprint_val (_19:void)<-(_20:str)
- io.print(MALException); # 22 IOprint_val (_21:void)<-(MALException:str)
- h := bat.new(:oid,:int); # 23 CMDBATnew
(h:bat[:any,:any])<-(_22:oid)(_23:int)
+ io.print("could not get histogram from timezones"); # 21
IOprint_val (_20:void)<-(_21:str)
+ io.print(MALException); # 22 IOprint_val (_22:void)<-(MALException:str)
+ h := bat.new(:oid,:int); # 23 CMDBATnew
(h:bat[:any,:any])<-(_23:oid)(_24:int)
exit MALException:str ; # 24 (MALException:str)
- io.print("histogram"); # 25 IOprint_val (_24:void)<-(_25:str)
- io.print(h); # 26 IOprint_val (_26:void)<-(h:bat[:any,:any])
+ io.print("histogram"); # 25 IOprint_val (_25:void)<-(_26:str)
+ io.print(h); # 26 IOprint_val (_27:void)<-(h:bat[:any,:any])
hc := aggr.count(h); # 27 ALGcount_bat (hc:int)<-(h:bat[:any,:any])
- io.print(hc); # 28 IOprint_val (_28:void)<-(hc:int)
- statistics.discard("timezones"); # 29 STATdiscard (_29:void)<-(_3:str)
- statistics.epilogue(); # 30 STATepilogue (_30:void)
-#d:= bbp.getRefCount(); # 31 (_31:str)
-#dl:=bbp.getLRefCount(); # 32 (_32:str)
-#dn:= bbp.getNames(); # 33 (_33:str)
-#ds:= algebra.sort(dn); # 34 (_34:str)
-#io.table(dn,d,dl); # 35 (_35:str)
+ io.print(hc); # 28 IOprint_val (_29:void)<-(hc:int)
+ statistics.discard("timezones"); # 29 STATdiscard (_30:void)<-(_3:str)
+ statistics.epilogue(); # 30 STATepilogue (_31:void)
+#d:= bbp.getRefCount(); # 31 (_32:str)
+#dl:=bbp.getLRefCount(); # 32 (_33:str)
+#dn:= bbp.getNames(); # 33 (_34:str)
+#ds:= algebra.sort(dn); # 34 (_35:str)
+#io.table(dn,d,dl); # 35 (_36:str)
end main; # 36
[ 24 ]
[ nil ]
Index: mserver00.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/mserver00.stable.out,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- mserver00.stable.out 8 Jun 2007 08:47:36 -0000 1.8
+++ mserver00.stable.out 2 Jan 2008 08:23:19 -0000 1.9
@@ -58,47 +58,49 @@
s:str := mserver.fetch_field(mid,1); # 27 SERVERfetch_field_str
(s:str)<-(mid:int)(_35:int)
io.printf("field 1 %s\n",s); # 28 IOprint_formatted_str
(_36:void)<-(_37:str)(s:str)
mserver.query(mid,"r:= bat.new(:oid,:int);"); # 29 SERVERquery
(_38:int)<-(mid:int)(_39:str)
- mserver.query(mid,"bat.insert(r, [EMAIL PROTECTED],311);"); # 30
SERVERquery (_40:int)<-(mid:int)(_41:str)
- mserver.query(mid,"bat.insert(r,[EMAIL PROTECTED],433);"); # 31
SERVERquery (_42:int)<-(mid:int)(_43:str)
- b:bat[:oid,:int] := mserver.rpc(mid,"io.print(r);"); # 32
SERVERmapi_rpc_bat (b:bat[:oid,:int])<-(mid:int)(_45:str)
- io.print(b); # 33 IOprint_val (_46:void)<-(b:bat[:oid,:int])
-# use the BAT fetch operation # 34 (_47:str)
-#b:bat[:oid,:int]:= mserver.receive(mid,"remotename"); # 35 (_48:str)
- msg:str := mserver.rpc(mid,"io.print(\"hello world\");"); # 36
SERVERmapi_rpc_single_row (msg:str)<-(mid:int)(_50:str)
- io.print(msg); # 37 IOprint_val (_51:void)<-(msg:str)
- o:oid := mserver.rpc(mid,"io.print([EMAIL PROTECTED]);"); # 38
SERVERmapi_rpc_single_row (o:oid)<-(mid:int)(_53:str)
- io.print(o); # 39 IOprint_val (_54:void)<-(o:oid)
- o:oid := mserver.rpc(mid,"io.print(nil:oid);"); # 40
SERVERmapi_rpc_single_row (o:oid)<-(mid:int)(_55:str)
- io.print(o); # 41 IOprint_val (_56:void)<-(o:oid)
-#needs type checks # 42 (_57:str)
-#(k:int,s:str):= mserver.rpc(mid,"io.print(nil:int,\"done\");"); # 43
(_58:str)
-#io.print(k,s); # 44 (_59:str)
-# what is the relationship between local/remote namespace # 45 (_60:str)
-# mserver.send(key,"a",a); # 46 (_61:str)
-# c:= mserver.join(key,a,b); # 47 (_62:str)
-# mserver.rpc(key,"z:=algebra.join(a,b);"); # 48 (_63:str)
-# c:= mserver.receive(key,"c") # 49 (_64:str)
-#patterns # 50 (_65:str)
-#pat:= "a:= algebra.select(b,?,?);"); # 51 (_66:str)
-#qry:= str.replace(pat,"?",i,j); # 52 (_67:str)
-#mserver.query(key,pat,i,j); # 53 (_68:str)
-#how to ship a routine # 54 (_69:str)
-#fcn:= manual.definition(manual,help); # 55 (_70:str)
-# how to remote MAL execution # 56 (_71:str)
-# remotedb:= mserver.connect(...) # 57 (_72:str)
-# [EMAIL PROTECTED](a,b) using remote objects # 58 (_73:str)
-# c:= mserver.rpc(remotedb,algebra,join,a,b) # 59 (_74:str)
-# the remainder should be tested # 60 (_75:str)
-catch MapiException:str ; # 61 (MapiException:str) jump 63
- io.printf("foutje:%s\n",MapiException); # 62 IOprint_formatted_str
(_77:void)<-(_78:str)(MapiException:str)
-exit MapiException:str ; # 63 (MapiException:str)
- mserver.disconnect(mid); # 64 SERVERdisconnect (_79:void)<-(mid:int)
-end main; # 65
+ io.printf("shipped first query\n"); # 30 IOprint_str
(_40:void)<-(_41:str)
+ mserver.query(mid,"bat.insert(r, [EMAIL PROTECTED],311);"); # 31
SERVERquery (_42:int)<-(mid:int)(_43:str)
+ mserver.query(mid,"bat.insert(r,[EMAIL PROTECTED],433);"); # 32
SERVERquery (_44:int)<-(mid:int)(_45:str)
+ b:bat[:oid,:int] := mserver.rpc(mid,"io.print(r);"); # 33
SERVERmapi_rpc_bat (b:bat[:oid,:int])<-(mid:int)(_47:str)
+ io.print(b); # 34 IOprint_val (_48:void)<-(b:bat[:oid,:int])
+# use the BAT fetch operation # 35 (_49:str)
+#b:bat[:oid,:int]:= mserver.receive(mid,"remotename"); # 36 (_50:str)
+ msg:str := mserver.rpc(mid,"io.print(\"hello world\");"); # 37
SERVERmapi_rpc_single_row (msg:str)<-(mid:int)(_52:str)
+ io.print(msg); # 38 IOprint_val (_53:void)<-(msg:str)
+ o:oid := mserver.rpc(mid,"io.print([EMAIL PROTECTED]);"); # 39
SERVERmapi_rpc_single_row (o:oid)<-(mid:int)(_55:str)
+ io.print(o); # 40 IOprint_val (_56:void)<-(o:oid)
+ o:oid := mserver.rpc(mid,"io.print(nil:oid);"); # 41
SERVERmapi_rpc_single_row (o:oid)<-(mid:int)(_57:str)
+ io.print(o); # 42 IOprint_val (_58:void)<-(o:oid)
+#needs type checks # 43 (_59:str)
+#(k:int,s:str):= mserver.rpc(mid,"io.print(nil:int,\"done\");"); # 44
(_60:str)
+#io.print(k,s); # 45 (_61:str)
+# what is the relationship between local/remote namespace # 46 (_62:str)
+# mserver.send(key,"a",a); # 47 (_63:str)
+# c:= mserver.join(key,a,b); # 48 (_64:str)
+# mserver.rpc(key,"z:=algebra.join(a,b);"); # 49 (_65:str)
+# c:= mserver.receive(key,"c") # 50 (_66:str)
+#patterns # 51 (_67:str)
+#pat:= "a:= algebra.select(b,?,?);"); # 52 (_68:str)
+#qry:= str.replace(pat,"?",i,j); # 53 (_69:str)
+#mserver.query(key,pat,i,j); # 54 (_70:str)
+#how to ship a routine # 55 (_71:str)
+#fcn:= manual.definition(manual,help); # 56 (_72:str)
+# how to remote MAL execution # 57 (_73:str)
+# remotedb:= mserver.connect(...) # 58 (_74:str)
+# [EMAIL PROTECTED](a,b) using remote objects # 59 (_75:str)
+# c:= mserver.rpc(remotedb,algebra,join,a,b) # 60 (_76:str)
+# the remainder should be tested # 61 (_77:str)
+catch MapiException:str ; # 62 (MapiException:str) jump 64
+ io.printf("foutje:%s\n",MapiException); # 63 IOprint_formatted_str
(_79:void)<-(_80:str)(MapiException:str)
+exit MapiException:str ; # 64 (MapiException:str)
+ mserver.disconnect(mid); # 65 SERVERdisconnect (_81:void)<-(mid:int)
+end main; # 66
[ 1 ]
rowcount 1
fieldcount 2
field 0 4
field 1 hello
+shipped first query
#-----------------#
# h t # name
# oid int # type
-------------------------------------------------------------------------
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
