Changeset: c50b84ac5a7c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c50b84ac5a7c
Modified Files:
MonetDB5/src/mal/Tests/tst274.stable.out.oid64
MonetDB5/src/modules/atoms/Tests/xml100.mal
MonetDB5/src/modules/atoms/Tests/xml100.stable.out
MonetDB5/src/modules/mal/Tests/inspect05.stable.out
MonetDB5/src/modules/mal/Tests/remote03.stable.out
MonetDB5/src/modules/mal/Tests/xml00.mal
MonetDB5/src/modules/mal/Tests/xml00.stable.out
MonetDB5/src/modules/mal/Tests/xml01.mal
MonetDB5/src/modules/mal/Tests/xml01.stable.out
MonetDB5/src/modules/mal/Tests/xml02.mal
MonetDB5/src/modules/mal/Tests/xml02.stable.out
MonetDB5/src/modules/mal/Tests/xml03.mal
MonetDB5/src/modules/mal/Tests/xml03.stable.out
MonetDB5/src/modules/mal/Tests/xml04.mal
MonetDB5/src/modules/mal/Tests/xml04.stable.out
MonetDB5/src/modules/mal/Tests/xml05.mal
MonetDB5/src/modules/mal/Tests/xml05.stable.out
MonetDB5/src/modules/mal/Tests/xml06.mal
MonetDB5/src/modules/mal/Tests/xml10.mal
MonetDB5/src/modules/mal/Tests/xml10.stable.out
Branch: default
Log Message:
Approved xml output
diffs (truncated from 353 to 300 lines):
diff -r adad06682985 -r c50b84ac5a7c
MonetDB5/src/mal/Tests/tst274.stable.out.oid64
--- a/MonetDB5/src/mal/Tests/tst274.stable.out.oid64 Thu May 20 21:17:33
2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst274.stable.out.oid64 Thu May 20 21:17:57
2010 +0200
@@ -64,7 +64,6 @@
profiler.activate("stmt");
profiler.activate("rbytes");
profiler.activate("wbytes");
- profiler.activate("disk");
profiler.setAll();
profiler.start();
io.printf("#monitor \n");
diff -r adad06682985 -r c50b84ac5a7c MonetDB5/src/modules/atoms/Tests/xml100.mal
--- a/MonetDB5/src/modules/atoms/Tests/xml100.mal Thu May 20 21:17:33
2010 +0200
+++ b/MonetDB5/src/modules/atoms/Tests/xml100.mal Thu May 20 21:17:57
2010 +0200
@@ -1,5 +1,3 @@
-include xml;
-
b:= "Mary Ann Walker";
c:= "brown";
diff -r adad06682985 -r c50b84ac5a7c
MonetDB5/src/modules/atoms/Tests/xml100.stable.out
--- a/MonetDB5/src/modules/atoms/Tests/xml100.stable.out Thu May 20
21:17:33 2010 +0200
+++ b/MonetDB5/src/modules/atoms/Tests/xml100.stable.out Thu May 20
21:17:57 2010 +0200
@@ -12,7 +12,6 @@
# Visit http://monetdb.cwi.nl/ for further information
# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37931/
function user.main():void;
- xml.prelude();
b := "Mary Ann Walker";
c := "brown";
n := nil:xml;
diff -r adad06682985 -r c50b84ac5a7c
MonetDB5/src/modules/mal/Tests/inspect05.stable.out
--- a/MonetDB5/src/modules/mal/Tests/inspect05.stable.out Thu May 20
21:17:33 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/inspect05.stable.out Thu May 20
21:17:57 2010 +0200
@@ -108,6 +108,45 @@
[ "locate", "pattern", "tokenizer",
"(s:str):oid ",
"TKNZRlocate;"
]
[ "open", "command", "tokenizer",
"(name:str):void ",
"TKNZRopen;"
]
[ "take", "pattern", "tokenizer",
"(i:oid):str ",
"TKNZRtakeOid;"
]
+[ "agg", "command", "xml",
"(val:bat[:oid,:xml]):xml ",
"BATXMLgroup;"
]
+[ "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;"
]
+[ "comment", "command", "xml",
"(val:bat[:oid,:str]):bat[:oid,:xml] ",
"BATXMLcomment;"
]
+[ "content", "command", "xml",
"(src:bat[:oid,:str]):bat[:oid,:xml] ",
"BATXMLcontent;"
]
+[ "concat", "command", "xml",
"(val1:xml,val2:xml):xml ",
"XMLconcat;"
]
+[ "content", "command", "xml",
"(val:str):xml ",
"XMLcontent;"
]
+[ "comment", "command", "xml",
"(val:str):xml ",
"XMLcomment;"
]
+[ "document", "command", "xml",
"(src:bat[:oid,:str]):bat[:oid,:xml] ",
"BATXMLdocument;"
]
+[ "document", "command", "xml",
"(val:str):xml ",
"XMLdocument;"
]
+[ "element", "command", "xml",
"(name:str,ns:xml,attr:xml,s:bat[:oid,:xml]):bat[:oid,:xml] ",
"BATXMLelement;"
]
+[ "element", "command", "xml",
"(name:str,s:bat[:oid,:xml]):bat[:oid,:xml] ",
"BATXMLelementSmall;"
]
+[ "element", "command", "xml",
"(name:str,s:xml):xml ",
"XMLelementSmall;"
]
+[ "element", "command", "xml",
"(name:str,ns:xml,attr:xml,s:xml):xml ",
"XMLelement;"
]
+[ "forest", "pattern", "xml",
"(val:bat[:oid,:xml]...):bat[:oid,:xml] ",
"BATXMLforest;"
]
+[ "forest", "pattern", "xml",
"(val:xml...):xml ",
"XMLforest;"
]
+[ "#fromstr", "command", "xml", "():xml ",
"XMLfromString;" ]
+[ "isdocument", "command", "xml",
"(val:bat[:oid,:str]):bat[:oid,:bit] ",
"BATXMLisdocument;"
]
+[ "isdocument", "command", "xml",
"(val:str):bit ",
"XMLisdocument;"
]
+[ "options", "command", "xml",
"(tag:str,option:str,left:bat[:oid,:xml]):bat[:oid,:xml] ",
"BATXMLoptions;"
]
+[ "pi", "command", "xml",
"(target:str,val:bat[:oid,:xml]):bat[:oid,:xml] ",
"BATXMLpi;"
]
+[ "parse", "command", "xml",
"(doccont:str,val:bat[:oid,:str],option:str):bat[:oid,:xml] ",
"BATXMLparse;"
]
+[ "prelude", "command", "xml", "():void ",
"XMLprelude;" ]
+[ "pi", "command", "xml",
"(target:str,val:str):xml ",
"XMLpi;"
]
+[ "parse", "command", "xml",
"(doccont:str,val:str,option:str):xml ",
"XMLparse;"
]
+[ "root", "command", "xml",
"(val:bat[:oid,:xml],version:str,standalone:str):bat[:oid,:xml] ",
"BATXMLroot;"
]
+[ "root", "command", "xml",
"(val:xml,version:str,standalone:str):xml ",
"XMLroot;"
]
+[ "serialize", "command", "xml",
"(val:bat[:oid,:xml]):bat[:oid,:str] ",
"BATXMLxml2str;"
]
+[ "str", "command", "xml",
"(src:bat[:oid,:xml]):bat[:oid,:str] ",
"BATXMLxml2str;"
]
+[ "str", "command", "xml",
"(src:xml):str ",
"XMLxml2str;"
]
+[ "text", "command", "xml",
"(val:bat[:oid,:xml]):bat[:oid,:str] ",
"BATXMLxmltext;"
]
+[ "text", "command", "xml",
"(src:xml):str ",
"XMLxmltext;"
]
+[ "#tostr", "command", "xml", "():str ",
"XMLtoString;" ]
+[ "xquery", "command", "xml",
"(val:bat[:oid,:str],expr:str):bat[:oid,:xml] ",
"BATXMLxquery;"
]
+[ "xml", "command", "xml",
"(src:bat[:oid,:str]):bat[:oid,:xml] ",
"BATXMLstr2xml;"
]
+[ "xml", "command", "xml",
"(src:str):xml ",
"XMLstr2xml;"
]
[ "DeleteMap", "command", "crackers",
"(b:bat[:oid,:dbl],bp:bat[:oid,:dbl]):void ",
"DeleteCrackerMap;"
]
[ "DeleteMap", "command", "crackers",
"(b:bat[:oid,:dbl],bp:bat[:oid,:int]):void ",
"DeleteCrackerMap;"
]
[ "DeleteMap", "command", "crackers",
"(b:bat[:oid,:dbl],bp:bat[:oid,:str]):void ",
"DeleteCrackerMap;"
]
@@ -1048,6 +1087,7 @@
[ "password", "pattern", "sql",
"(user:str):str ",
"db_password_wrap;"
]
[ "queryId", "function", "sql",
"(qid:int):void;",
"nil"
]
[ "rdfshred", "pattern", "sql",
"(location:str,gname:str,schema:str):void ",
"SQLrdfShred;"
]
+[ "reuse", "pattern", "sql",
"(sch:str,tbl:str):void ",
"SQLreuse;"
]
[ "rank", "command", "sql",
"(b:bat[:oid,:any_1]):bat[:oid,:int] ",
"sql_rank;"
]
[ "rank_grp", "command", "sql",
"(b:bat[:oid,:any_1],gp:bat[:oid,:oid],gpe:bat[:oid,:oid]):bat[:oid,:int] ",
"sql_rank_grp;"
]
[ "round", "command", "sql",
"(v:dbl,r:bte):dbl ",
"dbl_round_wrap;"
]
@@ -1063,6 +1103,7 @@
[ "resultSet", "pattern", "sql",
"(nr_cols:int,sep:str,rsep:str,ssep:str,ns:str,order:bat[:oid,:any_1]):int ",
"mvc_result_file_wrap;"
]
[ "resultSet", "pattern", "sql",
"(nr_cols:int,sep:str,rsep:str,ssep:str,ns:str,order:any_1):int ",
"mvc_result_file_wrap;"
]
[ "restart", "pattern", "sql",
"(sname:str,sequence:str,start:lng):lng ",
"mvc_restart_seq;"
]
+[ "shrink", "pattern", "sql",
"(sch:str,tbl:str):void ",
"SQLshrink;"
]
[ "sql_variables", "pattern", "sql",
"():bat[:str,:BAT] ",
"sql_variables;"
]
[ "sql_environment", "function", "sql",
"():bat[:str,:BAT];",
"nil"
]
[ "single", "function", "sql",
"(x:any_1):bat[:oid,:any_1];",
"nil"
]
@@ -1073,6 +1114,7 @@
[ "times", "function", "sql",
"(elaps:int,inblock:lng,oublock:lng):void;",
"nil"
]
[ "trans", "pattern", "sql",
"(type:int,chain:int,name:str):void ",
"SQLtransaction;"
]
[ "update", "pattern", "sql",
"(mvc:ptr,sname:str,tname:str,cname:str,ins:any):ptr ",
"mvc_update_wrap;"
]
+[ "vacuum", "pattern", "sql",
"(sch:str,tbl:str):void ",
"SQLvacuum;"
]
[ "zero_or_one", "function", "sql",
"(b:bat[:oid,:any_1],gp:bat[:oid,:oid],gpe:bat[:oid,:oid]):bat[:oid,:any_1];",
"nil"
]
[ "zero_or_one", "command", "sql",
"(col:bat[:any_2,:any_1]):any_1 ",
"zero_or_one;"
]
[ "bind_idxbat", "function", "octopus",
"(conn:str,mvc:ptr,sch:str,tab:str,index:str,access:int,version:int):bat[:oid,:oid];",
"nil"
]
@@ -3802,6 +3844,7 @@
[ "wrd", "command", "batcalc",
"(b:bat[:any_1,:sht]):bat[:any_1,:wrd] ",
"CMDconvert_sht_wrd;" ]
[ "wrd", "command", "batcalc",
"(b:bat[:any_1,:bte]):bat[:any_1,:wrd] ",
"CMDconvert_bte_wrd;" ]
[ "wrd", "command", "batcalc",
"(b:bat[:any_1,:wrd]):bat[:any_1,:wrd] ",
"CMDconvert_wrd;" ]
+[ "xml", "command", "batcalc",
"(src:bat[:oid,:str]):bat[:oid,:xml] ",
"BATXMLstr2xml;"
]
[ "xor", "command", "batcalc",
"(b:bat[:oid,:lng],cst:lng,bflag:bit,cflag:bit):bat[:oid,:lng] ",
"CMDbataccumXORcst_lng_lng_lng;"
]
[ "xor", "command", "batcalc",
"(cst:lng,b:bat[:oid,:lng],cflag:bit,bflag:bit):bat[:oid,:lng] ",
"CMDbataccumXORcst2_lng_lng_lng;"
]
[ "xor", "command", "batcalc",
"(b:bat[:oid,:lng],c:bat[:oid,:lng],aflag:bit,bflag:bit):bat[:oid,:lng] ",
"CMDbataccumXOR_lng_lng_lng;"
]
@@ -5696,6 +5739,8 @@
[ "wrd", "command", "calc", "(x:chr):wrd
",
"CALCchr2wrd;"
]
[ "wrd", "command", "calc", "(x:bit):wrd
",
"CALCbit2wrd;"
]
[ "wrd", "command", "calc", "(x:oid):wrd
",
"CALCoid2wrd;"
]
+[ "xml", "command", "calc",
"(src:xml):xml ",
"XMLxml2xml;"
]
+[ "xml", "command", "calc",
"(src:str):xml ",
"XMLstr2xml;"
]
[ "xor", "command", "calc",
"(left:lng,right:lng):lng ",
"CALCbinaryXORlnglng;"
]
[ "xor", "command", "calc",
"(left:int,right:int):int ",
"CALCbinaryXORintint;"
]
[ "xor", "command", "calc",
"(left:sht,right:sht):sht ",
"CALCbinaryXORshtsht;"
]
@@ -6111,6 +6156,7 @@
[ "partition", "pattern", "bat",
"(b:bat[:any_1,:any_2],pieces:int,part:int):bat[:any_1,:any_2] ",
"CMDbatpartition2;"
]
[ "partition", "pattern", "bat",
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_2]... ",
"CMDbatpartition;" ]
[ "reduce", "command", "bat",
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"CMDBATreduce;"
]
+[ "reuse", "command", "bat",
"(b:bat[:oid,:any_1],del:bat[:oid,:oid]):bat[:oid,:any_1] ",
"BKCreuseBAT;"
]
[ "replace", "command", "bat",
"(b:bat[:any_1,:any_2],h:any_1,t:any_2,force:bit):bat[:any_1,:any_2] ",
"BKCreplace_bun_force;"
]
[ "replace", "command", "bat",
"(b:bat[:any_1,:any_2],h:any_1,t:any_2):bat[:any_1,:any_2] ",
"BKCreplace_bun;"
]
[ "replace", "command", "bat",
"(b:bat[:any_1,:any_2],src:bat[:any_1,:any_2],force:bit):bat[:any_1,:any_2] ",
"BKCreplace_bat_force;"
]
@@ -6119,6 +6165,7 @@
[ "reverse", "command", "bat",
"(b:bat[:any_1,:any_2]):bat[:any_2,:any_1] ",
"BKCreverse;"
]
[ "setBase", "pattern", "bat",
"(b:bat[:any_1,:any_2],c:bat[:any_1,:any_2]...):void ",
"CMDsetBase;"
]
[ "setGarbage", "pattern", "bat",
"(b:bat[:any_1,:any_2]):void ",
"CMDBATsetGarbage;"
]
+[ "shrink", "command", "bat",
"(b:bat[:oid,:any_1],del:bat[:oid,:oid]):bat[:oid,:any_1] ",
"BKCshrinkBAT;"
]
[ "setHash", "command", "bat",
"(b:bat[:any_1,:any_2],prop:bit):bit ",
"BKCsetHash;"
]
[ "setMemoryAdvise", "command", "bat",
"(b:bat[:any_1,:any_2],mode:int):bit ",
"BKCmadvise2;"
]
[ "setMemoryAdvise", "command", "bat",
"(b:bat[:any_1,:any_2],head_mode:int,tail_mode:int,hheap_mode:int,theap_mode:int):bit
", "BKCmadvise;"
]
diff -r adad06682985 -r c50b84ac5a7c
MonetDB5/src/modules/mal/Tests/remote03.stable.out
--- a/MonetDB5/src/modules/mal/Tests/remote03.stable.out Thu May 20
21:17:33 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/remote03.stable.out Thu May 20
21:17:57 2010 +0200
@@ -105,9 +105,10 @@
[ 27, "inet" ]
[ 28, "identifier" ]
[ 29, "pcre" ]
-[ 30, "mbr" ]
-[ 31, "wkb" ]
-[ 32, "mapentry" ]
+[ 30, "xml" ]
+[ 31, "mbr" ]
+[ 32, "wkb" ]
+[ 33, "mapentry" ]
[ "rmt2__8_void" ]
[ nil ]
diff -r adad06682985 -r c50b84ac5a7c MonetDB5/src/modules/mal/Tests/xml00.mal
--- a/MonetDB5/src/modules/mal/Tests/xml00.mal Thu May 20 21:17:33 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml00.mal Thu May 20 21:17:57 2010 +0200
@@ -1,6 +1,3 @@
-include xml;
-include batxml;
-
b:= bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r adad06682985 -r c50b84ac5a7c
MonetDB5/src/modules/mal/Tests/xml00.stable.out
--- a/MonetDB5/src/modules/mal/Tests/xml00.stable.out Thu May 20 21:17:33
2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml00.stable.out Thu May 20 21:17:57
2010 +0200
@@ -10,9 +10,11 @@
# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
# Copyright (c) 1993-2007 CWI, all rights reserved
# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37931/
+# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:34949/
+# MonetDB/SQL module v2.39.0 loaded
+# MonetDB/GIS module v0.19.0 loaded
+
function user.main():void;
- xml.prelude();
b := bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r adad06682985 -r c50b84ac5a7c MonetDB5/src/modules/mal/Tests/xml01.mal
--- a/MonetDB5/src/modules/mal/Tests/xml01.mal Thu May 20 21:17:33 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml01.mal Thu May 20 21:17:57 2010 +0200
@@ -1,6 +1,3 @@
-include xml;
-include batxml;
-
b:= bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r adad06682985 -r c50b84ac5a7c
MonetDB5/src/modules/mal/Tests/xml01.stable.out
--- a/MonetDB5/src/modules/mal/Tests/xml01.stable.out Thu May 20 21:17:33
2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml01.stable.out Thu May 20 21:17:57
2010 +0200
@@ -13,9 +13,11 @@
# Copyright (c) 1993-July 2008 CWI.
# Copyright (c) August 2008- MonetDB B.V., all rights reserved
# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37931/
+# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:34949/
+# MonetDB/SQL module v2.39.0 loaded
+# MonetDB/GIS module v0.19.0 loaded
+
function user.main():void;
- xml.prelude();
b := bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r adad06682985 -r c50b84ac5a7c MonetDB5/src/modules/mal/Tests/xml02.mal
--- a/MonetDB5/src/modules/mal/Tests/xml02.mal Thu May 20 21:17:33 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml02.mal Thu May 20 21:17:57 2010 +0200
@@ -1,6 +1,3 @@
-include xml;
-include batxml;
-
b:= bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r adad06682985 -r c50b84ac5a7c
MonetDB5/src/modules/mal/Tests/xml02.stable.out
--- a/MonetDB5/src/modules/mal/Tests/xml02.stable.out Thu May 20 21:17:33
2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml02.stable.out Thu May 20 21:17:57
2010 +0200
@@ -10,9 +10,11 @@
# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
# Copyright (c) 1993-2007 CWI, all rights reserved
# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37931/
+# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:34949/
+# MonetDB/SQL module v2.39.0 loaded
+# MonetDB/GIS module v0.19.0 loaded
+
function user.main():void;
- xml.prelude();
b := bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r adad06682985 -r c50b84ac5a7c MonetDB5/src/modules/mal/Tests/xml03.mal
--- a/MonetDB5/src/modules/mal/Tests/xml03.mal Thu May 20 21:17:33 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml03.mal Thu May 20 21:17:57 2010 +0200
@@ -1,6 +1,3 @@
-include xml;
-include batxml;
-
b:= bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r adad06682985 -r c50b84ac5a7c
MonetDB5/src/modules/mal/Tests/xml03.stable.out
--- a/MonetDB5/src/modules/mal/Tests/xml03.stable.out Thu May 20 21:17:33
2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml03.stable.out Thu May 20 21:17:57
2010 +0200
@@ -10,9 +10,11 @@
# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
# Copyright (c) 1993-2007 CWI, all rights reserved
# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37931/
+# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:34949/
+# MonetDB/SQL module v2.39.0 loaded
+# MonetDB/GIS module v0.19.0 loaded
+
function user.main():void;
- xml.prelude();
b := bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r adad06682985 -r c50b84ac5a7c MonetDB5/src/modules/mal/Tests/xml04.mal
--- a/MonetDB5/src/modules/mal/Tests/xml04.mal Thu May 20 21:17:33 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml04.mal Thu May 20 21:17:57 2010 +0200
@@ -1,6 +1,3 @@
-include xml;
-include batxml;
-
b:= bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r adad06682985 -r c50b84ac5a7c
MonetDB5/src/modules/mal/Tests/xml04.stable.out
--- a/MonetDB5/src/modules/mal/Tests/xml04.stable.out Thu May 20 21:17:33
2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml04.stable.out Thu May 20 21:17:57
2010 +0200
@@ -10,9 +10,11 @@
# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked
# Copyright (c) 1993-2007 CWI, all rights reserved
# Visit http://monetdb.cwi.nl/ for further information
-# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:37931/
+# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:34949/
+# MonetDB/SQL module v2.39.0 loaded
+# MonetDB/GIS module v0.19.0 loaded
+
function user.main():void;
- xml.prelude();
b := bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r adad06682985 -r c50b84ac5a7c MonetDB5/src/modules/mal/Tests/xml05.mal
--- a/MonetDB5/src/modules/mal/Tests/xml05.mal Thu May 20 21:17:33 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/xml05.mal Thu May 20 21:17:57 2010 +0200
@@ -1,6 +1,3 @@
-include xml;
-include batxml;
-
b:= bat.new(:oid,:str);
bat.insert(b,0...@0,"Mary Ann Walker");
bat.insert(b,1...@0,"Annie Chapman");
diff -r adad06682985 -r c50b84ac5a7c
MonetDB5/src/modules/mal/Tests/xml05.stable.out
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
