Changeset: dbb0542f5deb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dbb0542f5deb Modified Files: MonetDB5/src/modules/mal/Tests/inspect05.stable.out Branch: default Log Message:
Merge with Oct2010 branch.
diffs (truncated from 429 to 300 lines):
diff -r ab9ba10f2423 -r dbb0542f5deb
MonetDB5/src/modules/mal/Tests/inspect05.stable.out
--- a/MonetDB5/src/modules/mal/Tests/inspect05.stable.out Wed Oct 06
09:13:53 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/inspect05.stable.out Wed Oct 06
09:22:39 2010 +0200
@@ -1295,9 +1295,15 @@
[ "toString", "pattern", "statistics",
"(name:any_1):str ",
"STATtoString;"
]
[ "take", "pattern", "statistics",
"(name:any_1):any_2 ",
"STATtake;"
]
[ "update", "command", "statistics", "():void ",
"STATupdate;"
]
+[ "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;"
]
[ "activate", "pattern", "profiler",
"(name:str...):void ",
"CMDactivateProfiler;"
]
[ "cleanup", "command", "profiler", "():void ",
"CMDcleanup;"
]
[ "clrFilter", "pattern", "profiler", "(v:any):void
",
"CMDsetFilterVariable;"
]
+[ "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;"
]
+[ "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;"
]
[ "clrFilter", "pattern", "profiler",
"(mod:str,fcn:str):void ",
"CMDclrFilterProfiler;"
]
[ "closeStream", "command", "profiler", "():void ",
"CMDcloseProfilerStream;"
]
[ "dumpTrace", "command", "profiler", "():void ",
"CMDdumpTrace;"
]
@@ -5744,6 +5750,7 @@
[ "sqladd", "command", "calc",
"(left:chr,right:lng):lng ",
"CALCbinarySQLADDchrlng;" ]
[ "sqladd", "command", "calc",
"(left:chr,right:wrd):wrd ",
"CALCbinarySQLADDchrwrd;" ]
[ "sqladd", "command", "calc",
"(left:chr,right:int):int ",
"CALCbinarySQLADDchrint;" ]
+[ "traceOptimizer", "command", "mdb",
"(flg:str):void ",
"OPTsetDebugStr;"
]
[ "sqladd", "command", "calc",
"(left:chr,right:sht):sht ",
"CALCbinarySQLADDchrsht;" ]
[ "sqladd", "command", "calc",
"(left:chr,right:bte):bte ",
"CALCbinarySQLADDchrbte;" ]
[ "sqladd", "command", "calc",
"(left:chr,right:chr):chr ",
"CALCbinarySQLADDchrchr;" ]
diff -r ab9ba10f2423 -r dbb0542f5deb
MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Debian
--- a/MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Debian Wed Oct
06 09:13:53 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Debian Wed Oct
06 09:22:39 2010 +0200
@@ -28,6 +28,16 @@
# str str str str
str
# type
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------#
[ "main", "function", "user", "():void;",
"nil"
]
+[ "append", "command", "tokenizer",
"(u:str):oid ",
"TKNZRappend;"
]
+[ "close", "command", "tokenizer",
"():void ",
"TKNZRclose;"
]
+[ "depositFile", "command", "tokenizer",
"(fnme:str):void ",
"TKNZRdepositFile;"
]
+[ "getCardinality", "command", "tokenizer",
"():bat[:void,:wrd] ",
"TKNZRgetCardinality;"
]
+[ "getCount", "command", "tokenizer",
"():bat[:void,:wrd] ",
"TKNZRgetCount;"
]
+[ "getIndex", "command", "tokenizer",
"():bat[:void,:oid] ",
"TKNZRgetIndex;"
]
+[ "getLevel", "command", "tokenizer",
"(i:int):bat[:oid,:str] ",
"TKNZRgetLevel;"
]
+[ "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;"
]
@@ -67,16 +77,6 @@
[ "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;"
]
-[ "append", "command", "tokenizer", "(u:str):oid
",
"TKNZRappend;"
]
-[ "close", "command", "tokenizer",
"():void ",
"TKNZRclose;"
]
-[ "depositFile", "command", "tokenizer",
"(fnme:str):void ",
"TKNZRdepositFile;"
]
-[ "getCardinality", "command", "tokenizer",
"():bat[:void,:wrd] ",
"TKNZRgetCardinality;" ]
-[ "getCount", "command", "tokenizer",
"():bat[:void,:wrd] ",
"TKNZRgetCount;" ]
-[ "getIndex", "command", "tokenizer",
"():bat[:void,:oid] ",
"TKNZRgetIndex;"
]
-[ "getLevel", "command", "tokenizer",
"(i:int):bat[:oid,:str] ",
"TKNZRgetLevel;"
]
-[ "locate", "pattern", "tokenizer",
"(s:str):oid ",
"TKNZRlocate;"
]
-[ "open", "command", "tokenizer",
"(name:str):void ",
"TKNZRopen;"
]
-[ "take", "pattern", "tokenizer",
"(i:oid):str ",
"TKNZRtakeOid;"
]
[ "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;"
]
@@ -865,7 +865,7 @@
[ "choice", "pattern", "scheduler",
"(arg:any...):void ",
"RUNchoice;"
]
[ "choice", "pattern", "scheduler", "():void ",
"RUNchoice;"
]
[ "isolation", "pattern", "scheduler", "():void ",
"RUNisolation;"
]
-[ "makeSchedule", "pattern", "scheduler",
"(_1:int,_2:lng...):bte... ",
"OCTOPUSmakeSchedule;" ]
+[ "makeSchedule", "pattern", "scheduler",
"(_1:int,_2:lng...):str... ",
"OCTOPUSmakeSchedule;"
]
[ "octopus", "pattern", "scheduler",
"(t:int) (_2:bit,version:int) ",
"OCTOPUSrun;"
]
[ "pick", "pattern", "scheduler",
"(arg:any_1...):any_1 ",
"RUNpickResult;"
]
[ "register", "pattern", "scheduler",
"():bit ",
"OCTOPUSdiscoverRegister;"
]
@@ -880,14 +880,24 @@
[ "prev", "command", "transaction",
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"TRNtrans_prev;"
]
[ "subcommit", "command", "transaction",
"(b:bat[:any_1,:str]):bit ",
"TRNsubcommit;"
]
[ "sync", "command", "transaction", "():bit ",
"TRNglobal_sync;"
]
-[ "append", "pattern", "master",
"(s:str,t:str,c:str,b:bat[:oid,:any_1],tag:oid):void ",
"MASTERappend;"
]
-[ "append", "pattern", "master",
"(s:str,t:str,c:str,_4:any_1,tag:oid):void ",
"MASTERappendValue;"
]
+[ "decode_y", "command", "zorder",
"(z:bat[:oid,:oid]):bat[:oid,:int] ",
"ZORDbatdecode_int_oid_y;" ]
+[ "decode_y", "command", "zorder",
"(z:oid):int ",
"ZORDdecode_int_oid_y;"
]
+[ "decode_x", "command", "zorder",
"(z:bat[:oid,:oid]):bat[:oid,:int] ",
"ZORDbatdecode_int_oid_x;" ]
+[ "decode_x", "command", "zorder",
"(z:oid):int ",
"ZORDdecode_int_oid_x;"
]
+[ "decode", "command", "zorder",
"(z:bat[:oid,:oid]) (_2:bat[:oid,:int],_3:bat[:oid,:int]) ",
"ZORDbatdecode_int_oid;" ]
+[ "decode", "command", "zorder",
"(z:oid) (x:int,y:int) ",
"ZORDdecode_int_oid;"
]
+[ "encode", "command", "zorder",
"(x:bat[:oid,:int],y:bat[:oid,:int]):bat[:oid,:oid] ",
"ZORDbatencode_int_oid;" ]
+[ "encode", "command", "zorder",
"(x:int,y:int):oid ",
"ZORDencode_int_oid;"
]
+[ "slice", "command", "zorder",
"(xb:int,yb:int,xt:int,yt:int):bat[:oid,:oid] ",
"ZORDslice_int;"
]
+[ "sql_slice", "command", "zorder",
"(xb:int,yb:int,xt:int,yt:int):bat[:str,:BAT] ",
"ZORDsql_slice_int;"
]
+[ "append", "pattern", "master",
"(mvc:ptr,s:str,t:str,c:str,b:bat[:oid,:any_1],tag:oid):ptr ",
"MASTERappend;"
]
+[ "append", "pattern", "master",
"(mvc:ptr,s:str,t:str,c:str,_5:any_1,tag:oid):ptr ",
"MASTERappendValue;"
]
[ "copy", "pattern", "master",
"(sname:str,tname:str,tsep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,tag:oid):void
", "MASTERcopy;" ]
[ "close", "command", "master",
"(tag:oid):void ",
"MASTERclose;"
]
[ "delete", "pattern", "master",
"(s:str,t:str,b:bat[:oid,:any_1],tag:oid):void ",
"MASTERdelete;"
]
[ "freeze", "command", "master", "():void ",
"MASTERfreeze;"
]
[ "getCutOffTag", "command", "master", "():oid ",
"MASTERgetCutOffTag;"
]
-[ "getURI", "pattern", "master",
"():str ",
"MASTERgetURI;"
]
+[ "getURI", "command", "master",
"():str ",
"MASTERgetURI;"
]
[ "open", "command", "master", "():oid ",
"MASTERopen;"
]
[ "prelude", "command", "master",
"():void ",
"MASTERprelude;" ]
[ "replay", "pattern", "master",
"(uri:str,usr:str,pw:str,tag:oid):void ",
"MASTERreplay;"
]
@@ -943,7 +953,13 @@
[ "forgetPrevious", "pattern", "sql",
"():void ",
"OPTforgetPrevious;"
]
[ "keepquery", "function", "sql",
"(qid:int,qry:str,parse:lng,optimize:lng):void;",
"nil"
]
[ "queryId", "function", "sql",
"(qid:int):void;",
"nil"
]
+[ "connect", "command", "octopus",
"(dbname:str):str ",
"OCTOPUSconnect;"
]
[ "legAdvice", "pattern", "octopus",
"(mod:str,fcn:str):int ",
"OPTlegAdvice;"
]
+[ "register", "pattern", "octopus",
"(dbname:str,fname:str...):void ",
"OCTOPUSregister;"
]
+[ "addReg", "pattern", "datacyclotron",
"(sch:str,tab:str,col:str,acc:int,part:int,f_bun:int,l_bun:int):int ",
"addRegWrap;"
]
+[ "bind", "pattern", "datacyclotron",
"(schema:str,table:str,column:str,access:int,partition:int,fbun:int,lbun:int):int
", "DCYbind;"
]
+[ "pin", "pattern", "datacyclotron",
"(req_id:int):bat[:any_1,:any_3] ",
"DCYpin;"
]
+[ "unpin", "pattern", "datacyclotron",
"(req_id:int):void ",
"DCYunpin;"
]
[ "bind", "command", "dictionary",
"(nme:str) (idx:bat[:oid,:any_1],val:bat[:any_1,:any_2]) ",
"DICTbind;"
]
[ "compress", "pattern", "dictionary",
"(s:str,b:bat[:any_1,:any_2]):void ",
"DICTcompress;"
]
[ "decompress", "command", "dictionary",
"(nme:str):void ",
"DICTdecompress;"
]
@@ -1098,6 +1114,8 @@
[ "openStream", "pattern", "profiler",
"(fnme:str):void ",
"CMDsetProfilerFile;"
]
[ "openStream", "pattern", "profiler",
"():void ",
"CMDopenProfilerStream;" ]
[ "reset", "command", "profiler", "():void ",
"CMDclearTrace;"
]
+[ "setMemoryFlag", "pattern", "profiler",
"():void ",
"CMDsetMemoryFlag;"
]
+[ "setFootprintFlag", "pattern", "profiler",
"():void ",
"CMDsetFootprintFlag;"
]
[ "stop", "pattern", "profiler", "():void ",
"CMDstopProfiler;"
]
[ "start", "pattern", "profiler", "():void ",
"CMDstartProfiler;"
]
[ "setEndPoint", "pattern", "profiler",
"(mod:str,fcn:str):void ",
"CMDendPointProfiler;"
]
@@ -1288,9 +1306,15 @@
[ "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", "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;"
]
[ "pack2", "pattern", "mat",
"(b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpack2;"
]
[ "pack", "pattern", "mat",
"(b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpack;"
]
[ "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;"
]
+[ "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;"
]
[ "slice", "pattern", "mat",
"(first:int,last:int,b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpackSlice;"
]
[ "slice", "pattern", "mat",
"(first:wrd,last:wrd,b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ",
"MATpackSlice;"
]
@@ -1318,7 +1342,7 @@
[ "log", "command", "recycle",
"(nm:str):void ",
"RECYCLElog;"
]
[ "monitor", "command", "recycle", "(f:int):void
",
"RECYCLEmonitor;"
]
[ "prelude", "pattern", "recycle", "():void ",
"RECYCLEprelude;"
]
-[ "reset", "pattern", "recycle",
"(sname:str...):void ",
"RECYCLEresetCMD;"
]
+[ "reset", "pattern", "recycle",
"(delta:int,sname:str...):void ",
"RECYCLEresetCMD;"
]
[ "reset", "pattern", "recycle",
"(bid:BAT):void ",
"RECYCLEresetCMD;"
]
[ "shutdown", "pattern", "recycle", "():void ",
"RECYCLEshutdownWrap;"
]
[ "setCachePolicy", "pattern", "recycle",
"(p:int,cl:int,mem:int,alpha:flt):void ",
"RECYCLEsetCache;"
]
@@ -3303,6 +3327,9 @@
[ "flt", "command", "batcalc",
"(b:bat[:any_1,:sht]):bat[:any_1,:flt] ",
"CMDconvert_sht_flt;"
]
[ "flt", "command", "batcalc",
"(b:bat[:any_1,:bte]):bat[:any_1,:flt] ",
"CMDconvert_bte_flt;"
]
[ "flt", "command", "batcalc",
"(b:bat[:any_1,:flt]):bat[:any_1,:flt] ",
"CMDconvert_flt;"
]
+[ "isnil", "command", "batcalc",
"(b:bat[:any_1,:timestamp]):bat[:any_1,:bit] ",
"MTIMEunaryISNIL;"
]
+[ "isnil", "command", "batcalc",
"(b:bat[:any_1,:daytime]):bat[:any_1,:bit] ",
"MTIMEunaryISNIL;"
]
+[ "isnil", "command", "batcalc",
"(b:bat[:any_1,:date]):bat[:any_1,:bit] ",
"MTIMEunaryISNIL;"
]
[ "ifthenelse", "command", "batcalc",
"(b:bat[:oid,:bit],t:bat[:any_1,:str],e:str):bat[:oid,:str] ",
"CMDifThenElseCst2_str;" ]
[ "ifthenelse", "command", "batcalc",
"(b:bat[:oid,:bit],e:str,t:bat[:oid,:str]):bat[:oid,:str] ",
"CMDifThenElseCst1_str;" ]
[ "ifthenelse", "command", "batcalc",
"(b:bat[:oid,:bit],t:bat[:oid,:str],e:bat[:oid,:str]):bat[:oid,:str] ",
"CMDifThenElse_str;"
]
@@ -3727,6 +3754,7 @@
[ "new", "command", "url",
"(prot:str,host:str,fnme:str):url ",
"URLnew3;"
]
[ "new", "command", "url",
"(p:str,h:str,prt:int,f:str):url ",
"URLnew4;"
]
[ "#tostr", "command", "url", "():str ",
"URLtoString;"
]
+[ "url", "command", "url",
"(s:url):url ",
"URLnoop;"
]
[ "url", "command", "url", "(s:str):url
",
"URLnew;"
]
[ "+", "command", "str",
"(l:str,r:str):str ",
"STRConcat;"
]
[ "STRepilogue", "command", "str", "():void ",
"strEpilogue;"
]
@@ -4016,7 +4044,12 @@
[ "avg", "command", "group",
"(b:bat[:any_2,:sht],e:bat[:any_2,:any_1]):bat[:any_2,:sht] ",
"GRPavg_sht;"
]
[ "avg", "command", "group",
"(b:bat[:any_2,:bte],e:bat[:any_2,:any_1]):bat[:any_2,:bte] ",
"GRPavg_bte;"
]
[ "count", "command", "group",
"(b:bat[:any_2,:any_1],e:bat[:any_2,:any_3],nonils:bit):bat[:any_2,:wrd] ",
"GRPaggr_count;" ]
-[ "derivePath", "pattern", "group",
"(l:bat[:oid,:any]...) (_2:bat[:oid,:any],_3:bat[:oid,:any]) ",
"ALGderivePath;" ]
+[ "deriveSum", "pattern", "group",
"(s:bat[:oid,:dbl],l:bat[:oid,:any]...):bat[:oid,:dbl] ",
"ALGderiveSum;"
]
+[ "deriveSum", "pattern", "group",
"(s:bat[:oid,:flt],l:bat[:oid,:any]...):bat[:oid,:flt] ",
"ALGderiveSum;"
]
+[ "deriveSum", "pattern", "group",
"(s:bat[:oid,:lng],l:bat[:oid,:any]...):bat[:oid,:lng] ",
"ALGderiveSum;"
]
+[ "deriveSum", "pattern", "group",
"(s:bat[:oid,:int],l:bat[:oid,:any]...):bat[:oid,:int] ",
"ALGderiveSum;"
]
+[ "deriveCount", "pattern", "group",
"(l:bat[:oid,:any]...):bat[:oid,:wrd] ",
"ALGderiveCount;"
]
+[ "derivePath", "pattern", "group",
"(l:bat[:oid,:any]...) (grp:bat[:oid,:any],ext:bat[:oid,:any]) ",
"ALGderivePath;"
]
[ "done", "command", "group",
"(histo:bat[:void,:wrd],map:bat[:void,:oid],a:bat[:oid,:any_2])
(hist:bat[:oid,:wrd],grp:bat[:oid,:oid]) ",
"GRPderive;" ]
[ "done", "command", "group",
"(hist:bat[:any_1,:wrd],map:bat[:any_1,:oid],a:bat[:any_1,:any_2])
(histo:bat[:any_1,:wrd],grp:bat[:any_1,:oid]) ",
"GRPderive;" ]
[ "derive", "command", "group",
"(histo:bat[:void,:wrd],map:bat[:void,:oid],a:bat[:oid,:any_2])
(hist:bat[:oid,:wrd],grp:bat[:oid,:oid]) ",
"GRPderive;" ]
@@ -4086,11 +4119,9 @@
[ "variance", "command", "group",
"(b:bat[:any_2,:bte],e:bat[:any_2,:any_1]):bat[:any_2,:bte] ",
"GRPvar_bte;"
]
[ "batStatistics", "command", "status",
"():bat[:str,:str] ",
"SYSgdkEnv;"
]
[ "cpuStatistics", "command", "status",
"():bat[:str,:int] ",
"SYScpuStatistics;"
]
-[ "getPorts", "command", "status",
"(lang:str):bat[:str,:int] ",
"SYSgetPorts;"
]
-[ "getDatabases", "command", "status",
"():bat[:str,:str] ",
"SYSgetDatabases;"
]
[ "getThreads", "command", "status",
"():bat[:int,:str] ",
"SYSgdkThread;"
]
[ "ioStatistics", "command", "status",
"():bat[:str,:int] ",
"SYSioStatistics;"
]
-[ "mem_maxsize", "command", "status", "(v:lng):void
",
"set_mem_maxsize;"
]
+[ "mem_maxsize", "command", "status",
"(v:lng):void ",
"SYSsetmem_maxsize;"
]
[ "mem_maxsize", "command", "status", "():lng ",
"SYSgetmem_maxsize;"
]
[ "mem_cursize", "command", "status", "():lng ",
"SYSgetmem_cursize;"
]
[ "memUsage", "command", "status",
"(minsize:lng):bat[:str,:lng] ",
"SYSmem_usage;"
]
@@ -5133,6 +5164,7 @@
[ "timestamp", "command", "calc",
"(d:date):timestamp ",
"MTIMEtimestamp_create_from_date;" ]
[ "timestamp", "command", "calc",
"(t:timestamp):timestamp ",
"MTIMEtimestamp2timestamp;" ]
[ "timestamp", "command", "calc",
"(s:str):timestamp ",
"MTIMEtimestamp_fromstr;" ]
+[ "url", "command", "calc",
"(s:url):url ",
"URLnoop;"
]
[ "void", "command", "calc", "(v:lng):void
",
"CALClng2void;"
]
[ "void", "command", "calc", "(v:sht):void
",
"CALCsht2void;"
]
[ "void", "command", "calc", "(v:int):void
",
"CALCint2void;"
]
@@ -5563,6 +5595,8 @@
[ "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;"
]
+[ "reuseMap", "command", "bat",
"(b:bat[:oid,:any_1],del:bat[:oid,:oid]):bat[:oid,:oid] ",
"BKCreuseBATmap;"
]
+[ "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;"
]
@@ -5571,6 +5605,8 @@
[ "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;"
]
+[ "shrinkMap", "command", "bat",
"(b:bat[:oid,:any_1],del:bat[:oid,:oid]):bat[:oid,:oid] ",
"BKCshrinkBATmap;"
]
+[ "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;"
]
@@ -5725,6 +5761,7 @@
[ "start", "pattern", "mdb",
"(mod:str,fcn:str):void ",
"MDBstartFactory;"
]
[ "start", "pattern", "mdb",
"(clientid:int):void ",
"MDBstart;"
]
[ "start", "pattern", "mdb", "():void ",
"MDBstart;"
]
+[ "traceOptimizer", "command", "mdb",
"(flg:str):void ",
"OPTsetDebugStr;"
]
[ "trap", "pattern", "mdb",
"():void ",
"mdbTrap;"
]
[ "var", "pattern", "mdb",
"(M:str,F:str):void ",
"MDBvar3;"
]
[ "var", "pattern", "mdb", "():void ",
"MDBvar;"
]
diff -r ab9ba10f2423 -r dbb0542f5deb
MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Windows
--- a/MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Windows Wed Oct
06 09:13:53 2010 +0200
+++ b/MonetDB5/src/modules/mal/Tests/inspect05.stable.out.Windows Wed Oct
06 09:22:39 2010 +0200
@@ -28,6 +28,16 @@
# str str str str
str
# type
#-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------#
[ "main", "function", "user", "():void;",
"nil"
]
+[ "append", "command", "tokenizer", "(u:str):oid
",
"TKNZRappend;" ]
+[ "close", "command", "tokenizer", "():void ",
"TKNZRclose;" ]
+[ "depositFile", "command", "tokenizer",
"(fnme:str):void ",
"TKNZRdepositFile;"
]
+[ "getCardinality", "command", "tokenizer",
"():bat[:void,:wrd] ",
"TKNZRgetCardinality;"
]
+[ "getCount", "command", "tokenizer",
"():bat[:void,:wrd] ",
"TKNZRgetCount;"
]
+[ "getIndex", "command", "tokenizer",
"():bat[:void,:oid] ",
"TKNZRgetIndex;"
]
+[ "getLevel", "command", "tokenizer",
"(i:int):bat[:oid,:str] ",
"TKNZRgetLevel;"
]
+[ "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;"
]
@@ -67,16 +77,6 @@
[ "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;"
]
-[ "append", "command", "tokenizer", "(u:str):oid
",
"TKNZRappend;"
]
-[ "close", "command", "tokenizer",
"():void ",
"TKNZRclose;"
]
-[ "depositFile", "command", "tokenizer",
"(fnme:str):void ",
"TKNZRdepositFile;"
]
-[ "getCardinality", "command", "tokenizer",
"():bat[:void,:wrd] ",
"TKNZRgetCardinality;" ]
-[ "getCount", "command", "tokenizer",
"():bat[:void,:wrd] ",
"TKNZRgetCount;" ]
-[ "getIndex", "command", "tokenizer",
"():bat[:void,:oid] ",
"TKNZRgetIndex;"
]
-[ "getLevel", "command", "tokenizer",
"(i:int):bat[:oid,:str] ",
"TKNZRgetLevel;"
]
-[ "locate", "pattern", "tokenizer",
"(s:str):oid ",
"TKNZRlocate;"
]
-[ "open", "command", "tokenizer",
"(name:str):void ",
"TKNZRopen;"
]
-[ "take", "pattern", "tokenizer",
"(i:oid):str ",
"TKNZRtakeOid;"
]
[ "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;"
]
@@ -865,7 +865,7 @@
[ "choice", "pattern", "scheduler",
"(arg:any...):void ",
"RUNchoice;"
]
[ "choice", "pattern", "scheduler", "():void ",
"RUNchoice;"
]
[ "isolation", "pattern", "scheduler", "():void ",
"RUNisolation;"
]
-[ "makeSchedule", "pattern", "scheduler",
"(_1:int,_2:lng...):bte... ",
"OCTOPUSmakeSchedule;" ]
+[ "makeSchedule", "pattern", "scheduler",
"(_1:int,_2:lng...):str... ",
"OCTOPUSmakeSchedule;"
]
[ "octopus", "pattern", "scheduler",
"(t:int) (_2:bit,version:int) ",
"OCTOPUSrun;"
]
[ "pick", "pattern", "scheduler",
"(arg:any_1...):any_1 ",
"RUNpickResult;"
]
[ "register", "pattern", "scheduler",
"():bit ",
"OCTOPUSdiscoverRegister;"
]
@@ -880,14 +880,24 @@
[ "prev", "command", "transaction",
"(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] ",
"TRNtrans_prev;"
]
[ "subcommit", "command", "transaction",
"(b:bat[:any_1,:str]):bit ",
"TRNsubcommit;"
]
[ "sync", "command", "transaction", "():bit ",
"TRNglobal_sync;"
]
-[ "append", "pattern", "master",
"(s:str,t:str,c:str,b:bat[:oid,:any_1],tag:oid):void ",
"MASTERappend;"
]
-[ "append", "pattern", "master",
"(s:str,t:str,c:str,_4:any_1,tag:oid):void ",
"MASTERappendValue;"
]
+[ "decode_y", "command", "zorder",
"(z:bat[:oid,:oid]):bat[:oid,:int] ",
"ZORDbatdecode_int_oid_y;"
]
+[ "decode_y", "command", "zorder", "(z:oid):int
",
"ZORDdecode_int_oid_y;" ]
+[ "decode_x", "command", "zorder",
"(z:bat[:oid,:oid]):bat[:oid,:int] ",
"ZORDbatdecode_int_oid_x;"
]
+[ "decode_x", "command", "zorder", "(z:oid):int
",
"ZORDdecode_int_oid_x;" ]
+[ "decode", "command", "zorder",
"(z:bat[:oid,:oid]) (_2:bat[:oid,:int],_3:bat[:oid,:int]) ",
"ZORDbatdecode_int_oid;"
]
+[ "decode", "command", "zorder", "(z:oid)
(x:int,y:int) ",
"ZORDdecode_int_oid;" ]
+[ "encode", "command", "zorder",
"(x:bat[:oid,:int],y:bat[:oid,:int]):bat[:oid,:oid] ",
"ZORDbatencode_int_oid;"
]
+[ "encode", "command", "zorder",
"(x:int,y:int):oid ",
"ZORDencode_int_oid;"
]
+[ "slice", "command", "zorder",
"(xb:int,yb:int,xt:int,yt:int):bat[:oid,:oid] ",
"ZORDslice_int;"
]
+[ "sql_slice", "command", "zorder",
"(xb:int,yb:int,xt:int,yt:int):bat[:str,:BAT] ",
"ZORDsql_slice_int;"
]
+[ "append", "pattern", "master",
"(mvc:ptr,s:str,t:str,c:str,b:bat[:oid,:any_1],tag:oid):ptr ",
"MASTERappend;"
]
+[ "append", "pattern", "master",
"(mvc:ptr,s:str,t:str,c:str,_5:any_1,tag:oid):ptr ",
"MASTERappendValue;"
]
[ "copy", "pattern", "master",
"(sname:str,tname:str,tsep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,tag:oid):void
", "MASTERcopy;" ]
[ "close", "command", "master",
"(tag:oid):void ",
"MASTERclose;"
]
[ "delete", "pattern", "master",
"(s:str,t:str,b:bat[:oid,:any_1],tag:oid):void ",
"MASTERdelete;"
]
[ "freeze", "command", "master", "():void ",
"MASTERfreeze;"
]
[ "getCutOffTag", "command", "master", "():oid ",
"MASTERgetCutOffTag;"
]
-[ "getURI", "pattern", "master",
"():str ",
"MASTERgetURI;"
]
+[ "getURI", "command", "master", "():str ",
"MASTERgetURI;" ]
[ "open", "command", "master", "():oid ",
"MASTERopen;"
]
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
