Changeset: bfdc43b3e181 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bfdc43b3e181
Added Files:
testing/exportutils.py
Removed Files:
monetdb5/modules/kernel/alarm.h
Modified Files:
clients/Tests/MAL-signatures_all.stable.out
clients/Tests/MAL-signatures_fits_geom.stable.out
clients/Tests/MAL-signatures_geom.stable.out
clients/Tests/MAL-signatures_none.stable.out
clients/Tests/exports.py
clients/Tests/exports.stable.out
gdk/gdk.h
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc_compare.h
gdk/gdk_value.c
geom/monetdb5/geom.c
monetdb5/NT/M5server.bat
monetdb5/extras/mal_optimizer_template/opt_sql_append.c
monetdb5/extras/rapi/rapi.c
monetdb5/extras/rapi/rapi.h
monetdb5/extras/rdf/rdf.h
monetdb5/extras/sphinx/sphinx.c
monetdb5/extras/sphinx/sphinx.h
monetdb5/mal/mal.c
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_factory.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_interpreter.h
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_recycle.c
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_sabaoth.c
monetdb5/mal/mal_sabaoth.h
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/identifier.c
monetdb5/modules/atoms/identifier.h
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/json.h
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.h
monetdb5/modules/atoms/mtime.mal
monetdb5/modules/atoms/str.c
monetdb5/modules/atoms/str.h
monetdb5/modules/atoms/streams.c
monetdb5/modules/atoms/streams.h
monetdb5/modules/atoms/url.c
monetdb5/modules/atoms/url.h
monetdb5/modules/atoms/url.mal
monetdb5/modules/atoms/uuid.c
monetdb5/modules/atoms/xml.c
monetdb5/modules/atoms/xml.h
monetdb5/modules/kernel/Makefile.ag
monetdb5/modules/kernel/alarm.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/bat5.h
monetdb5/modules/kernel/bat5.mal
monetdb5/modules/kernel/batcolor.c
monetdb5/modules/kernel/batcolor.h
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/batmmath.h
monetdb5/modules/kernel/batmmath.mal
monetdb5/modules/kernel/batstr.c
monetdb5/modules/kernel/counters.c
monetdb5/modules/kernel/logger.c
monetdb5/modules/kernel/logger.mal
monetdb5/modules/kernel/microbenchmark.c
monetdb5/modules/kernel/microbenchmark.h
monetdb5/modules/kernel/mmath.c
monetdb5/modules/kernel/mmath.h
monetdb5/modules/kernel/status.c
monetdb5/modules/kernel/status.h
monetdb5/modules/mal/Tests/inspect05.stable.out
monetdb5/modules/mal/batExtensions.c
monetdb5/modules/mal/batExtensions.h
monetdb5/modules/mal/batExtensions.mal
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/bbp.h
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/clients.h
monetdb5/modules/mal/cluster.c
monetdb5/modules/mal/cluster.h
monetdb5/modules/mal/factories.c
monetdb5/modules/mal/factories.h
monetdb5/modules/mal/groupby.c
monetdb5/modules/mal/inspect.c
monetdb5/modules/mal/inspect.h
monetdb5/modules/mal/iterator.c
monetdb5/modules/mal/iterator.h
monetdb5/modules/mal/joinpath.c
monetdb5/modules/mal/json_util.c
monetdb5/modules/mal/json_util.h
monetdb5/modules/mal/language.c
monetdb5/modules/mal/language.h
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mal_io.h
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mal_mapi.h
monetdb5/modules/mal/mal_mapi.mal
monetdb5/modules/mal/manifold.c
monetdb5/modules/mal/manual.c
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/mat.h
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/mdb.h
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/mkey.h
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/pcre.mal
monetdb5/modules/mal/profiler.c
monetdb5/modules/mal/profiler.h
monetdb5/modules/mal/querylog.c
monetdb5/modules/mal/querylog.h
monetdb5/modules/mal/recycle.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/remote.h
monetdb5/modules/mal/sabaoth.c
monetdb5/modules/mal/sabaoth.h
monetdb5/modules/mal/sample.c
monetdb5/modules/mal/sample.h
monetdb5/modules/mal/sample.mal
monetdb5/modules/mal/sysmon.c
monetdb5/modules/mal/sysmon.mal
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/tokenizer.h
monetdb5/modules/mal/trader.c
monetdb5/modules/mal/transaction.c
monetdb5/modules/mal/txtsim.c
monetdb5/modules/mal/txtsim.h
monetdb5/modules/mal/zorder.c
monetdb5/modules/mal/zorder.h
monetdb5/optimizer/opt_centipede.c
monetdb5/optimizer/opt_mapreduce.c
monetdb5/optimizer/opt_mapreduce.h
monetdb5/optimizer/opt_octopus.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_pipes.h
monetdb5/optimizer/opt_statistics.c
monetdb5/optimizer/opt_statistics.h
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_support.h
monetdb5/optimizer/opt_wrapper.c
monetdb5/optimizer/optimizer.c
monetdb5/optimizer/optimizer.mal
monetdb5/scheduler/run_adder.c
monetdb5/scheduler/run_memo.c
monetdb5/scheduler/run_octopus.c
monetdb5/scheduler/srvpool.c
monetdb5/scheduler/srvpool.h
monetdb5/tests/BugReports/Tests/no.016.mal
monetdb5/tests/BugReports/Tests/no.016.stable.out
sql/backends/monet5/LSST/lsst.c
sql/backends/monet5/LSST/lsst.h
sql/backends/monet5/bam/bam.mal
sql/backends/monet5/bam/bam_export.c
sql/backends/monet5/bam/bam_export.h
sql/backends/monet5/bam/bam_loader.c
sql/backends/monet5/datacell/basket.c
sql/backends/monet5/datacell/basket.h
sql/backends/monet5/datacell/basket.mal
sql/backends/monet5/datacell/datacell.c
sql/backends/monet5/datacell/datacell.h
sql/backends/monet5/datacell/dcoperator.c
sql/backends/monet5/datacell/dcoperator.h
sql/backends/monet5/datacell/emitter.c
sql/backends/monet5/datacell/emitter.h
sql/backends/monet5/datacell/petrinet.c
sql/backends/monet5/datacell/petrinet.h
sql/backends/monet5/datacell/petrinet.mal
sql/backends/monet5/datacell/receptor.c
sql/backends/monet5/datacell/receptor.h
sql/backends/monet5/generator/generator.c
sql/backends/monet5/gsl/gsl.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_bat2time.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_cast.h
sql/backends/monet5/sql_rdf.c
sql/backends/monet5/sql_round_impl.h
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_scenario.h
sql/backends/monet5/sql_statistics.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/vaults/fits.c
sql/backends/monet5/vaults/mseed.c
sql/backends/monet5/vaults/vault.c
sql/backends/monet5/vaults/vault.h
sql/server/rel_dump.c
sql/server/rel_optimizer.c
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/sql_parser.y
sql/server/sql_scan.c
sql/storage/bat/bat_storage.c
sql/storage/store.c
sql/test/BugTracker-2010/Tests/ORDER_BY_over_UNION_EXCEPT_INTERSECT.Bug-2606.stable.out
sql/test/Tests/identifiers.stable.err
sql/test/Tests/identifiers.stable.out
sql/test/bugs/Tests/alter_add_column-bug.stable.err
testing/Makefile.ag
testing/listexports.py.in
Branch: Oct2014
Log Message:
merge
Unterschiede (gekürzt von 19196 auf 300 Zeilen):
diff --git a/clients/Tests/MAL-signatures_all.stable.out
b/clients/Tests/MAL-signatures_all.stable.out
--- a/clients/Tests/MAL-signatures_all.stable.out
+++ b/clients/Tests/MAL-signatures_all.stable.out
@@ -2579,10 +2579,6 @@ command algebra.outerjoin(outer:bat[:any
address ALGouterjoin;
comment Returns all the result of a join, plus the BUNS formed NIL in
the tail and the head-values of 'outer' whose tail-value does not
match an head-value in 'inner'.
-command algebra.prejoin(a:bat[:oid,:oid],b:bat[:oid,:any_1])
(c:bat[:oid,:oid],d:bat[:oid,:any_1])
-address ALGprejoin;
-comment Recluster the table to reduce random access behavior.
-
pattern algebra.project(b:bat[:any_2,:any_1],v:any_3):bat[:any_2,:any_3]
address ALGprojecttail;
comment Fill the tail with a constant, e.g. [0~b]
@@ -2851,7 +2847,7 @@ address seq_length_bat;
comment Calculate the real length of a bat of DNA sequences, given their CIGAR
string.
pattern bam.bam_export(output_path:str):void
-address bam_export;
+address bam_exportf;
comment Export results in the bam.export table to a BAM file
command bam.bam_flag(flag:sht,name:str):bit
@@ -2883,11 +2879,11 @@ address reverse_seq;
comment Reverse a DNA sequence.
pattern bam.sam_export(output_path:str):void
-address sam_export;
+address sam_exportf;
comment Export results in the bam.export table to a SAM file
command bam.seq_length(cigar:str):int
-address seq_length_bat;
+address seq_length;
comment Calculate the real length of a DNA sequence, given its CIGAR string.
command batudf.fuse(one:bat[:oid,:int],two:bat[:oid,:int]):bat[:oid,:lng]
@@ -3274,9 +3270,9 @@ command batmmath.exp(x:bat[:oid,:flt]):b
address CMDscience_bat_flt_exp;
command batmmath.exp(x:bat[:oid,:dbl]):bat[:oid,:dbl]
address CMDscience_bat_dbl_exp;
-command batmmath.fmod(x:bat[:oid,:flt],y:flt):bat[:oid,:flt]
-address CMDbatMODsignal;
-command batmmath.fmod(x:bat[:oid,:dbl],y:dbl):bat[:oid,:dbl]
+pattern batmmath.fmod(x:bat[:oid,:flt],y:flt):bat[:oid,:flt]
+address CMDbatMODsignal;
+pattern batmmath.fmod(x:bat[:oid,:dbl],y:dbl):bat[:oid,:dbl]
address CMDbatMODsignal;
command batmmath.floor(x:bat[:oid,:flt]):bat[:oid,:flt]
address CMDscience_bat_flt_floor;
@@ -31625,7 +31621,7 @@ command bat.delete(b:bat[:any_1,:any_2],
address BKCdelete_bat_bun;
comment Delete from the first BAT all BUNs with a corresponding BUN in
the second.
-command bat.deleteHead(b:bat[:any_1,:any_2],src:bat[:any_1,:any]):void
+command
bat.deleteHead(b:bat[:any_1,:any_2],src:bat[:any_1,:any]):bat[:any_1,:any_2]
address BKCdelete_bat;
comment Delete from the first BAT all BUNs with a corresponding head
in the second.
@@ -37616,7 +37612,7 @@ command calc.ptr(v:ptr):ptr
address CMDvarCONVERTptr;
comment Cast VALUE to ptr
-command calc.rowid(v:any_1,schema:str,table:str):oid
+pattern calc.rowid(v:any_1,schema:str,table:str):oid
address sql_rowid;
comment return the next rowid
@@ -38244,7 +38240,7 @@ address URLnoop;
comment Create an URL from a string literal
command calc.url(s:str):url
-address URLnoop;
+address URLnew;
comment Create an URL from a string literal
pattern calc.void(v:str):void
@@ -39815,7 +39811,7 @@ command mapi.query(mid:int,qry:str):int
address SERVERquery;
comment Send the query for execution
-command mapi.rpc(key:int,qry:str):void
+command mapi.rpc(key:int,qry:str):int
address SERVERquery;
comment Send a simple query for execution.
@@ -39845,7 +39841,7 @@ command mapi.resume():void
address SERVERresume;
comment Resume connection listeners.
-command mapi.setAlias(dbalias:str):void
+command mapi.setAlias(key:int,dbalias:str):void
address SERVERsetAlias;
comment Give the channel a logical name.
@@ -40588,7 +40584,7 @@ address MTIMEtzone_create_dst;
comment create a timezone as an hour difference from GMT and a DST.
command mtime.timezone(s:lng):timezone
-address MTIMEtzone_create;
+address MTIMEtzone_create_lng;
comment Convert the int to a timezone.
command mtime.timezone(s:int):timezone
@@ -41006,7 +41002,7 @@ command pcre.match(s:str,pat:str):bit
address PCREmatch;
comment Perl Compatible Regular Expression pattern matching against a string
-pattern pcre.prelude():void
+command pcre.prelude():void
address pcre_init;
comment Initialize pcre
@@ -41292,15 +41288,11 @@ pattern recycle.setCache(clines:int):voi
address RECYCLEsetCache;
comment Set recycler cache line parameter
-command sample.subuniform(b:bat[:oid,:any],s:wrd):bat[:oid,:oid]
-address SAMPLEuniform;
-comment Returns the oids of a uniform sample of size s
-
-command sample.uniform(b:bat[:oid,:any],p:dbl):bat[:oid,:oid]
+command sample.subuniform(b:bat[:oid,:any],p:dbl):bat[:oid,:oid]
address SAMPLEuniform_dbl;
comment Returns the oids of a uniform sample of size = (p x count(b)), where 0
<= p <= 1.0
-command sample.uniform(b:bat[:oid,:any],s:wrd):bat[:oid,:oid]
+command sample.subuniform(b:bat[:oid,:any],s:wrd):bat[:oid,:oid]
address SAMPLEuniform;
comment Returns the oids of a uniform sample of size s
@@ -42286,31 +42278,31 @@ command streams.writeStr{unsafe}(s:strea
address mnstr_write_stringwrap;
comment write data on the stream
-command sysmon.pause(id:lng):void
+pattern sysmon.pause(id:lng):void
address SYSMONpause;
comment Temporary suspend a single query
-command sysmon.pause(id:int):void
+pattern sysmon.pause(id:int):void
address SYSMONpause;
-command sysmon.pause(id:sht):void
+pattern sysmon.pause(id:sht):void
address SYSMONpause;
pattern sysmon.queue()
(tag:bat[:oid,:lng],user:bat[:oid,:str],started:bat[:oid,:timestamp],estimate:bat[:oid,:timestamp],progress:bat[:oid,:int],status:bat[:oid,:str],qrytag:bat[:oid,:oid],query:bat[:oid,:str])
address SYSMONqueue;
-command sysmon.resume(id:lng):void
+pattern sysmon.resume(id:lng):void
address SYSMONresume;
comment Resume processing
-command sysmon.resume(id:int):void
+pattern sysmon.resume(id:int):void
address SYSMONresume;
-command sysmon.resume(id:sht):void
+pattern sysmon.resume(id:sht):void
address SYSMONresume;
-command sysmon.stop(id:lng):void
+pattern sysmon.stop(id:lng):void
address SYSMONstop;
comment Stop a single query a.s.a.p.
-command sysmon.stop(id:int):void
+pattern sysmon.stop(id:int):void
address SYSMONstop;
-command sysmon.stop(id:sht):void
+pattern sysmon.stop(id:sht):void
address SYSMONstop;
command timezone.#fromstr():timezone
address tzone_fromstr;
diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out
b/clients/Tests/MAL-signatures_fits_geom.stable.out
--- a/clients/Tests/MAL-signatures_fits_geom.stable.out
+++ b/clients/Tests/MAL-signatures_fits_geom.stable.out
@@ -2580,10 +2580,6 @@ command algebra.outerjoin(outer:bat[:any
address ALGouterjoin;
comment Returns all the result of a join, plus the BUNS formed NIL in
the tail and the head-values of 'outer' whose tail-value does not
match an head-value in 'inner'.
-command algebra.prejoin(a:bat[:oid,:oid],b:bat[:oid,:any_1])
(c:bat[:oid,:oid],d:bat[:oid,:any_1])
-address ALGprejoin;
-comment Recluster the table to reduce random access behavior.
-
pattern algebra.project(b:bat[:any_2,:any_1],v:any_3):bat[:any_2,:any_3]
address ALGprojecttail;
comment Fill the tail with a constant, e.g. [0~b]
@@ -3195,9 +3191,9 @@ command batmmath.exp(x:bat[:oid,:flt]):b
address CMDscience_bat_flt_exp;
command batmmath.exp(x:bat[:oid,:dbl]):bat[:oid,:dbl]
address CMDscience_bat_dbl_exp;
-command batmmath.fmod(x:bat[:oid,:flt],y:flt):bat[:oid,:flt]
-address CMDbatMODsignal;
-command batmmath.fmod(x:bat[:oid,:dbl],y:dbl):bat[:oid,:dbl]
+pattern batmmath.fmod(x:bat[:oid,:flt],y:flt):bat[:oid,:flt]
+address CMDbatMODsignal;
+pattern batmmath.fmod(x:bat[:oid,:dbl],y:dbl):bat[:oid,:dbl]
address CMDbatMODsignal;
command batmmath.floor(x:bat[:oid,:flt]):bat[:oid,:flt]
address CMDscience_bat_flt_floor;
@@ -31546,7 +31542,7 @@ command bat.delete(b:bat[:any_1,:any_2],
address BKCdelete_bat_bun;
comment Delete from the first BAT all BUNs with a corresponding BUN in
the second.
-command bat.deleteHead(b:bat[:any_1,:any_2],src:bat[:any_1,:any]):void
+command
bat.deleteHead(b:bat[:any_1,:any_2],src:bat[:any_1,:any]):bat[:any_1,:any_2]
address BKCdelete_bat;
comment Delete from the first BAT all BUNs with a corresponding head
in the second.
@@ -37537,7 +37533,7 @@ command calc.ptr(v:ptr):ptr
address CMDvarCONVERTptr;
comment Cast VALUE to ptr
-command calc.rowid(v:any_1,schema:str,table:str):oid
+pattern calc.rowid(v:any_1,schema:str,table:str):oid
address sql_rowid;
comment return the next rowid
@@ -38165,7 +38161,7 @@ address URLnoop;
comment Create an URL from a string literal
command calc.url(s:str):url
-address URLnoop;
+address URLnew;
comment Create an URL from a string literal
pattern calc.void(v:str):void
@@ -39732,7 +39728,7 @@ command mapi.query(mid:int,qry:str):int
address SERVERquery;
comment Send the query for execution
-command mapi.rpc(key:int,qry:str):void
+command mapi.rpc(key:int,qry:str):int
address SERVERquery;
comment Send a simple query for execution.
@@ -39762,7 +39758,7 @@ command mapi.resume():void
address SERVERresume;
comment Resume connection listeners.
-command mapi.setAlias(dbalias:str):void
+command mapi.setAlias(key:int,dbalias:str):void
address SERVERsetAlias;
comment Give the channel a logical name.
@@ -40505,7 +40501,7 @@ address MTIMEtzone_create_dst;
comment create a timezone as an hour difference from GMT and a DST.
command mtime.timezone(s:lng):timezone
-address MTIMEtzone_create;
+address MTIMEtzone_create_lng;
comment Convert the int to a timezone.
command mtime.timezone(s:int):timezone
@@ -40923,7 +40919,7 @@ command pcre.match(s:str,pat:str):bit
address PCREmatch;
comment Perl Compatible Regular Expression pattern matching against a string
-pattern pcre.prelude():void
+command pcre.prelude():void
address pcre_init;
comment Initialize pcre
@@ -41191,15 +41187,11 @@ pattern recycle.setCache(clines:int):voi
address RECYCLEsetCache;
comment Set recycler cache line parameter
-command sample.subuniform(b:bat[:oid,:any],s:wrd):bat[:oid,:oid]
-address SAMPLEuniform;
-comment Returns the oids of a uniform sample of size s
-
-command sample.uniform(b:bat[:oid,:any],p:dbl):bat[:oid,:oid]
+command sample.subuniform(b:bat[:oid,:any],p:dbl):bat[:oid,:oid]
address SAMPLEuniform_dbl;
comment Returns the oids of a uniform sample of size = (p x count(b)), where 0
<= p <= 1.0
-command sample.uniform(b:bat[:oid,:any],s:wrd):bat[:oid,:oid]
+command sample.subuniform(b:bat[:oid,:any],s:wrd):bat[:oid,:oid]
address SAMPLEuniform;
comment Returns the oids of a uniform sample of size s
@@ -42176,31 +42168,31 @@ command streams.writeStr{unsafe}(s:strea
address mnstr_write_stringwrap;
comment write data on the stream
-command sysmon.pause(id:lng):void
+pattern sysmon.pause(id:lng):void
address SYSMONpause;
comment Temporary suspend a single query
-command sysmon.pause(id:int):void
+pattern sysmon.pause(id:int):void
address SYSMONpause;
-command sysmon.pause(id:sht):void
+pattern sysmon.pause(id:sht):void
address SYSMONpause;
pattern sysmon.queue()
(tag:bat[:oid,:lng],user:bat[:oid,:str],started:bat[:oid,:timestamp],estimate:bat[:oid,:timestamp],progress:bat[:oid,:int],status:bat[:oid,:str],qrytag:bat[:oid,:oid],query:bat[:oid,:str])
address SYSMONqueue;
-command sysmon.resume(id:lng):void
+pattern sysmon.resume(id:lng):void
address SYSMONresume;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
