Changeset: 7f9fe5770ffe for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7f9fe5770ffe 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 (132 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
@@ -598,68 +598,6 @@
[ "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;"
]
-[ "adapt", "command", "bpm",
"(s:bat[:any_1,:any_2],low:any_2,hgh:any_2,rs:bat[:any_1,:any_3],pol:int):bat[:any_1,:any_2]
", "BPMadapt;"
]
-[ "addPartition", "command", "bpm",
"(b:bat[:any_1,:any_2],s:BAT):void ",
"BPMaddPartition;"
]
-[ "addPartition", "command", "bpm",
"(b:bat[:any_1,:any_2],s:bat[:any_1,:any_2]):void ",
"BPMaddPartition;"
]
-[ "count", "command", "bpm",
"(b:bat[:any_1,:any_2]):wrd ",
"BPMcount;"
]
-[ "close", "command", "bpm", "():void ",
"BPMclose;"
]
-[ "dump", "command", "bpm", "():void ",
"BPMdump;"
]
-[ "dump", "command", "bpm",
"(alias:bat[:any_1,:any_2]):void ",
"BPMdumpAlias;"
]
-[ "discard", "command", "bpm", "():void ",
"BPMdiscardAll;"
]
-[ "discard", "command", "bpm",
"(alias:bat[:any_1,:any_2]):void ",
"BPMdiscard;"
]
-[ "delete", "command", "bpm",
"(pb:bat[:any_1,:any_2],b:bat[:any_1,:any_2]):void ",
"BPMdelete;"
]
-[ "derivePartition", "command", "bpm",
"(pb:bat[:any_1,:any_2],src:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"BPMderived;"
]
-[ "deposit", "command", "bpm",
"(nme:str,b:bat[:oid,:any_2]):bat[:oid,:any_2] ",
"BPMdeposit;"
]
-[ "destroy", "command", "bpm", "():void ",
"BPMdestroy;"
]
-[ "epilogue", "command", "bpm", "():void ",
"BPMepilogue;"
]
-[ "emptySet", "command", "bpm",
"(b:bat[:any_1,:any_2]):void ",
"BPMemptySet;"
]
-[ "fold", "command", "bpm",
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"BPMfold;"
]
-[ "getNumberOfPartitions", "command", "bpm",
"(alias:bat[:any_1,:any_2]):int ",
"BPMgetNumberOfPartitions;" ]
-[ "getDimension", "command", "bpm",
"(b:bat[:any_1,:any_2]) (first:any_1,last:any_1,vlow:any_2,vhgh:any_2) ",
"BPMgetDimension;"
]
-[ "getNames", "command", "bpm",
"():bat[:oid,:str] ",
"BPMgetNames;"
]
-[ "garbage", "command", "bpm",
"(b:bat[:any_1,:any_2]):void ",
"BPMgarbage;"
]
-[ "hasMoreElements", "pattern", "bpm",
"(pb:bat[:any_1,:any_2],first:any_1,last:any_1,vlow:any_2,vhgh:any_2):bat[:any_1,:any_2]
", "BPMhasMoreElementsRng4;"
]
-[ "hasMoreElements", "pattern", "bpm",
"(pb:bat[:any_1,:any_2],low:any_2,hgh:any_2):bat[:any_1,:any_2] ",
"BPMhasMoreElementsRng;" ]
-[ "hasMoreElements", "pattern", "bpm",
"(grp:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"BPMhasMoreElements;"
]
-[ "hasMoreElements", "pattern", "bpm",
"(grp:bat[:any_1,:any_2],b:bat[:any_1,:any_3])
(_3:bat[:any_1,:any_2],_4:bat[:any_1,:any_2]) ",
"BPMhasMoreElements2;" ]
-[ "hasMoreElements", "pattern", "bpm",
"(grp:bat[:any_1,:any_2],b:bat[:any_1,:any_3],c:bat[:oid,:any_4])
(_4:bat[:any_1,:any_2],_5:bat[:any_1,:any_3],_6:bat[:any_1,:any_4]) ",
"BPMhasMoreElements3;" ]
-[ "hashPartition", "command", "bpm",
"(pb:bat[:any_1,:any_2],slots:int):void ",
"BPMhash;"
]
-[ "hashPartitions", "command", "bpm",
"(b:bat[:any_1,:any_2]):void ",
"BPMhashPartitions;"
]
-[ "insert", "command", "bpm",
"(pb:bat[:any_1,:any_2],b:bat[:any_1,:any_2]):void ",
"BPMinsert;"
]
-[ "mapThghDbl", "command", "bpm",
"():bat[:int,:dbl] ",
"BPMmapthghdbl;"
]
-[ "mapThghLng", "command", "bpm",
"():bat[:int,:lng] ",
"BPMmapthghlng;"
]
-[ "mapTlowDbl", "command", "bpm",
"():bat[:int,:dbl] ",
"BPMmaptlowdbl;"
]
-[ "mapTlowLng", "command", "bpm",
"():bat[:int,:lng] ",
"BPMmaptlowlng;"
]
-[ "mapPrv", "command", "bpm",
"():bat[:int,:int] ",
"BPMmapprv;"
]
-[ "mapNxt", "command", "bpm",
"():bat[:int,:int] ",
"BPMmapnxt;"
]
-[ "mapAlias", "command", "bpm",
"():bat[:int,:BAT] ",
"BPMmapalias;"
]
-[ "mapBid", "command", "bpm",
"():bat[:int,:BAT] ",
"BPMmapbid;"
]
-[ "mapName", "command", "bpm",
"():bat[:int,:str] ",
"BPMmapname;"
]
-[ "newIterator", "pattern", "bpm",
"(pb:bat[:any_1,:any_2],first:any_1,last:any_1,vlow:any_2,vhgh:any_2):bat[:oid,:any_2]
", "BPMnewIteratorRng4;"
]
-[ "newIterator", "pattern", "bpm",
"(grp:bat[:any_1,:any_2],first:any_2,last:any_2):bat[:any_1,:any_2] ",
"BPMnewIteratorRng;"
]
-[ "newIterator", "pattern", "bpm",
"(grp:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"BPMnewIterator;"
]
-[ "newIterator", "pattern", "bpm",
"(grp:bat[:any_1,:any_2],b:bat[:any_1,:any_3])
(_3:bat[:any_1,:any_2],_4:bat[:any_1,:any_2]) ",
"BPMnewIterator2;" ]
-[ "newIterator", "pattern", "bpm",
"(grp:bat[:any_1,:any_2],b:bat[:any_1,:any_3],c:bat[:oid,:any_4])
(_4:bat[:any_1,:any_2],_5:bat[:any_1,:any_3],_6:bat[:any_1,:any_4]) ",
"BPMnewIterator3;" ]
-[ "new", "pattern", "bpm",
"(ht:any_1,tt:any_2):bat[:any_1,:any_2] ",
"BPMnew;"
]
-[ "open", "command", "bpm", "():void ",
"BPMopen;"
]
-[ "prelude", "command", "bpm", "():void ",
"BPMprelude;"
]
-[ "partition", "command", "bpm",
"(pb:bat[:any_1,:any_2],val:any_2):void ",
"BPMsplitpartition;"
]
-[ "pieces", "command", "bpm",
"(b:bat[:any_1,:any_2]):int ",
"BPMpieces;"
]
-[ "replace", "command", "bpm",
"(pb:bat[:any_1,:any_2],old:bat[:any_1,:any_2],nwe:bat[:any_1,:any_2]):void ",
"BPMreplace;"
]
-[ "rangePartitionSort", "command", "bpm",
"(pb:bat[:any_1,:any_2],pv:bat[:oid,:any_2]):void ",
"BPMrangeVectorSort;"
]
-[ "rangePartition", "command", "bpm",
"(pb:bat[:any_1,:any_2],pv:bat[:oid,:any_2]):void ",
"BPMrangeVector;"
]
-[ "rangePartition", "command", "bpm",
"(pb:bat[:any_1,:any_2],rl:any_2,rh:any_2):void ",
"BPMrange;"
]
-[ "splitquant", "command", "bpm",
"(pb:bat[:any_1,:any_2],mb:int):void ",
"BPMsplitquant;"
]
-[ "saveCatalog", "command", "bpm", "():void ",
"BPMsaveCatalog;"
]
-[ "select", "command", "bpm",
"(part:bat[:any_1,:any_2],low:any_2,hgh:any_2,li:bit,hi:bit):bat[:any_1,:any_2]
", "BPMselectInclusive;"
]
-[ "select", "command", "bpm",
"(part:bat[:any_1,:any_2],low:any_2,hgh:any_2):bat[:any_1,:any_2] ",
"BPMselect;"
]
-[ "sortPartitions", "command", "bpm",
"(b:bat[:any_1,:any_2]):void ",
"BPMsortPartitions;"
]
-[ "sortTail", "command", "bpm",
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"BPMsortTail;"
]
-[ "take", "command", "bpm",
"(nme:bat[:any_1,:any_2],idx:int,hl:any_1,hh:any_1,tl:any_2,th:any_2):bat[:any_1,:any_2]
", "BPMtakePartitionIndexed;"
]
-[ "take", "command", "bpm",
"(nme:str,hl:any_1,hh:any_1,tl:any_2,th:any_2):bat[:any_1,:any_2] ",
"BPMtakePartition;"
]
-[ "take", "command", "bpm",
"(pb:str):bat[:any_1,:any_2] ",
"BPMtake;"
]
-[ "take", "command", "bpm",
"(pb:int):bat[:any_1,:any_2] ",
"BPMtakeIndexed;"
]
-[ "unfold", "command", "bpm",
"(alias:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"BPMunfold;"
]
[ "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;" ]
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
@@ -637,56 +637,6 @@
[ "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;"
]
-[ "adapt", "command", "bpm",
"(s:bat[:any_1,:any_2],low:any_2,hgh:any_2,rs:bat[:any_1,:any_3],pol:int):bat[:any_1,:any_2]
", "BPMadapt;"
]
-[ "addPartition", "command", "bpm",
"(b:bat[:any_1,:any_2],s:BAT):void ",
"BPMaddPartition;"
]
-[ "addPartition", "command", "bpm",
"(b:bat[:any_1,:any_2],s:bat[:any_1,:any_2]):void ",
"BPMaddPartition;"
]
-[ "count", "command", "bpm",
"(b:bat[:any_1,:any_2]):wrd ",
"BPMcount;"
]
-[ "close", "command", "bpm", "():void ",
"BPMclose;"
]
-[ "dump", "command", "bpm", "():void ",
"BPMdump;"
]
-[ "dump", "command", "bpm",
"(alias:bat[:any_1,:any_2]):void ",
"BPMdumpAlias;"
]
-[ "discard", "command", "bpm", "():void ",
"BPMdiscardAll;"
]
-[ "discard", "command", "bpm",
"(alias:bat[:any_1,:any_2]):void ",
"BPMdiscard;"
]
-[ "delete", "command", "bpm",
"(pb:bat[:any_1,:any_2],b:bat[:any_1,:any_2]):void ",
"BPMdelete;"
]
-[ "derivePartition", "command", "bpm",
"(pb:bat[:any_1,:any_2],src:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"BPMderived;"
]
-[ "deposit", "command", "bpm",
"(nme:str,b:bat[:oid,:any_2]):bat[:oid,:any_2] ",
"BPMdeposit;"
]
-[ "destroy", "command", "bpm", "():void ",
"BPMdestroy;"
]
-[ "epilogue", "command", "bpm", "():void ",
"BPMepilogue;"
]
-[ "emptySet", "command", "bpm",
"(b:bat[:any_1,:any_2]):void ",
"BPMemptySet;"
]
-[ "fold", "command", "bpm",
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"BPMfold;"
]
-[ "getNumberOfPartitions", "command", "bpm",
"(alias:bat[:any_1,:any_2]):int ",
"BPMgetNumberOfPartitions;" ]
-[ "getDimension", "command", "bpm",
"(b:bat[:any_1,:any_2]) (first:any_1,last:any_1,vlow:any_2,vhgh:any_2) ",
"BPMgetDimension;"
]
-[ "getNames", "command", "bpm",
"():bat[:oid,:str] ",
"BPMgetNames;"
]
-[ "garbage", "command", "bpm",
"(b:bat[:any_1,:any_2]):void ",
"BPMgarbage;"
]
-[ "hasMoreElements", "pattern", "bpm",
"(pb:bat[:any_1,:any_2],first:any_1,last:any_1,vlow:any_2,vhgh:any_2):bat[:any_1,:any_2]
", "BPMhasMoreElementsRng4;"
]
-[ "hasMoreElements", "pattern", "bpm",
"(pb:bat[:any_1,:any_2],low:any_2,hgh:any_2):bat[:any_1,:any_2] ",
"BPMhasMoreElementsRng;" ]
-[ "hasMoreElements", "pattern", "bpm",
"(grp:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"BPMhasMoreElements;"
]
-[ "hasMoreElements", "pattern", "bpm",
"(grp:bat[:any_1,:any_2],b:bat[:any_1,:any_3])
(_3:bat[:any_1,:any_2],_4:bat[:any_1,:any_2]) ",
"BPMhasMoreElements2;" ]
-[ "hasMoreElements", "pattern", "bpm",
"(grp:bat[:any_1,:any_2],b:bat[:any_1,:any_3],c:bat[:oid,:any_4])
(_4:bat[:any_1,:any_2],_5:bat[:any_1,:any_3],_6:bat[:any_1,:any_4]) ",
"BPMhasMoreElements3;" ]
-[ "hashPartition", "command", "bpm",
"(pb:bat[:any_1,:any_2],slots:int):void ",
"BPMhash;"
]
-[ "hashPartitions", "command", "bpm",
"(b:bat[:any_1,:any_2]):void ",
"BPMhashPartitions;"
]
-[ "insert", "command", "bpm",
"(pb:bat[:any_1,:any_2],b:bat[:any_1,:any_2]):void ",
"BPMinsert;"
]
-[ "mapThghDbl", "command", "bpm",
"():bat[:int,:dbl] ",
"BPMmapthghdbl;"
]
-[ "mapThghLng", "command", "bpm",
"():bat[:int,:lng] ",
"BPMmapthghlng;"
]
-[ "mapTlowDbl", "command", "bpm",
"():bat[:int,:dbl] ",
"BPMmaptlowdbl;"
]
-[ "mapTlowLng", "command", "bpm",
"():bat[:int,:lng] ",
"BPMmaptlowlng;"
]
-[ "mapPrv", "command", "bpm",
"():bat[:int,:int] ",
"BPMmapprv;"
]
-[ "mapNxt", "command", "bpm",
"():bat[:int,:int] ",
"BPMmapnxt;"
]
-[ "mapAlias", "command", "bpm",
"():bat[:int,:BAT] ",
"BPMmapalias;"
]
-[ "mapBid", "command", "bpm",
"():bat[:int,:BAT] ",
"BPMmapbid;"
]
-[ "mapName", "command", "bpm",
"():bat[:int,:str] ",
"BPMmapname;"
]
-[ "newIterator", "pattern", "bpm",
"(pb:bat[:any_1,:any_2],first:any_1,last:any_1,vlow:any_2,vhgh:any_2):bat[:oid,:any_2]
", "BPMnewIteratorRng4;"
]
-[ "newIterator", "pattern", "bpm",
"(grp:bat[:any_1,:any_2],first:any_2,last:any_2):bat[:any_1,:any_2] ",
"BPMnewIteratorRng;"
]
-[ "newIterator", "pattern", "bpm",
"(grp:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"BPMnewIterator;"
]
-[ "newIterator", "pattern", "bpm",
"(grp:bat[:any_1,:any_2],b:bat[:any_1,:any_3])
(_3:bat[:any_1,:any_2],_4:bat[:any_1,:any_2]) ",
"BPMnewIterator2;" ]
-[ "newIterator", "pattern", "bpm",
"(grp:bat[:any_1,:any_2],b:bat[:any_1,:any_3],c:bat[:oid,:any_4])
(_4:bat[:any_1,:any_2],_5:bat[:any_1,:any_3],_6:bat[:any_1,:any_4]) ",
"BPMnewIterator3;" ]
-[ "new", "pattern", "bpm",
"(ht:any_1,tt:any_2):bat[:any_1,:any_2] ",
"BPMnew;"
]
-[ "open", "command", "bpm", "():void ",
"BPMopen;"
]
-[ "prelude", "command", "bpm", "():void ",
"BPMprelude;"
]
-[ "partition", "command", "bpm",
"(pb:bat[:any_1,:any_2],val:any_2):void ",
"BPMsplitpartition;"
]
-[ "pieces", "command", "bpm",
"(b:bat[:any_1,:any_2]):int ",
"BPMpieces;"
]
-[ "replace", "command", "bpm",
"(pb:bat[:any_1,:any_2],old:bat[:any_1,:any_2],nwe:bat[:any_1,:any_2]):void ",
"BPMreplace;"
]
-[ "rangePartitionSort", "command", "bpm",
"(pb:bat[:any_1,:any_2],pv:bat[:oid,:any_2]):void ",
"BPMrangeVectorSort;"
]
-[ "rangePartition", "command", "bpm",
"(pb:bat[:any_1,:any_2],pv:bat[:oid,:any_2]):void ",
"BPMrangeVector;"
]
[ "bintype", "pattern", "remote", "():void ",
"RMTbintype;" ]
[ "batbincopy", "pattern", "remote",
"():bat[:void,:any] ",
"RMTbincopyfrom;"
]
[ "batbincopy", "pattern", "remote", "(b:BAT):void
",
"RMTbincopyto;" ]
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
