Changeset: 82167f39726f for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=82167f39726f Modified Files: monetdb5/modules/mal/Tests/inspect05.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.Windows Branch: default Log Message:
Merge with Aug2011 branch.
diffs (91 lines):
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out
b/monetdb5/modules/mal/Tests/inspect05.stable.out
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out
@@ -535,7 +535,6 @@ end main;
[ "stop", "command", "mapi", "():void ",
"SERVERstop;"
]
[ "trace", "command", "mapi",
"(mid:int,flag:int):void ",
"SERVERtrace;"
]
[ "emptySet", "command", "constraints",
"(b:bat[:oid,:any_2]):void ",
"CemptySet;"
]
-[ "parts", "pattern", "constraints",
"(sname:str,tname:str,cname:str,access:int,nrparts:int):void ",
"Cparts;" ]
[ "assertSpace", "pattern", "language",
"(depth:int):void ",
"safeguardStack;"
]
[ "assert", "pattern", "language",
"(v:any_1,pname:str,oper:str,val:any_2):void ",
"MALassertTriple;"
]
[ "assert", "command", "language",
"(v:oid,term:str):void ",
"MALassertOid;"
]
@@ -598,15 +597,10 @@ end main;
[ "getAddress", "pattern", "inspect",
"(mod:str,fcn:str):bat[:str,:str] ",
"INSPECTgetAddress;"
]
[ "getSignature", "pattern", "inspect",
"(mod:str,fcn:str):bat[:str,:str] ",
"INSPECTgetSignature;"
]
[ "getDefinition", "pattern", "inspect",
"(mod:str,fcn:str):bat[:str,:str] ",
"INSPECTgetDefinition;"
]
-[ "bind_idxbat", "pattern", "mat",
"(sname:str,tname:str,iname:str,access:int,part:int):bat[:oid,:any_1] ",
"mat_bind_idxbat_wrap;" ]
-[ "bind", "pattern", "mat",
"(sname:str,tname:str,cname:str,access:int,part:int):bat[:oid,:any_1] ",
"mat_bind_wrap;" ]
-[ "get_part", "pattern", "mat",
"(sname:str,tname:str,column:str,part:int):bat[:oid,:any_1] ",
"get_part_wrap;" ]
[ "hasMoreElements", "pattern", "mat",
"(grp:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MAThasMoreElements;"
]
-[ "inc_parts", "pattern", "mat",
"(sname:str,tname:str):void ",
"inc_parts_wrap;" ]
[ "info", "command", "mat",
"(g:str,e:str):bat[:any_1,:any_2] ",
"MATinfo;"
]
[ "newIterator", "pattern", "mat",
"(grp:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATnewIterator;"
]
[ "new", "pattern", "mat",
"(b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpack;"
]
-[ "print_part", "pattern", "mat",
"(sname:str,tname:str,column:str,part:int):void ",
"print_part_wrap;" ]
[ "print", "pattern", "mat",
"(b:bat[:any_1,:any_2]...):void ",
"MATprint;"
]
[ "project", "pattern", "mat",
"(map:bat[:void,:bte],b:bat[:any_1,:any_2]...):bat[:void,:any_2] ",
"MATproject;"
]
[ "project", "pattern", "mat",
"(map:bat[:void,:bte],b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATproject;"
]
@@ -615,7 +609,6 @@ end main;
[ "pack", "pattern", "mat",
"(_1:any_2...):bat[:void,:any_2] ",
"MATpackValues;"
]
[ "refine_rev", "pattern", "mat",
"(sorted:bat[:void,:any_2],map:bat[:void,:bte],b:bat[:any_1,:any_3]...)
(rsorted:bat[:void,:oid],rmap:bat[:void,:bte]) ",
"MATrefineReverse;" ]
[ "refine", "pattern", "mat",
"(sorted:bat[:void,:any_2],map:bat[:void,:bte],b:bat[:any_1,:any_3]...)
(rsorted:bat[:void,:oid],rmap:bat[:void,:bte]) ",
"MATrefine;" ]
-[ "send_part", "pattern", "mat",
"(host:str,sname:str,tname:str,column:str,part:int):void ",
"send_part_wrap;" ]
[ "sortReverseTail", "pattern", "mat",
"(b:bat[:any_1,:any_2]...) (sorted:bat[:void,:any_2],map:bat[:void,:bte]) ",
"MATsortReverseTail;" ]
[ "sortTail", "pattern", "mat",
"(b:bat[:any_1,:any_2]...) (sorted:bat[:void,:any_2],map:bat[:void,:bte]) ",
"MATsortTail;" ]
[ "slice", "pattern", "mat",
"(first:lng,last:lng,b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpackSlice;"
]
diff --git a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
--- a/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
+++ b/monetdb5/modules/mal/Tests/inspect05.stable.out.Windows
@@ -574,7 +574,6 @@ end main;
[ "stop", "command", "mapi", "():void ",
"SERVERstop;"
]
[ "trace", "command", "mapi",
"(mid:int,flag:int):void ",
"SERVERtrace;"
]
[ "emptySet", "command", "constraints",
"(b:bat[:oid,:any_2]):void ",
"CemptySet;"
]
-[ "parts", "pattern", "constraints",
"(sname:str,tname:str,cname:str,access:int,nrparts:int):void ",
"Cparts;" ]
[ "assertSpace", "pattern", "language",
"(depth:int):void ",
"safeguardStack;"
]
[ "assert", "pattern", "language",
"(v:any_1,pname:str,oper:str,val:any_2):void ",
"MALassertTriple;"
]
[ "assert", "command", "language",
"(v:oid,term:str):void ",
"MALassertOid;"
]
@@ -655,15 +654,10 @@ end main;
[ "bintype", "pattern", "remote", "():void ",
"RMTbintype;" ]
[ "batbincopy", "pattern", "remote",
"():bat[:void,:any] ",
"RMTbincopyfrom;"
]
[ "batbincopy", "pattern", "remote", "(b:BAT):void
",
"RMTbincopyto;" ]
-[ "bind_idxbat", "pattern", "mat",
"(sname:str,tname:str,iname:str,access:int,part:int):bat[:oid,:any_1] ",
"mat_bind_idxbat_wrap;" ]
-[ "bind", "pattern", "mat",
"(sname:str,tname:str,cname:str,access:int,part:int):bat[:oid,:any_1] ",
"mat_bind_wrap;" ]
-[ "get_part", "pattern", "mat",
"(sname:str,tname:str,column:str,part:int):bat[:oid,:any_1] ",
"get_part_wrap;" ]
[ "hasMoreElements", "pattern", "mat",
"(grp:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MAThasMoreElements;"
]
-[ "inc_parts", "pattern", "mat",
"(sname:str,tname:str):void ",
"inc_parts_wrap;" ]
[ "info", "command", "mat",
"(g:str,e:str):bat[:any_1,:any_2] ",
"MATinfo;"
]
[ "newIterator", "pattern", "mat",
"(grp:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATnewIterator;"
]
[ "new", "pattern", "mat",
"(b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpack;"
]
-[ "print_part", "pattern", "mat",
"(sname:str,tname:str,column:str,part:int):void ",
"print_part_wrap;" ]
[ "print", "pattern", "mat",
"(b:bat[:any_1,:any_2]...):void ",
"MATprint;"
]
[ "project", "pattern", "mat",
"(map:bat[:void,:bte],b:bat[:any_1,:any_2]...):bat[:void,:any_2] ",
"MATproject;"
]
[ "project", "pattern", "mat",
"(map:bat[:void,:bte],b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATproject;"
]
@@ -675,7 +669,6 @@ end main;
[ "pack", "pattern", "mat",
"(_1:any_2...):bat[:void,:any_2] ",
"MATpackValues;"
]
[ "refine_rev", "pattern", "mat",
"(sorted:bat[:void,:any_2],map:bat[:void,:bte],b:bat[:any_1,:any_3]...)
(rsorted:bat[:void,:oid],rmap:bat[:void,:bte]) ", "MATrefineReverse;"
]
[ "refine", "pattern", "mat",
"(sorted:bat[:void,:any_2],map:bat[:void,:bte],b:bat[:any_1,:any_3]...)
(rsorted:bat[:void,:oid],rmap:bat[:void,:bte]) ", "MATrefine;"
]
-[ "send_part", "pattern", "mat",
"(host:str,sname:str,tname:str,column:str,part:int):void ",
"send_part_wrap;" ]
[ "sortReverseTail", "pattern", "mat",
"(b:bat[:any_1,:any_2]...) (sorted:bat[:void,:any_2],map:bat[:void,:bte]) ",
"MATsortReverseTail;"
]
[ "sortTail", "pattern", "mat",
"(b:bat[:any_1,:any_2]...) (sorted:bat[:void,:any_2],map:bat[:void,:bte]) ",
"MATsortTail;"
]
[ "slice", "pattern", "mat",
"(first:lng,last:lng,b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpackSlice;"
]
diff --git a/testing/Mfilter.py.in b/testing/Mfilter.py.in
--- a/testing/Mfilter.py.in
+++ b/testing/Mfilter.py.in
@@ -136,7 +136,7 @@ norm_in = re.compile('(?:'+')|(?:'.join
r'^(!.*Exception:remote\.[^:]*:\(mapi:monetdb://monetdb@)([^/]*)(/mTests_.*\).*)\n',
# 25: 3
## r'^(ERROR = !sql_stmt symbol\()(.*)(\)->token = CREATE_SCHEMA)\n',
# 26: 3
# r'^(ERROR = !IOException:mapi.connect:Could not connect: getaddrinfo
failed: )(No .* is|.* not)( known[\. ]*)\n', # 27: 3
- r'^(ERROR REPORTED: DBD::.+ at )([\./].+)(/[^/]+\.pm line [0-9]+\.)\n',
# 28: 3
+ r'^(ERROR REPORTED: DBD:|SyntaxException:parseError)(:.+ at
)([\./].+)(/[^/]+\.pm line [0-9]+\.)\n',
# 28: 4
## r'^(ERROR =| )( !ERROR: | !SQLException:assert:| !SQLException:sql:
| !SQLException:| !MALException:)([^:]+)(: *)([^ ].*)\n', # 90: 5
# r'^(.*: at )(\([0-9]+,[0-9]+\-[0-9]+,[0-9]+\))(: .*)\n',
# 91: 3
## r'^(fatal error|ERROR)(: err:FORG0005, fn:exactly-one called with a
sequence containing zero or more than one item..*)()\n', # 99: 3
@@ -170,7 +170,7 @@ norm_out = (
None, 'localhost', None,
# 25: 3
## None, '...', None,
# 26: 3
# None, 'un', 'known',
# 27: 3
- None, '', None,
# 28: 3
+ None, None, '', None,
# 28: 3
## None, ' !ERROR', '', ': ', None,
# 90: 5
# None, '...', None,
# 91: 3
## '=ERROR', None, '\n#',
# 99: 3
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
