Update of /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6644/src/modules/mal/Tests
Modified Files:
Tag: GDK-2
inspect05.stable.out xml10.mal xml10.stable.out
Log Message:
propagated changes of Thursday Sep 06 2007 - Monday Sep 10 2007
from the development trunk to the GDK-2 branch
Index: xml10.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/xml10.stable.out,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- xml10.stable.out 28 Aug 2007 13:15:55 -0000 1.1.2.2
+++ xml10.stable.out 10 Sep 2007 14:27:11 -0000 1.1.2.3
@@ -98,63 +98,48 @@
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])(_16:oid)(_19:oid)
- bat.insert(g,[EMAIL PROTECTED],[EMAIL PROTECTED]); # 33 BKCinsert_bun
(_44:void)<-(g:bat[:oid,:oid])(_19:oid)(_21: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)
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])
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])
- ag := xml.agg(g,te); # 38 BATXMLagg
(ag:bat[:oid,:xml])<-(g:bat[:oid,:oid])(te: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])
- j2 := algebra.join(g,ax); # 40 ALGjoin
(j2:bat[:oid,:xml])<-(g:bat[:oid,:oid])(ax:bat[:oid,:xml])
- k2 := algebra.kunique(j2); # 41 ALGkunique
(k2:bat[:oid,:xml])<-(j2:bat[:oid,:xml])
- io.print(k2); # 42 IOprint_val (_53:void)<-(k2:bat[:oid,:xml])
- cc := xml.concat(k2,ag); # 43 BATXMLconcat
(cc:bat[:oid,:xml])<-(k2:bat[:oid,:xml])(ag:bat[:oid,:xml])
- io.print(cc); # 44 IOprint_val (_55:void)<-(cc:bat[:oid,:xml])
- ae := xml.element("author",cc); # 45 BATXMLtag
(ae:bat[:oid,:xml])<-(_57:str)(cc:bat[:oid,:xml])
- be := xml.agg(ae); # 46 BATXMLgroup
(be:bat[:oid,:xml])<-(ae:bat[:oid,:xml])
- doc := xml.element("books",be); # 47 BATXMLtag
(doc:bat[:oid,:xml])<-(_60:str)(be:bat[:oid,:xml])
- io.print(doc); # 48 IOprint_val (_61:void)<-(doc:bat[:oid,:xml])
-end main; # 49
-#-----------------------------------------#
-# t h # name
-# oid str # type
-#-----------------------------------------#
-[ [EMAIL PROTECTED], "<title>spring</title>" ]
-[ [EMAIL PROTECTED], "<title>summer</title>" ]
-[ [EMAIL PROTECTED], "<title>autum</title>" ]
-#-----------------------------------------#
-# h t # name
-# oid str # type
-#-----------------------------------------#
-[ [EMAIL PROTECTED], "<title>spring</title>" ]
-[ [EMAIL PROTECTED], "<title>summer</title>" ]
-[ [EMAIL PROTECTED], "<title>autum</title>" ]
-#---------------------------------------------------------#
-# h t # name
-# oid str # type
-#---------------------------------------------------------#
-[ [EMAIL PROTECTED], "<title>spring</title><title>summer</title>" ]
-[ [EMAIL PROTECTED], "<title>autum</title>" ]
-#-------------------------#
-# h t # name
-# oid str # type
-#-------------------------#
-[ [EMAIL PROTECTED], "john" ]
-[ [EMAIL PROTECTED], "marie" ]
-#-----------------------------------------------------------------#
+ 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])
+ 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)
+ 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])
+end main; # 54
+#---------------------------------#
# h t # name
-# oid str # type
-#-----------------------------------------------------------------#
-[ [EMAIL PROTECTED], "john<title>spring</title><title>summer</title>"
]
-[ [EMAIL PROTECTED], "marie<title>autum</title>"
]
-#-----------------------------------------------------------------------------------------------------------------------------------------#
+# void xml # type
+#---------------------------------#
+[ [EMAIL PROTECTED], <title>spring</title> ]
+[ [EMAIL PROTECTED], <title>spring</title> ]
+[ [EMAIL PROTECTED], <title>summer</title> ]
+#---------------------------------#
# h t
# name
-# oid str
# type
-#-----------------------------------------------------------------------------------------------------------------------------------------#
-[ nil,
"<books><author>john<title>spring</title><title>summer</title></author><author>marie<title>autum</title></author></books>"
]
+# void xml # type
+#---------------------------------#
+[ [EMAIL PROTECTED], <title>spring</title> ]
+[ [EMAIL PROTECTED], <title>spring</title> ]
+[ [EMAIL PROTECTED], <title>summer</title> ]
-# 09:38:47 >
-# 09:38:47 > Done.
-# 09:38:47 >
+
+
+
+# 11:07:41 >
+# 11:07:41 > Done.
+# 11:07:41 >
Index: inspect05.stable.out
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/inspect05.stable.out,v
retrieving revision 1.319.2.6
retrieving revision 1.319.2.7
diff -u -d -r1.319.2.6 -r1.319.2.7
--- inspect05.stable.out 6 Sep 2007 13:52:38 -0000 1.319.2.6
+++ inspect05.stable.out 10 Sep 2007 14:26:52 -0000 1.319.2.7
@@ -39,7 +39,8 @@
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------#
[ "main", "function", "user",
"():void;",
"nil"
]
[ "agg", "command", "xml",
"(val:bat[:oid,:xml]):bat[:oid,:xml] ",
"BATXMLgroup;"
]
-[ "agg", "command", "xml",
"(grp:bat[:oid,:oid],val:bat[:oid,:xml]):bat[:oid,:xml] ",
"BATXMLagg;"
]
+[ "agg", "command", "xml",
"(val:bat[:oid,:xml],grp:bat[:oid,:oid]):bat[:oid,:xml] ",
"BATXMLagg;"
]
+[ "agg", "command", "xml",
"(val:bat[:oid,:xml],grp:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:xml] ",
"BATXMLagg3;"
]
[ "attribute", "command", "xml",
"(name:str,val:bat[:oid,:str]):bat[:oid,:xml] ",
"BATXMLattribute;"
]
[ "attribute", "command", "xml",
"(name:str,val:str):xml ",
"XMLattribute;"
]
[ "concat", "command", "xml",
"(left:bat[:oid,:xml],right:bat[:oid,:xml]):bat[:oid,:xml] ",
"BATXMLconcat;"
]
@@ -1035,6 +1036,7 @@
[ "getUsers", "command", "clients",
"():bat[:int,:str] ",
"CLTusers;"
]
[ "getTime", "command", "clients",
"():bat[:int,:lng] ",
"CLTTime;"
]
[ "getActions", "command", "clients",
"():bat[:int,:int] ",
"CLTActions;"
]
+[ "getLastCommand", "command", "clients",
"():bat[:int,:str] ",
"CLTLastCommand;"
]
[ "getLogins", "command", "clients",
"():bat[:int,:str] ",
"CLTLogin;"
]
[ "getScenario", "command", "clients",
"():str ",
"CLTgetScenario;"
]
[ "getInfo", "command", "clients",
"():bat[:str,:str] ",
"CLTInfo;"
]
Index: xml10.mal
===================================================================
RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Tests/xml10.mal,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- xml10.mal 28 Aug 2007 13:15:52 -0000 1.1.2.2
+++ xml10.mal 10 Sep 2007 14:27:10 -0000 1.1.2.3
@@ -32,23 +32,29 @@
te:= xml.element("title",tx);
g:= bat.new(:oid,:oid);
bat.insert(g,[EMAIL PROTECTED],[EMAIL PROTECTED]);
-bat.insert(g,[EMAIL PROTECTED],[EMAIL PROTECTED]);
-bat.insert(g,[EMAIL PROTECTED],[EMAIL PROTECTED]);
+bat.insert(g,[EMAIL PROTECTED],[EMAIL PROTECTED]);
+bat.insert(g,[EMAIL PROTECTED],[EMAIL PROTECTED]);
k:= algebra.join(g,te);
io.print(k);
l:= algebra.sort(k);
io.print(l);
-ag:= xml.agg(g,te);
+ag:= xml.agg(te,g);
io.print(ag);
-j2:= algebra.join(g,ax);
+
+gr:= bat.reverse(g);
+j2:= algebra.join(gr,ax);
k2:=algebra.kunique(j2);
io.print(k2);
cc:= xml.concat(k2,ag);
io.print(cc);
+io.print("author construction");
ae:= xml.element("author",cc);
+io.print(ae);
+io.print("book construction");
be:= xml.agg(ae);
+io.print(be);
doc:= xml.element("books",be);
io.print(doc);
-------------------------------------------------------------------------
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
