Changeset: d30daad467d2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d30daad467d2 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out Branch: default Log Message:
Merge diffs (198 lines): diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -2328,11 +2328,11 @@ command algebra.join(left:bat[:oid,:any_ address ALGjoin2; comment Returns 2 columns with all BUNs, consisting of the head-oids from 'left' and 'right' for which there are BUNs in 'left' and 'right' with equal tails -pattern algebra.leftfetchjoinPath(l:bat[:any,:any]...):bat[:any,:any] +pattern algebra.leftfetchjoinPath(l:bat[:oid,:any]...):bat[:oid,:any] address ALGjoinPath; comment Routine to handle join paths. The type analysis is rather tricky. -pattern algebra.leftjoinPath(l:bat[:any,:any]...):bat[:oid,:any] +pattern algebra.leftjoinPath(l:bat[:oid,:any]...):bat[:oid,:any] address ALGjoinPath; comment Routine to handle join paths. The type analysis is rather tricky. @@ -2382,7 +2382,7 @@ command algebra.reuse(b:bat[:oid,:any_1] address ALGreuse; comment Reuse a temporary BAT if you can. Otherwise, allocate enough storage to accept result of an operation (not involving the heap) -pattern algebra.semijoinPath(l:bat[:any,:any]...):bat[:any,:any] +pattern algebra.semijoinPath(l:bat[:oid,:any]...):bat[:oid,:any] address ALGjoinPath; comment Routine to handle join paths. The type analysis is rather tricky. @@ -31259,7 +31259,7 @@ command bat.mergecand(a:bat[:oid,:oid],b address BKCmergecand; comment Merge two candidate lists into one -command bat.mirror(b:bat[:any_1,:any_2]):bat[:any_1,:any_1] +command bat.mirror(b:bat[:oid,:any_2]):bat[:oid,:oid] address BKCmirror; comment Returns the head-mirror image of a BAT (two head columns). @@ -31325,10 +31325,6 @@ command bat.replace(b:bat[:oid,:any_1],h address BKCbun_inplace; comment Replace the tail value of one BUN that has some head value. -command bat.reverse(b:bat[:any_1,:any_2]):bat[:any_2,:any_1] -address BKCreverse; -comment Returns the reverse view of a BAT (head is tail and tail is head). BEWARE no copying is involved; input and output refer to the same object! - pattern bat.single(val:any_1):bat[:oid,:any_1] address CMDBATsingle; comment Create a BAT with a single elemenet @@ -38395,13 +38391,13 @@ command inet.#tostr():void address INETtoString; comment Convert inet to string equivalent -command io.export(b:bat[:oid,:any_2],filepath:str):bit +command io.export(b:bat[:oid,:any_2],filepath:str):void address IOexport; comment Export a BAT as ASCII to a file. If the 'filepath' is not absolute, it is put into the $DBPATH directory. Success of failure is indicated. -command io.import(b:bat[:oid,:any_2],filepath:str):bat[:oid,:any_2] +command io.import(b:bat[:oid,:any_2],filepath:str):void address IOimport; -comment Import a BAT from an ASCII dump. The new tuples are *inserted* into the parameter BAT. You have to create it! Its signature must match the dump, else parsing errors will occur and FALSE is returned. +comment Import a BAT from an ASCII dump. The tuples are appended to the first argument. Its signature must match the dump, else parsing errors will occur as an exception. pattern io.printf(filep:streams,fmt:str):void address IOprintfStream; @@ -39755,12 +39751,6 @@ comment Alias removal optimizer pattern optimizer.aliases():str address OPTwrapper; -pattern optimizer.accumulators(mod:str,fcn:str):str -address OPTwrapper; -comment Replace calculations with accumulator model - -pattern optimizer.accumulators():str -address OPTwrapper; pattern optimizer.clrDebug():void address QOTclrdebugOptimizers; pattern optimizer.crackers(mod:str,fcn:str):str @@ -40175,7 +40165,7 @@ pattern remote.batbincopy():bat[:oid,:an address RMTbincopyfrom; comment store the binary BAT data in the BBP and return as BAT -pattern remote.batbincopy(b:BAT):void +pattern remote.batbincopy(b:bat[:oid,:any]):void address RMTbincopyto; comment dump BAT b in binary form to the stream diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -2839,11 +2839,11 @@ command algebra.join(left:bat[:oid,:any_ address ALGjoin2; comment Returns 2 columns with all BUNs, consisting of the head-oids from 'left' and 'right' for which there are BUNs in 'left' and 'right' with equal tails -pattern algebra.leftfetchjoinPath(l:bat[:any,:any]...):bat[:any,:any] +pattern algebra.leftfetchjoinPath(l:bat[:oid,:any]...):bat[:oid,:any] address ALGjoinPath; comment Routine to handle join paths. The type analysis is rather tricky. -pattern algebra.leftjoinPath(l:bat[:any,:any]...):bat[:oid,:any] +pattern algebra.leftjoinPath(l:bat[:oid,:any]...):bat[:oid,:any] address ALGjoinPath; comment Routine to handle join paths. The type analysis is rather tricky. @@ -2893,7 +2893,7 @@ command algebra.reuse(b:bat[:oid,:any_1] address ALGreuse; comment Reuse a temporary BAT if you can. Otherwise, allocate enough storage to accept result of an operation (not involving the heap) -pattern algebra.semijoinPath(l:bat[:any,:any]...):bat[:any,:any] +pattern algebra.semijoinPath(l:bat[:oid,:any]...):bat[:oid,:any] address ALGjoinPath; comment Routine to handle join paths. The type analysis is rather tricky. @@ -40304,7 +40304,7 @@ command bat.mergecand(a:bat[:oid,:oid],b address BKCmergecand; comment Merge two candidate lists into one -command bat.mirror(b:bat[:any_1,:any_2]):bat[:any_1,:any_1] +command bat.mirror(b:bat[:oid,:any_2]):bat[:oid,:oid] address BKCmirror; comment Returns the head-mirror image of a BAT (two head columns). @@ -40370,10 +40370,6 @@ command bat.replace(b:bat[:oid,:any_1],h address BKCbun_inplace; comment Replace the tail value of one BUN that has some head value. -command bat.reverse(b:bat[:any_1,:any_2]):bat[:any_2,:any_1] -address BKCreverse; -comment Returns the reverse view of a BAT (head is tail and tail is head). BEWARE no copying is involved; input and output refer to the same object! - pattern bat.single(val:any_1):bat[:oid,:any_1] address CMDBATsingle; comment Create a BAT with a single elemenet @@ -49310,13 +49306,13 @@ command inet.#tostr():void address INETtoString; comment Convert inet to string equivalent -command io.export(b:bat[:oid,:any_2],filepath:str):bit +command io.export(b:bat[:oid,:any_2],filepath:str):void address IOexport; comment Export a BAT as ASCII to a file. If the 'filepath' is not absolute, it is put into the $DBPATH directory. Success of failure is indicated. -command io.import(b:bat[:oid,:any_2],filepath:str):bat[:oid,:any_2] +command io.import(b:bat[:oid,:any_2],filepath:str):void address IOimport; -comment Import a BAT from an ASCII dump. The new tuples are *inserted* into the parameter BAT. You have to create it! Its signature must match the dump, else parsing errors will occur and FALSE is returned. +comment Import a BAT from an ASCII dump. The tuples are appended to the first argument. Its signature must match the dump, else parsing errors will occur as an exception. pattern io.printf(filep:streams,fmt:str):void address IOprintfStream; @@ -50686,12 +50682,6 @@ comment Alias removal optimizer pattern optimizer.aliases():str address OPTwrapper; -pattern optimizer.accumulators(mod:str,fcn:str):str -address OPTwrapper; -comment Replace calculations with accumulator model - -pattern optimizer.accumulators():str -address OPTwrapper; pattern optimizer.clrDebug():void address QOTclrdebugOptimizers; pattern optimizer.crackers(mod:str,fcn:str):str @@ -51106,7 +51096,7 @@ pattern remote.batbincopy():bat[:oid,:an address RMTbincopyfrom; comment store the binary BAT data in the BBP and return as BAT -pattern remote.batbincopy(b:BAT):void +pattern remote.batbincopy(b:bat[:oid,:any]):void address RMTbincopyto; comment dump BAT b in binary form to the stream diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -2108,7 +2108,6 @@ str deleteRef; void deleteSymbol(Module scope, Symbol prg); int deletesProp; str deltaRef; -str dense_rank_grpRef; str depositRef; void deriveModule(Module scope, str nme); malType destinationType(MalBlkPtr mb, InstrPtr p); @@ -2345,7 +2344,6 @@ void mal_unquote(char *msg); str manifoldRef; str mapiRef; str markRef; -str mark_grpRef; str matRef; str maxRef; str max_no_nilRef; @@ -2502,8 +2500,6 @@ str putName(const char *nme, size_t len) str putRef; str queryRef; str querylogRef; -str rankRef; -str rank_grpRef; str rapiRef; int readConsole(Client cntxt); MalStkPtr reallocGlobalStack(MalStkPtr s, int cnt); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
