Changeset: 97d2fc1aaa6c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=97d2fc1aaa6c
Modified Files:
Branch: Jun2010
Log Message:
Merge.
diffs (truncated from 862 to 300 lines):
diff -r 203a6ab66ea5 -r 97d2fc1aaa6c MonetDB5/RunMtest.bat.in
--- a/MonetDB5/RunMtest.bat.in Fri Jun 25 17:41:37 2010 +0200
+++ b/MonetDB5/RunMtest.bat.in Mon Jun 28 09:41:10 2010 +0200
@@ -30,6 +30,8 @@
set MOD_PATH=%MOD_PATH%;%builddir%\src\modules\mal\rdf
REM enable auto-loading of modules before `make install`
+if not exist %builddir%\src\modules\mal\autoload mkdir
%builddir%\src\modules\mal\autoload
+copy /y %srcdir%\src\modules\mal\??_*.mal %builddir%\src\modules\mal\autoload
if not exist %builddir%\src\modules\mal\rdf\autoload mkdir
%builddir%\src\modules\mal\rdf\autoload
copy /y %srcdir%\src\modules\mal\rdf\??_*.mal
%builddir%\src\modules\mal\rdf\autoload
diff -r 203a6ab66ea5 -r 97d2fc1aaa6c MonetDB5/src/mal/Tests/tst450.stable.out
--- a/MonetDB5/src/mal/Tests/tst450.stable.out Fri Jun 25 17:41:37 2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst450.stable.out Mon Jun 28 09:41:10 2010 +0200
@@ -72,7 +72,8 @@
[ 27, "inet" ]
[ 28, "identifier" ]
[ 29, "pcre" ]
-[ 30, "mapentry" ]
+[ 30, "xml" ]
+[ 31, "mapentry" ]
#-------------------------#
# t h # name
# oid str # type
@@ -147,6 +148,7 @@
[ "unix", nil ]
[ "url", nil ]
[ "user", nil ]
+[ "xml", nil ]
[ "zrule", nil ]
command
bat.insert(b:bat[:any_1,:any_2],h:any_1,t:any_2,force:bit):bat[:any_1,:any_2]
address BKCinsert_bun_force;
#Insert one BUN[h,t] in a BAT.
diff -r 203a6ab66ea5 -r 97d2fc1aaa6c
MonetDB5/src/mal/Tests/tst450.stable.out.Windows
--- a/MonetDB5/src/mal/Tests/tst450.stable.out.Windows Fri Jun 25 17:41:37
2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst450.stable.out.Windows Mon Jun 28 09:41:10
2010 +0200
@@ -72,7 +72,8 @@
[ 27, "inet" ]
[ 28, "identifier" ]
[ 29, "pcre" ]
-[ 30, "mapentry" ]
+[ 30, "xml" ]
+[ 31, "mapentry" ]
#-------------------------#
# t h # name
# oid str # type
@@ -146,6 +147,7 @@
[ "unix", nil ]
[ "url", nil ]
[ "user", nil ]
+[ "xml", nil ]
[ "zrule", nil ]
command
bat.insert(b:bat[:any_1,:any_2],h:any_1,t:any_2,force:bit):bat[:any_1,:any_2]
address BKCinsert_bun_force;
#Insert one BUN[h,t] in a BAT.
diff -r 203a6ab66ea5 -r 97d2fc1aaa6c
MonetDB5/src/modules/mal/Tests/inspect05.stable.out
--- a/MonetDB5/src/modules/mal/Tests/inspect05.stable.out Fri Jun 25
17:41:37 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/inspect05.stable.out Mon Jun 28
09:41:10 2010 +0200
@@ -28,6 +28,45 @@
# str str str str
str
# type
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------#
[ "main", "function", "user", "():void;",
"nil"
]
+[ "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;"
]
[ "shred", "command", "rdf",
"(location:str,graphname:str,schema:str):bat[:void,:BAT] ",
"RDFParser;"
]
[ "append", "command", "tokenizer", "(u:str):oid
",
"TKNZRappend;"
]
[ "close", "command", "tokenizer",
"():void ",
"TKNZRclose;"
]
@@ -3423,6 +3462,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;"
]
@@ -5090,6 +5130,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;"
]
diff -r 203a6ab66ea5 -r 97d2fc1aaa6c
MonetDB5/src/modules/mal/Tests/remote03.stable.out
--- a/MonetDB5/src/modules/mal/Tests/remote03.stable.out Fri Jun 25
17:41:37 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/remote03.stable.out Mon Jun 28
09:41:10 2010 +0200
@@ -66,7 +66,7 @@
remote.disconnect(conn);
end main;
[ "Received first error from the remote site" ]
-!SyntaxException:remote.exec:(mapi:monetdb://[email protected]/mTests_src_modules_mal)
rmt0__8_void := io.print.bla();
+!SyntaxException:remote.exec:(mapi:monetdb://[email protected]/mTests_src_modules_mal)
rmt0__8_void := io.print.bla();
SyntaxException:parseError: ^'(' expected
[ "rmt1_bn_bat_int_str" ]
@@ -105,7 +105,8 @@
[ 27, "inet" ]
[ 28, "identifier" ]
[ 29, "pcre" ]
-[ 30, "mapentry" ]
+[ 30, "xml" ]
+[ 31, "mapentry" ]
[ "rmt2__8_void" ]
[ nil ]
diff -r 203a6ab66ea5 -r 97d2fc1aaa6c sql/src/test/leaks/Tests/check0.stable.out
--- a/sql/src/test/leaks/Tests/check0.stable.out Fri Jun 25 17:41:37
2010 +0200
+++ b/sql/src/test/leaks/Tests/check0.stable.out Mon Jun 28 09:41:10
2010 +0200
@@ -33,12 +33,12 @@
[ "int", "lng", 2 ]
[ "int", "str", 121 ]
[ "oid", "bit", 0 ]
-[ "oid", "bit", 30 ]
-[ "oid", "bit", 30 ]
-[ "oid", "bit", 182 ]
-[ "oid", "bit", 1037 ]
-[ "oid", "bit", 1037 ]
-[ "oid", "bit", 1037 ]
+[ "oid", "bit", 31 ]
+[ "oid", "bit", 31 ]
+[ "oid", "bit", 184 ]
+[ "oid", "bit", 1039 ]
+[ "oid", "bit", 1039 ]
+[ "oid", "bit", 1039 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -79,21 +79,20 @@
[ "oid", "int", 27 ]
[ "oid", "int", 27 ]
[ "oid", "int", 27 ]
-[ "oid", "int", 30 ]
-[ "oid", "int", 30 ]
-[ "oid", "int", 182 ]
-[ "oid", "int", 182 ]
-[ "oid", "int", 182 ]
-[ "oid", "int", 182 ]
-[ "oid", "int", 182 ]
-[ "oid", "int", 182 ]
-[ "oid", "int", 1037 ]
-[ "oid", "int", 1037 ]
-[ "oid", "int", 2914 ]
-[ "oid", "int", 2914 ]
-[ "oid", "int", 2914 ]
-[ "oid", "int", 2914 ]
-[ "oid", "int", 2914 ]
+[ "oid", "int", 31 ]
+[ "oid", "int", 31 ]
+[ "oid", "int", 184 ]
+[ "oid", "int", 184 ]
+[ "oid", "int", 184 ]
+[ "oid", "int", 184 ]
+[ "oid", "int", 184 ]
+[ "oid", "int", 1039 ]
+[ "oid", "int", 1039 ]
+[ "oid", "int", 2916 ]
+[ "oid", "int", 2916 ]
+[ "oid", "int", 2916 ]
+[ "oid", "int", 2916 ]
+[ "oid", "int", 2916 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
[ "oid", "lng", 0 ]
@@ -121,8 +120,8 @@
[ "oid", "sht", 0 ]
[ "oid", "sht", 0 ]
[ "oid", "sht", 0 ]
-[ "oid", "sht", 30 ]
-[ "oid", "sht", 30 ]
+[ "oid", "sht", 31 ]
+[ "oid", "sht", 31 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
[ "oid", "str", 0 ]
@@ -148,21 +147,23 @@
[ "oid", "str", 18 ]
[ "oid", "str", 27 ]
[ "oid", "str", 27 ]
-[ "oid", "str", 30 ]
-[ "oid", "str", 30 ]
-[ "oid", "str", 182 ]
-[ "oid", "str", 182 ]
-[ "oid", "str", 182 ]
-[ "oid", "str", 1037 ]
-[ "oid", "str", 1037 ]
-[ "oid", "str", 1037 ]
-[ "oid", "str", 2914 ]
-[ "oid", "str", 2914 ]
+[ "oid", "str", 31 ]
+[ "oid", "str", 31 ]
+[ "oid", "str", 184 ]
+[ "oid", "str", 184 ]
+[ "oid", "str", 184 ]
+[ "oid", "str", 184 ]
+[ "oid", "str", 1039 ]
+[ "oid", "str", 1039 ]
+[ "oid", "str", 1039 ]
+[ "oid", "str", 2916 ]
+[ "oid", "str", 2916 ]
+#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .bbp # table_name
% L1, L2 # name
% char, wrd # type
% 9, 3 # length
-[ "transient", 155 ]
+[ "transient", 180 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L3, .bbp # table_name
% L3, L4 # name
diff -r 203a6ab66ea5 -r 97d2fc1aaa6c sql/src/test/leaks/Tests/check1.stable.out
--- a/sql/src/test/leaks/Tests/check1.stable.out Fri Jun 25 17:41:37
2010 +0200
+++ b/sql/src/test/leaks/Tests/check1.stable.out Mon Jun 28 09:41:10
2010 +0200
@@ -33,12 +33,12 @@
[ "int", "lng", 2 ]
[ "int", "str", 121 ]
[ "oid", "bit", 0 ]
-[ "oid", "bit", 30 ]
-[ "oid", "bit", 30 ]
-[ "oid", "bit", 182 ]
-[ "oid", "bit", 1037 ]
-[ "oid", "bit", 1037 ]
-[ "oid", "bit", 1037 ]
+[ "oid", "bit", 31 ]
+[ "oid", "bit", 31 ]
+[ "oid", "bit", 184 ]
+[ "oid", "bit", 1039 ]
+[ "oid", "bit", 1039 ]
+[ "oid", "bit", 1039 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
[ "oid", "int", 0 ]
@@ -79,21 +79,20 @@
[ "oid", "int", 27 ]
[ "oid", "int", 27 ]
[ "oid", "int", 27 ]
-[ "oid", "int", 30 ]
-[ "oid", "int", 30 ]
-[ "oid", "int", 182 ]
-[ "oid", "int", 182 ]
-[ "oid", "int", 182 ]
-[ "oid", "int", 182 ]
-[ "oid", "int", 182 ]
-[ "oid", "int", 182 ]
-[ "oid", "int", 1037 ]
-[ "oid", "int", 1037 ]
-[ "oid", "int", 2914 ]
-[ "oid", "int", 2914 ]
-[ "oid", "int", 2914 ]
-[ "oid", "int", 2914 ]
-[ "oid", "int", 2914 ]
+[ "oid", "int", 31 ]
+[ "oid", "int", 31 ]
+[ "oid", "int", 184 ]
+[ "oid", "int", 184 ]
+[ "oid", "int", 184 ]
+[ "oid", "int", 184 ]
+[ "oid", "int", 184 ]
+[ "oid", "int", 1039 ]
+[ "oid", "int", 1039 ]
+[ "oid", "int", 2916 ]
+[ "oid", "int", 2916 ]
+[ "oid", "int", 2916 ]
+[ "oid", "int", 2916 ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
