Changeset: 76a619544f1c for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=76a619544f1c Modified Files: sql/backends/monet5/sql_gencode.c sql/server/rel_prop.c sql/server/rel_schema.c Branch: default Log Message:
Merge with Dec2011 branch. diffs (truncated from 1754 to 300 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 @@ -37,12 +37,19 @@ end main; [ "ptinsphbox", "command", "lsst", "(ra:dbl,dec:dbl,ra_min:dbl,dec_min:dbl,ra_max:dbl,dec_max:dbl):int ", "qserv_ptInSphBox;" ] [ "xmatch", "command", "lsst", "(l:bat[:oid,:lng],r:bat[:oid,:lng],depth:int):bat[:oid,:oid] ", "LSSTxmatch;" ] [ "attach", "pattern", "fits", "(fname:str):void ", "FITSattach;" ] +[ "export", "pattern", "fits", "(tablename:str):void ", "FITSexportTable;" ] [ "fitstest", "command", "fits", "(filename:str):int ", "FITStest;" ] [ "load", "pattern", "fits", "(tablename:str):void ", "FITSloadTable;" ] [ "listdirpattern", "pattern", "fits", "(dirname:str,pattern:str):void ", "FITSdirpat;" ] [ "listdir", "pattern", "fits", "(dirname:str):void ", "FITSdir;" ] [ "alpha", "command", "batsql", "(dec:bat[:oid,:dbl],theta:dbl):bat[:oid,:dbl] ", "SQLbat_alpha;" ] [ "next_value", "pattern", "batsql", "(sname:bat[:oid,:str],sequence:str):bat[:oid,:lng] ", "mvc_bat_next_value;" ] +[ "sphinx_searchIndexLimit", "function", "sphinx", "(q:str,i:str,l:int):bat[:oid,:lng];", "nil" ] +[ "sphinx_searchIndex", "function", "sphinx", "(q:str,i:str):bat[:oid,:lng];", "nil" ] +[ "sphinx_search", "function", "sphinx", "(q:str):bat[:oid,:lng];", "nil" ] +[ "searchIndex", "function", "sphinx", "(q:str,i:str):bat[:oid,:lng];", "nil" ] +[ "search", "function", "sphinx", "(q:str):bat[:oid,:lng];", "nil" ] +[ "searchIndexLimit", "command", "sphinx", "(q:str,i:str,l:int):bat[:oid,:lng] ", "SPHINXsearchIndexLimit;" ] [ "Area", "command", "geom", "(g:wkb):dbl ", "wkbArea;" ] [ "AsText", "command", "geom", "(w:wkb):str ", "wkbAsText;" ] [ "Buffer", "command", "geom", "(a:wkb,distance:dbl):wkb ", "wkbBuffer;" ] @@ -84,8 +91,8 @@ end main; [ "X", "command", "geom", "(g:wkb):dbl ", "wkbgetcoordX;" ] [ "Y", "command", "geom", "(g:wkb):dbl ", "wkbgetcoordY;" ] [ "epilogue", "command", "geom", "():void ", "geom_epilogue;" ] -[ "mbr", "command", "geom", "(_1:wkb):mbr ", "wkbMBR;" ] -[ "mbr", "command", "geom", "(_1:flt,_2:flt,_3:flt,_4:flt):mbr ", "ordinatesMBR;" ] +[ "mbr", "command", "geom", "(X_1:wkb):mbr ", "wkbMBR;" ] +[ "mbr", "command", "geom", "(X_1:flt,X_2:flt,X_3:flt,X_4:flt):mbr ", "ordinatesMBR;" ] [ "mbroverlaps", "command", "geom", "(a:mbr,b:mbr):bit ", "mbroverlaps;" ] [ "prelude", "command", "geom", "():void ", "geom_prelude;" ] [ "point", "command", "geom", "(x:dbl,y:dbl):wkb ", "wkbcreatepoint;" ] @@ -111,15 +118,23 @@ end main; [ "#tostr", "command", "wkb", "():str ", "wkbTOSTR;" ] [ "wkb", "command", "wkb", "(v:str):wkb ", "wkbFromString;" ] [ "#write", "command", "wkb", "():void ", "wkbWRITE;" ] +[ "connect", "command", "srvpool", "(dbname:str):str ", "SRVPOOLconnect;" ] +[ "exec", "pattern", "srvpool", "(fname:str,arg:any...):any... ", "SRVPOOLexec;" ] +[ "local", "command", "srvpool", "(b:bit):void ", "SRVPOOLlocal;" ] +[ "query", "pattern", "srvpool", "(plan:str):str... ", "SRVPOOLquery;" ] +[ "reset", "pattern", "srvpool", "(dbname:str):str ", "SRVPOOLreset;" ] [ "bidding", "pattern", "scheduler", "():bit ", "OCTOPUSbidding;" ] [ "costPrediction", "pattern", "scheduler", "(a:any):lng ", "RUNcostPrediction;" ] [ "choice", "pattern", "scheduler", "(arg:any...):void ", "RUNchoice;" ] [ "choice", "pattern", "scheduler", "():void ", "RUNchoice;" ] [ "isolation", "pattern", "scheduler", "():void ", "RUNisolation;" ] -[ "makeSchedule", "pattern", "scheduler", "(_1:int,_2:lng...):str... ", "OCTOPUSmakeSchedule;" ] +[ "makeSchedule", "pattern", "scheduler", "(X_1:int,X_2:lng...):str... ", "OCTOPUSmakeSchedule;" ] [ "octopus", "pattern", "scheduler", "(t:int):bit ", "OCTOPUSrun;" ] +[ "peers", "pattern", "scheduler", "(N:int):void ", "SRVsetServers;" ] +[ "pattern", "pattern", "scheduler", "(pat:str):void ", "SRVsetServers;" ] [ "pick", "pattern", "scheduler", "(arg:any_1...):any_1 ", "RUNpickResult;" ] [ "register", "pattern", "scheduler", "():bit ", "OCTOPUSdiscoverRegister;" ] +[ "srvpool", "pattern", "scheduler", "():int ", "SRVPOOLscheduler;" ] [ "volumeCost", "pattern", "scheduler", "(a:any):lng ", "RUNvolumeCost;" ] [ "alpha", "command", "transaction", "(b:bat[:any_1,:any_2]):bat[:any_1,:any_2] ", "TRNtrans_alpha;" ] [ "abort", "pattern", "transaction", "(c:any...):void ", "TRNtrans_abort;" ] @@ -135,7 +150,7 @@ end main; [ "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:bat[:oid,:oid]) (X_2:bat[:oid,:int],X_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;" ] @@ -196,7 +211,7 @@ end main; [ "assert", "pattern", "sql", "(b:wrd,msg:str):void ", "SQLassertWrd;" ] [ "assert", "pattern", "sql", "(b:int,msg:str):void ", "SQLassertInt;" ] [ "assert", "pattern", "sql", "(b:bit,msg:str):void ", "SQLassert;" ] -[ "bbp", "function", "sql", "():bat[:str,:BAT];", "nil" ] +[ "bbp", "function", "sql", "() (id:bat[:oid,:int],name:bat[:oid,:str],htype:bat[:oid,:str],ttype:bat[:oid,:str],count:bat[:oid,:lng],refcnt:bat[:oid,:int],lrefcnt:bat[:oid,:int],location:bat[:oid,:str],heat:bat[:oid,:int],dirty:bat[:oid,:str],status:bat[:oid,:str],kind:bat[:oid,:str]);", "nil" ] [ "bind_dbat", "command", "sql", "(clientid:int,schema:str,table:str,access:int,oldversion:lng,version:lng):bat[:oid,:oid] ", "mvc_diff_dbat_wrap;" ] [ "bind", "pattern", "sql", "(mvc:int,schema:str,table:str,column:str,access:int,part_nr:int,nr_parts:int):bat[:oid,:any_1] ", "mvc_bind_wrap;" ] [ "bind", "pattern", "sql", "(mvc:int,schema:str,table:str,column:str,access:int,low:oid,hgh:oid):bat[:oid,:any_1] ", "mvc_bind_wrap;" ] @@ -207,10 +222,9 @@ end main; [ "bind_dbat", "pattern", "sql", "(mvc:int,schema:str,table:str,access:int):bat[:oid,:oid] ", "mvc_bind_dbat_wrap;" ] [ "cluster2", "pattern", "sql", "(sch:str,tbl:str):void ", "SQLcluster2;" ] [ "cluster1", "pattern", "sql", "(sch:str,tbl:str):void ", "SQLcluster1;" ] -[ "clients", "function", "sql", "():bat[:str,:BAT];", "nil" ] -[ "copyfrom", "function", "sql", "(sname:str,tname:str,tsep:str,rsep:str,ssep:str,ns:str,nr:lng,offset:lng,locked:int):bat[:str,:BAT];", "nil" ] -[ "copy_from", "function", "sql", "(sname:str,tname:str,tsep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,locked:int):bat[:str,:BAT];", "nil" ] -[ "columnBind", "command", "sql", "(b:bat[:str,:BAT],nme:str):bat[:oid,:any_1] ", "mvc_bind_single_wrap;" ] +[ "clients", "function", "sql", "() (user:bat[:oid,:str],login:bat[:oid,:str],lastcommand:bat[:oid,:str],actions:bat[:oid,:int],seconds:bat[:oid,:lng]);", "nil" ] +[ "copyfrom", "pattern", "sql", "(sname:str,tname:str,sep:str,rsep:str,ssep:str,ns:str,nr:lng,offset:lng,locked:int):bat[:oid,:any]... ", "mvc_import_table_stdin;" ] +[ "copy_from", "pattern", "sql", "(sname:str,tname:str,sep:str,rsep:str,ssep:str,ns:str,fname:str,nr:lng,offset:lng,locked:int):bat[:oid,:any]... ", "mvc_import_table_wrap;" ] [ "clear_table", "pattern", "sql", "(sname:str,tname:str):wrd ", "mvc_clear_table_wrap;" ] [ "catalog", "pattern", "sql", "(type:int,iname:str,itype:int,sname:str,tname:str...):void ", "SQLcatalog;" ] [ "catalog", "pattern", "sql", "(type:int,tname:str,grantee:str,privs:int,cname:str,grant:int,grantor:int):void ", "SQLcatalog;" ] @@ -230,10 +244,10 @@ end main; [ "dec_round", "command", "sql", "(v:int,r:int):int ", "int_dec_round_wrap;" ] [ "dec_round", "command", "sql", "(v:sht,r:sht):sht ", "sht_dec_round_wrap;" ] [ "dec_round", "command", "sql", "(v:bte,r:bte):bte ", "bte_dec_round_wrap;" ] -[ "dump_trace", "pattern", "sql", "():bat[:str,:BAT] ", "dump_trace;" ] -[ "dump_opt_stats", "pattern", "sql", "():bat[:str,:BAT] ", "dump_opt_stats;" ] -[ "dump_cache", "pattern", "sql", "():bat[:str,:BAT] ", "dump_cache;" ] -[ "db_users", "pattern", "sql", "():bat[:str,:BAT] ", "db_users_wrap;" ] +[ "dump_trace", "pattern", "sql", "() (event:bat[:oid,:int],clk:bat[:oid,:str],pc:bat[:oid,:str],thread:bat[:oid,:int],user:bat[:oid,:int],ticks:bat[:oid,:lng],reads:bat[:oid,:lng],writes:bat[:oid,:lng],rbytes:bat[:oid,:lng],wbytes:bat[:oid,:lng],type:bat[:oid,:str],stmt:bat[:oid,:str]) ", "dump_trace;" ] +[ "dump_opt_stats", "pattern", "sql", "() (rewrite:bat[:oid,:str],count:bat[:oid,:int]) ", "dump_opt_stats;" ] +[ "dump_cache", "pattern", "sql", "() (query:bat[:oid,:str],count:bat[:oid,:int]) ", "dump_cache;" ] +[ "db_users", "pattern", "sql", "():bat[:oid,:str] ", "db_users_wrap;" ] [ "dropDeclaredTables", "pattern", "sql", "(nr:int):void ", "mvc_drop_declared_tables_wrap;" ] [ "dropDeclaredTable", "pattern", "sql", "(name:str):void ", "mvc_drop_declared_table_wrap;" ] [ "dtColumn", "pattern", "sql", "(rs:int,tname:str,name:str,typename:str,digits:int,scale:int):void ", "mvc_declared_table_column_wrap;" ] @@ -256,8 +270,7 @@ end main; [ "getVersion", "command", "sql", "(clientid:int):lng ", "mvc_getVersion;" ] [ "get_value", "pattern", "sql", "(sname:str,sequence:str):lng ", "mvc_get_value;" ] [ "getVariable", "pattern", "sql", "(mvc:int,varname:str):any_1 ", "getVariable;" ] -[ "importTable", "pattern", "sql", "(sname:str,tname:str,fname:str...):bat[:str,:BAT] ", "mvc_bin_import_table_wrap;" ] -[ "importTable", "pattern", "sql", "(s:bstream,sname:str,tname:str,sep:str,rsep:str,ssep:str,ns:str,nr:lng,offset:lng,locked:int):bat[:str,:BAT] ", "mvc_import_table_wrap;" ] +[ "importTable", "pattern", "sql", "(sname:str,tname:str,fname:str...):bat[:oid,:any]... ", "mvc_bin_import_table_wrap;" ] [ "include", "pattern", "sql", "(fname:str):void ", "SQLinclude;" ] [ "init", "pattern", "sql", "():void ", "SQLinitEnvironment;" ] [ "keepquery", "function", "sql", "(qid:int,qry:str,parse:lng,optimize:lng):void;", "nil" ] @@ -292,9 +305,9 @@ end main; [ "restart", "pattern", "sql", "(sname:str,sequence:str,start:lng):lng ", "mvc_restart_seq;" ] [ "ra", "pattern", "sql", "(cmd:str,optimize:bit):void ", "RAstatement;" ] [ "shrink", "pattern", "sql", "(sch:str,tbl:str):void ", "SQLshrink;" ] -[ "storage", "pattern", "sql", "():bat[:str,:BAT] ", "sql_storage;" ] -[ "sql_variables", "pattern", "sql", "():bat[:str,:BAT] ", "sql_variables;" ] -[ "sql_environment", "function", "sql", "():bat[:str,:BAT];", "nil" ] +[ "storage", "pattern", "sql", "() (schema:bat[:oid,:str],table:bat[:oid,:str],column:bat[:oid,:str],location:bat[:oid,:str],count:bat[:oid,:lng],capacity:bat[:oid,:lng],width:bat[:oid,:int],size:bat[:oid,:lng],hashsize:bat[:oid,:lng]) ", "sql_storage;" ] +[ "sql_variables", "pattern", "sql", "():bat[:oid,:str] ", "sql_variables;" ] +[ "sql_environment", "function", "sql", "() (name:bat[:oid,:str],value:bat[:oid,:str]);", "nil" ] [ "single", "function", "sql", "(x:any_2):bat[:oid,:any_2];", "nil" ] [ "setVariable", "pattern", "sql", "(mvc:int,varname:str,value:any_1):int ", "setVariable;" ] [ "start2", "pattern", "sql", "():void ", "SQLsession2;" ] @@ -336,6 +349,8 @@ end main; [ "expand", "command", "dictionary", "(val:bat[:any_1,:any_2],b:bat[:oid,:any_2]):bat[:any_1,:any_2] ", "DICTexpand;" ] [ "group", "command", "dictionary", "(idx:bat[:oid,:any_1],val:bat[:any_1,:any_2]):bat[:oid,:any_2] ", "DICTgroupid;" ] [ "initialize", "command", "dictionary", "():void ", "DICTinitialize;" ] +[ "materialize", "command", "centipede", "(b:bat[:any_1,:any_2],low:any_2,high:any_2):bat[:any_1,:any_2] ", "OPTcentipedeMaterialize;" ] +[ "vector", "pattern", "centipede", "(b:bat[:oid,:any_1]):any_1... ", "OPTvector;" ] [ "accessmode", "pattern", "optimizer", "(mod:str,fcn:str):str ", "OPTaccessmode;" ] [ "accessmode", "pattern", "optimizer", "():str ", "OPTaccessmode;" ] [ "aliases", "pattern", "optimizer", "(mod:str,fcn:str):str ", "OPTaliases;" ] @@ -354,6 +369,8 @@ end main; [ "constants", "pattern", "optimizer", "():str ", "OPTconstants;" ] [ "coercions", "pattern", "optimizer", "(mod:str,fcn:str):str ", "OPTcoercion;" ] [ "coercions", "pattern", "optimizer", "():str ", "OPTcoercion;" ] +[ "centipede", "pattern", "optimizer", "(mod:str,fcn:str):str ", "OPTcentipede;" ] +[ "centipede", "pattern", "optimizer", "():str ", "OPTcentipede;" ] [ "clrDebug", "pattern", "optimizer", "():void ", "QOTclrdebugOptimizers;" ] [ "dumpQEP", "pattern", "optimizer", "():void ", "OPTdumpQEP;" ] [ "derivePath", "pattern", "optimizer", "(mod:str,fcn:str):str ", "OPTderivePath;" ] @@ -426,6 +443,8 @@ end main; [ "setDebug", "pattern", "optimizer", "():void ", "QOTdebugOptimizers;" ] [ "trace", "pattern", "optimizer", "(mod:str,fcn:str):str ", "OPTdeadcode;" ] [ "trace", "pattern", "optimizer", "():str ", "OPTtrace;" ] +[ "uniform", "command", "sample", "(b:bat[:oid,:any],p:dbl):bat[:oid,:any] ", "SAMPLEuniform_dbl;" ] +[ "uniform", "command", "sample", "(b:bat[:oid,:any],s:wrd):bat[:oid,:any] ", "SAMPLEuniform;" ] [ "close", "pattern", "statistics", "():void ", "STATclose;" ] [ "dump", "pattern", "statistics", "():void ", "STATdump;" ] [ "discard", "pattern", "statistics", "(name:bat[:any_1,:any_2]):void ", "STATdiscard2;" ] @@ -443,8 +462,8 @@ end main; [ "getCount", "pattern", "statistics", "(nme:str):lng ", "STATgetCount;" ] [ "getHotset", "pattern", "statistics", "():bat[:int,:str] ", "STATgetHotset;" ] [ "getObjects", "command", "statistics", "():bat[:int,:str] ", "STATgetObjects;" ] -[ "hasMoreElements", "pattern", "statistics", "() (_1:lng,_2:str) ", "STAThasMoreElements;" ] -[ "newIterator", "pattern", "statistics", "() (_1:lng,_2:str) ", "STATnewIterator;" ] +[ "hasMoreElements", "pattern", "statistics", "() (X_1:lng,X_2:str) ", "STAThasMoreElements;" ] +[ "newIterator", "pattern", "statistics", "() (X_1:lng,X_2:str) ", "STATnewIterator;" ] [ "open", "pattern", "statistics", "():void ", "STATopen;" ] [ "prelude", "command", "statistics", "():void ", "STATprelude;" ] [ "release", "pattern", "statistics", "(name:bat[:any_1,:any_2]):void ", "STATrelease;" ] @@ -466,7 +485,7 @@ end main; [ "getUserTime", "command", "profiler", "():lng ", "CMDgetUserTime;" ] [ "getDiskWrites", "command", "profiler", "():lng ", "CMDgetDiskWrites;" ] [ "getDiskReads", "command", "profiler", "():lng ", "CMDgetDiskReads;" ] -[ "getEvent", "pattern", "profiler", "() (_1:lng,_2:lng,_3:lng) ", "CMDgetEvent;" ] +[ "getEvent", "pattern", "profiler", "() (X_1:lng,X_2:lng,X_3:lng) ", "CMDgetEvent;" ] [ "getTrace", "command", "profiler", "(e:str):bat[:int,:any_1] ", "CMDgetTrace;" ] [ "noop", "command", "profiler", "():void ", "CMDnoopProfiler;" ] [ "openStream", "pattern", "profiler", "(host:str,port:int):void ", "CMDsetProfilerStream;" ] @@ -546,18 +565,18 @@ end main; [ "call", "pattern", "language", "(s:bat[:oid,:str]):void ", "CMDcallBAT;" ] [ "call", "pattern", "language", "(s:str):void ", "CMDcallString;" ] [ "dataflow", "pattern", "language", "():int ", "MALstartDataflow;" ] -[ "nextElement", "command", "language", "(step:dbl,last:dbl) (_3:bit,_4:dbl) ", "RNGnextElement_dbl;" ] -[ "nextElement", "command", "language", "(step:flt,last:flt) (_3:bit,_4:flt) ", "RNGnextElement_flt;" ] -[ "nextElement", "command", "language", "(step:lng,last:lng) (_3:bit,_4:lng) ", "RNGnextElement_lng;" ] -[ "nextElement", "command", "language", "(step:int,last:int) (_3:bit,_4:int) ", "RNGnextElement_int;" ] -[ "nextElement", "command", "language", "(step:sht,last:sht) (_3:bit,_4:sht) ", "RNGnextElement_sht;" ] -[ "nextElement", "command", "language", "(step:oid,last:oid) (_3:bit,_4:oid) ", "RNGnextElement_oid;" ] -[ "newRange", "command", "language", "(v:dbl) (_2:bit,_3:dbl) ", "RNGnewRange_dbl;" ] -[ "newRange", "command", "language", "(v:flt) (_2:bit,_3:flt) ", "RNGnewRange_flt;" ] -[ "newRange", "command", "language", "(v:lng) (_2:bit,_3:lng) ", "RNGnewRange_lng;" ] -[ "newRange", "command", "language", "(v:int) (_2:bit,_3:int) ", "RNGnewRange_int;" ] -[ "newRange", "command", "language", "(v:sht) (_2:bit,_3:sht) ", "RNGnewRange_sht;" ] -[ "newRange", "command", "language", "(v:oid) (_2:bit,_3:oid) ", "RNGnewRange_oid;" ] +[ "nextElement", "command", "language", "(step:dbl,last:dbl) (X_3:bit,X_4:dbl) ", "RNGnextElement_dbl;" ] +[ "nextElement", "command", "language", "(step:flt,last:flt) (X_3:bit,X_4:flt) ", "RNGnextElement_flt;" ] +[ "nextElement", "command", "language", "(step:lng,last:lng) (X_3:bit,X_4:lng) ", "RNGnextElement_lng;" ] +[ "nextElement", "command", "language", "(step:int,last:int) (X_3:bit,X_4:int) ", "RNGnextElement_int;" ] +[ "nextElement", "command", "language", "(step:sht,last:sht) (X_3:bit,X_4:sht) ", "RNGnextElement_sht;" ] +[ "nextElement", "command", "language", "(step:oid,last:oid) (X_3:bit,X_4:oid) ", "RNGnextElement_oid;" ] +[ "newRange", "command", "language", "(v:dbl) (X_2:bit,X_3:dbl) ", "RNGnewRange_dbl;" ] +[ "newRange", "command", "language", "(v:flt) (X_2:bit,X_3:flt) ", "RNGnewRange_flt;" ] +[ "newRange", "command", "language", "(v:lng) (X_2:bit,X_3:lng) ", "RNGnewRange_lng;" ] +[ "newRange", "command", "language", "(v:int) (X_2:bit,X_3:int) ", "RNGnewRange_int;" ] +[ "newRange", "command", "language", "(v:sht) (X_2:bit,X_3:sht) ", "RNGnewRange_sht;" ] +[ "newRange", "command", "language", "(v:oid) (X_2:bit,X_3:oid) ", "RNGnewRange_oid;" ] [ "register", "pattern", "language", "(m:str,f:str,code:str,help:str):void ", "CMDregisterFunction;" ] [ "raise", "command", "language", "(msg:str):str ", "CMDraise;" ] [ "source", "pattern", "language", "(f:str):void ", "CMDevalFile;" ] @@ -604,9 +623,11 @@ end main; [ "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;" ] +[ "pack3", "pattern", "mat", "(b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ", "MATpack3;" ] [ "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;" ] +[ "pack", "pattern", "mat", "(X_1:any_2...):bat[:oid,:any_2] ", "MATpackValues;" ] +[ "pack", "pattern", "mat", "(X_1:any_2...):bat[:void,:any_2] ", "MATpackValues;" ] [ "refine_reverse", "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;" ] @@ -616,6 +637,9 @@ end main; [ "slice", "pattern", "mat", "(first:wrd,last:wrd,b:bat[:any_1,:any_2]...):bat[:any_1,:any_2] ", "MATpackSlice;" ] [ "makeBids", "pattern", "trader", "(bidtype:sht,fnname1:str...):lng... ", "TRADERmakeBids;" ] [ "makeBid", "pattern", "trader", "(fnname:str,bidtype:sht):lng ", "TRADERmakeBid;" ] +[ "bind_dbat", "function", "remote", "(dbconn:str,sch:str,tab:str,access:int,version:int):bat[:oid,:oid];", "nil" ] +[ "bind_idxbat", "function", "remote", "(dbconn:str,sch:str,tab:str,index:str,access:int,version:int):bat[:oid,:oid];", "nil" ] +[ "bind", "function", "remote", "(dbconn:str,sch:str,tab:str,col:str,kind:int,version:int):bat[:oid,:any_1];", "nil" ] [ "bintype", "pattern", "remote", "():void ", "RMTbintype;" ] [ "batbincopy", "pattern", "remote", "():bat[:void,:any] ", "RMTbincopyfrom;" ] [ "batbincopy", "pattern", "remote", "(b:BAT):void ", "RMTbincopyto;" ] @@ -623,12 +647,13 @@ end main; [ "connect", "command", "remote", "(uri:str,user:str,passwd:str,scen:str):str ", "RMTconnectScen;" ] [ "connect", "command", "remote", "(uri:str,user:str,passwd:str):str ", "RMTconnect;" ] [ "disconnect", "command", "remote", "(conn:str):void ", "RMTdisconnect;" ] -[ "exec", "pattern", "remote", "(conn:str,mod:str,func:str,_4:str...):str... ", "RMTexec;" ] -[ "exec", "pattern", "remote", "(conn:str,mod:str,func:str,_4:str...):str ", "RMTexec;" ] +[ "exec", "pattern", "remote", "(conn:str,mod:str,func:str,X_4:str...):str... ", "RMTexec;" ] +[ "exec", "pattern", "remote", "(conn:str,mod:str,func:str,X_4:str...):str ", "RMTexec;" ] [ "exec", "pattern", "remote", "(conn:str,mod:str,func:str):str... ", "RMTexec;" ] [ "exec", "pattern", "remote", "(conn:str,mod:str,func:str):str ", "RMTexec;" ] [ "epilogue", "command", "remote", "():void ", "RMTepilogue;" ] [ "get", "pattern", "remote", "(conn:str,ident:str):any ", "RMTget;" ] +[ "isalive", "command", "remote", "(conn:str):int ", "RMTisalive;" ] [ "put", "pattern", "remote", "(conn:str,object:any):str ", "RMTput;" ] [ "prelude", "command", "remote", "():void ", "RMTprelude;" ] [ "register", "pattern", "remote", "(conn:str,mod:str,fcn:str):void ", "RMTregister;" ] @@ -674,6 +699,7 @@ end main; [ "output", "command", "tablet", "(order:bat[:any_1,:any_2],seps:bat[:oid,:str],bats:bat[:oid,:BAT],s:streams):void ", "CMDtablet_output;" ] [ "prevPage", "command", "tablet", "():void ", "TABprevPage;" ] [ "page", "pattern", "tablet", "(b:bat[:any_1,:any]...):int ", "TABpage;" ] +[ "prelude", "command", "tablet", "():void ", "TABprelude;" ] [ "setComplaints", "pattern", "tablet", "(b:bat[:oid,:str]):void ", "TABsetComplaints;" ] [ "setTryAll", "pattern", "tablet", "():void ", "TABsetTryAll;" ] [ "setDecimal", "pattern", "tablet", "(idx:int,s:int,p:int):void ", "TABsetColumnDecimal;" ] @@ -749,6 +775,7 @@ end main; [ "getRefCount", "command", "bbp", "():bat[:int,:int] ", "CMDbbpRefCount;" ] [ "getCount", "command", "bbp", "():bat[:int,:lng] ", "CMDbbpCount;" ] [ "getName", "command", "bbp", "(b:bat[:any_1,:any_2]):str ", "CMDbbpName;" ] +[ "get", "command", "bbp", "() (ns:bat[:any_1,:any_2],ht:bat[:int,:str],tt:bat[:int,:str],cnt:bat[:int,:lng],refcnt:bat[:int,:int],lrefcnt:bat[:int,:int],location:bat[:int,:str],heat:bat[:int,:int],dirty:bat[:int,:str],status:bat[:int,:str],kind:bat[:int,:str]) ", "CMDbbp;" ] [ "getRNames", "command", "bbp", "():bat[:int,:str] ", "CMDbbpRNames;" ] [ "getNames", "command", "bbp", "():bat[:int,:str] ", "CMDbbpNames;" ] [ "getTailType", "command", "bbp", "():bat[:int,:str] ", "CMDbbpTailType;" ] @@ -772,8 +799,8 @@ end main; [ "deposit", "pattern", "const", "(name:str,val:any_1):void ", "CSTdeposit;" ] [ "destroy", "pattern", "const", "():void ", "CSTdestroy;" ] [ "epiloque", "command", "const", "():void ", "CSTepilogue;" ] -[ "hasMoreElements", "pattern", "const", "() (_1:lng,_2:str) ", "CSThasMoreElements;" ] -[ "newIterator", "pattern", "const", "() (_1:lng,_2:str) ", "CSTnewIterator;" ] +[ "hasMoreElements", "pattern", "const", "() (X_1:lng,X_2:str) ", "CSThasMoreElements;" ] +[ "newIterator", "pattern", "const", "() (X_1:lng,X_2:str) ", "CSTnewIterator;" ] [ "open", "pattern", "const", "():void ", "CSTopen;" ] [ "prelude", "pattern", "const", "():void ", "CSTprelude;" ] [ "release", "pattern", "const", "(name:any_1):void ", "CSTrelease;" ] @@ -781,13 +808,12 @@ end main; [ "releaseAll", "pattern", "const", "():void ", "CSTreleaseAll;" ] [ "toString", "pattern", "const", "(name:any_1):str ", "CSTtoString;" ] [ "take", "pattern", "const", "(name:str):any_1 ", "CSTtake;" ] -[ "addScenario", "pattern", "clients", "(usr:str,sc:str):void ", "CLTaddScenario;" ] -[ "addUser", "pattern", "clients", "(nme:str,pw:str,scen:bat[:str,:any_1]):oid ", "CLTaddUser;" ] +[ "addUser", "pattern", "clients", "(nme:str,pw:str):oid ", "CLTaddUser;" ] [ "backendsum", "command", "clients", "(pw:str):str ", "CLTbackendsum;" ] [ "checkPermission", "pattern", "clients", "(usr:str,pw:str):void ", "CLTcheckPermission;" ] [ "changePassword", "pattern", "clients", "(old:str,new:str):void ", "CLTchangePassword;" ] [ "changeUsername", "pattern", "clients", "(old:str,new:str):void ", "CLTchangeUsername;" ] -[ "getUsers", "pattern", "clients", "(s:bat[:str,:any_1]):bat[:oid,:str] ", "CLTgetUsers;" ] +[ "getUsers", "pattern", "clients", "():bat[:oid,:str] ", "CLTgetUsers;" ] [ "getPasswordHash", "pattern", "clients", "(user:str):str ", "CLTgetPasswordHash;" ] [ "getUsername", "pattern", "clients", "():str ", "CLTgetUsername;" ] [ "getTimeout", "pattern", "clients", "() (q:int,s:int) ", "CLTgetTimeout;" ] @@ -802,7 +828,6 @@ end main; [ "md5sum", "command", "clients", "(pw:str):str ", "CLTmd5sum;" ] [ "quit", "pattern", "clients", "(idx:int):void ", "CLTquit;" ] [ "quit", "pattern", "clients", "():void ", "CLTquit;" ] -[ "removeScenario", "pattern", "clients", "(usr:str,sc:str):void ", "CLTremoveScenario;" ] [ "removeUser", "pattern", "clients", "(nme:str):void ", "CLTremoveUser;" ] [ "ripemd160sum", "command", "clients", "(pw:str):str ", "CLTripemd160sum;" ] [ "setPassword", "pattern", "clients", "(user:str,pass:str):void ", "CLTsetPassword;" ] @@ -822,10 +847,15 @@ end main; [ "#heap", "command", "pcre", "():void ", "pcre_heap;" ] [ "#hash", "command", "pcre", "():void ", "pcre_hash;" ] _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list