Changeset: 75d16c8e7851 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=75d16c8e7851 Modified Files: Branch: gdk-calc Log Message:
Merge with default branch. diffs (truncated from 2163 to 300 lines): diff --git a/monetdb5/mal/Tests/tst274.stable.out.oid64 b/monetdb5/mal/Tests/tst274.stable.out.oid64 --- a/monetdb5/mal/Tests/tst274.stable.out.oid64 +++ b/monetdb5/mal/Tests/tst274.stable.out.oid64 @@ -1,54 +1,20 @@ stdout of test 'tst274` in directory 'mal` itself: -# 08:46:49 > -# 08:46:49 > Mtimeout -timeout 60 mserver5 "--config=/ufs/mk/monet5/Linux/etc/monetdb5.conf" --debug=10 --set "monet_mod_path=/ufs/mk/monet5//Linux/lib/MonetDB5:/ufs/mk/monet5//Linux/lib/MonetDB5/lib:/ufs/mk/monet5//Linux/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/mk/monet5//Linux/var/MonetDB5/dbfarm" --set "sql_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/sql_logs" --set "xquery_logdir=/ufs/mk/monet5//Linux/var/MonetDB5/xquery_logs" --set mapi_port=38910 --set xrpc_port=45291 --set monet_prompt= --trace --dbname=mTests_src_mal tst274.mal < /dev/null -# 08:46:49 > +# 17:57:28 > +# 17:57:28 > mserver5 "--config=/ufs/mk/current//Linux/etc/monetdb5.conf" --debug=10 --set gdk_nr_threads=0 --set "monet_mod_path=/ufs/mk/current//Linux/lib/MonetDB5:/ufs/mk/current//Linux/lib/MonetDB5/lib:/ufs/mk/current//Linux/lib/MonetDB5/bin" --set "gdk_dbfarm=/ufs/mk/current//Linux/var/MonetDB5/dbfarm" --set mapi_open=true --set xrpc_open=true --set mapi_port=38637 --set xrpc_port=40729 --set monet_prompt= --set mal_listing=2 --trace --dbname=mTests_src_mal tst274.mal +# 17:57:28 > -# MonetDB Server v5.0.0_beta2_1 -# Copyright (c) 1993-2007 CWI, all rights reserved -# Compiled for x86_64-redhat-linux-gnu/64bit with 64bit OIDs dynamically linked -# dbname:mTests_src_mal +# MonetDB server v5.21.0, based on kernel v1.39.0 +# Serving database 'mTests_src_mal', using 4 threads +# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked +# Found 7.751 GiB available main-memory. +# Copyright (c) 1993-July 2008 CWI. +# Copyright (c) August 2008-2012 MonetDB B.V., all rights reserved # Visit http://monetdb.cwi.nl/ for further information -## the multiplex code blocks. -# -#t0:= alarm.usec(); -#b:= bat.new(:oid,:lng); -#barrier (go,i):= language.newRange(0:lng); -# k:= mmath.rand(); -# l:= calc.lng(k); -# bat.insert(b,nil:oid,l); -# redo (go,i):= language.nextElement(1:lng,10000:lng); -#exit (go,i); -# -#profiler.activate("ticks"); -#profiler.activate("statement"); -#profiler.activate("rdbytes"); -#profiler.activate("wrbytes"); -#profiler.activate("diskspace"); -#profiler.setAll(); -# -#profiler.start(); -#io.printf("#monitor \n"); -#mx:= aggr.max(b); -#algebra.select(b,nil:lng,mx); -#algebra.select(b,mx,nil:lng); -#d:= mmath.sin(0.2:dbl); -#profiler.stop(); -# -#stmt:= profiler.getTrace("statement"); -#io.print(stmt); -#ticks:= profiler.getTrace("ticks"); -##io.print(ticks); -#rdbytes:= profiler.getTrace("rdbytes"); -#io.print(rdbytes); -#wrbytes:= profiler.getTrace("wrbytes"); -##io.print(wrbytes); -#diskspace:= profiler.getTrace("diskspace"); -##io.print(diskspace); -#io.print(rdbytes,wrbytes,stmt); -##io.print(ticks,rdbytes,wrbytes,diskspace,stmt); -# +# Listening for connection requests on mapi:monetdb://eir.ins.cwi.nl:38637/ +# MonetDB/SQL module v2.39.0 loaded +# MonetDB/GIS module v0.19.0 loaded function user.main():void; # the multiplex code blocks. #watch out, the random generator on SUN has a limited range. @@ -88,9 +54,7 @@ exit (go,i); wrbytes := profiler.getTrace("wbytes"); io.print(wrbytes); io.print(rdbytes,wrbytes); -#io.print(ticks,rdbytes,wrbytes,diskspace); end main; -# Start performance profiling #monitor [ 7 ] [ 7 ] @@ -118,7 +82,7 @@ end main; [ 6@0, 0 ] #-------------------------# # h t t # name -# int int int # type +# void lng lng # type #-------------------------# [ 0@0, 0, 0 ] [ 1@0, 0, 160000 ] @@ -128,7 +92,7 @@ end main; [ 5@0, 0, 160000 ] [ 6@0, 0, 0 ] -# 08:46:49 > -# 08:46:49 > Done. -# 08:46:49 > +# 17:57:29 > +# 17:57:29 > Done. +# 17:57:29 > 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 @@ -36,12 +36,12 @@ end main; [ "fuse", "command", "batudf", "(one:bat[:oid,:sht],two:bat[:oid,:sht]):bat[:oid,:int] ", "UDFBATfuse;" ] [ "fuse", "command", "batudf", "(one:bat[:oid,:bte],two:bat[:oid,:bte]):bat[:oid,:sht] ", "UDFBATfuse;" ] [ "reverse", "command", "batudf", "(b:bat[:oid,:str]):bat[:oid,:str] ", "UDFBATreverse;" ] -[ "angsep", "command", "lsst", "(ra1:dbl,dec1:dbl,ra2:dbl,dec2:dbl):dbl ", "qserv_angSep;" ] -[ "ptinsphpoly", "pattern", "lsst", "(ra:dbl,dec:dbl,list:dbl...):int ", "qserv_ptInSphPoly;" ] -[ "ptinsphellipse", "command", "lsst", "(ra:dbl,dec:dbl,ra_cen:dbl,dec_cen:dbl,smaa:dbl,smia:dbl,ang:dbl):int ", "qserv_ptInSphEllipse;" ] -[ "ptinsphcircle", "command", "lsst", "(ra:dbl,dec:dbl,ra_cen:dbl,dec_cen:dbl,radius:dbl):int ", "qserv_ptInSphCircle;" ] -[ "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;" ] +[ "angsep", "command", "lsst", "(ra1:dbl,dec1:dbl,ra2:dbl,dec2:dbl):dbl ", "qserv_angSep;" ] +[ "ptinsphpoly", "pattern", "lsst", "(ra:dbl,dec:dbl,list:dbl...):int ", "qserv_ptInSphPoly;" ] +[ "ptinsphellipse", "command", "lsst", "(ra:dbl,dec:dbl,ra_cen:dbl,dec_cen:dbl,smaa:dbl,smia:dbl,ang:dbl):int ", "qserv_ptInSphEllipse;" ] +[ "ptinsphcircle", "command", "lsst", "(ra:dbl,dec:dbl,ra_cen:dbl,dec_cen:dbl,radius:dbl):int ", "qserv_ptInSphCircle;" ] +[ "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;" ] [ "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;" ] [ "Area", "command", "geom", "(g:wkb):dbl ", "wkbArea;" ] @@ -85,8 +85,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", "(X_1:wkb):mbr ", "wkbMBR;" ] -[ "mbr", "command", "geom", "(X_1:flt,X_2:flt,X_3:flt,X_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;" ] @@ -112,23 +112,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;" ] +[ "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", "(X_1:int,X_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;" ] +[ "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;" ] +[ "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;" ] @@ -144,7 +144,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]) (X_2:bat[:oid,:int],X_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;" ] @@ -203,7 +203,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", "() (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" ] +[ "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;" ] @@ -214,9 +214,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", "() (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;" ] +[ "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,sname:str,tname:str,grantee:str,privs:int,cname:str,grant:int,grantor:int):void ", "SQLcatalog;" ] @@ -239,10 +239,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", "() (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;" ] +[ "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;" ] @@ -266,7 +266,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[:oid,:any]... ", "mvc_bin_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" ] @@ -301,9 +301,9 @@ end main; [ "resultSet", "pattern", "sql", "(nr_cols:int,sep:str,rsep:str,ssep:str,ns:str,order:any_1):int ", "mvc_result_file_wrap;" ] [ "restart", "pattern", "sql", "(sname:str,sequence:str,start:lng):lng ", "mvc_restart_seq;" ] [ "shrink", "pattern", "sql", "(sch:str,tbl:str):void ", "SQLshrink;" ] -[ "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],sorted:bat[:oid,:bit]) ", "sql_storage;" ] -[ "sql_variables", "pattern", "sql", "():bat[:oid,:str] ", "sql_variables;" ] -[ "sql_environment", "function", "sql", "() (name:bat[:oid,:str],value:bat[:oid,:str]);", "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],sorted:bat[:oid,:bit]) ", "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;" ] @@ -345,8 +345,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;" ] +[ "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;" ] @@ -365,8 +365,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;" ] +[ "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;" ] @@ -441,8 +441,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;" ] +[ "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;" ] @@ -460,8 +460,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", "() (X_1:lng,X_2:str) ", "STAThasMoreElements;" ] -[ "newIterator", "pattern", "statistics", "() (X_1:lng,X_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;" ] @@ -483,7 +483,7 @@ end main; [ "getUserTime", "command", "profiler", "():lng ", "CMDgetUserTime;" ] [ "getDiskWrites", "command", "profiler", "():lng ", "CMDgetDiskWrites;" ] [ "getDiskReads", "command", "profiler", "():lng ", "CMDgetDiskReads;" ] -[ "getEvent", "pattern", "profiler", "() (X_1:lng,X_2:lng,X_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;" ] @@ -563,18 +563,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) (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;" ] _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
