Changeset: ccf7a5db2235 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ccf7a5db2235 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out Branch: default Log Message:
Approvals after changeset fd903434188a. diffs (128 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 @@ -38423,22 +38423,10 @@ command inet.#tostr():void address INETtoString; comment Convert inet to string equivalent -command io.data(fname:str):str -address IOdatafile; -comment Signals receipt of tuples in a file fname.It returns the name of the file, if it still exists. - command io.export(b:bat[:oid,:any_2],filepath:str):bit 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. -pattern io.ftable(fp:streams,order:int,b1:bat[:oid,:any],b:bat[:oid,:any]...):void -address IOfotable; -comment Print an n-ary table to a file. - -pattern io.ftable(filep:streams,b1:bat[:oid,:any],b:bat[:oid,:any]...):void -address IOftable; -comment Print an n-ary table to a file. - command io.import(b:bat[:oid,:any_2],filepath:str):bat[:oid,:any_2] 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. @@ -38463,7 +38451,7 @@ pattern io.prompt(val:any_1):void address IOprompt_val; comment Print a MAL value without brackets. -pattern io.print(val:bat[:oid,:any_2]):void +pattern io.print(val:bat[:oid,:any_1]):void address IOprint_val; comment Print a MAL value column . @@ -38471,10 +38459,6 @@ pattern io.print(val:any_1):void address IOprint_val; comment Print a MAL value tuple . -pattern io.print(order:int,b:bat[:oid,:any],b2:bat[:oid,:any]...):void -address IOotable; -comment The same as normal table print, but enforces to use the order of BAT number [1..argc] to do the printing. - pattern io.print(b1:bat[:oid,:any]...):void address IOtable; comment BATs are printed with '#' for legend lines, and the BUNs on seperate lines between brackets, containing each to comma separated values (head and tail). If multiple BATs are passed for printing, print() performs an implicit natural join, producing a multi attribute table. 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 @@ -49342,22 +49342,10 @@ command inet.#tostr():void address INETtoString; comment Convert inet to string equivalent -command io.data(fname:str):str -address IOdatafile; -comment Signals receipt of tuples in a file fname.It returns the name of the file, if it still exists. - command io.export(b:bat[:oid,:any_2],filepath:str):bit 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. -pattern io.ftable(fp:streams,order:int,b1:bat[:oid,:any],b:bat[:oid,:any]...):void -address IOfotable; -comment Print an n-ary table to a file. - -pattern io.ftable(filep:streams,b1:bat[:oid,:any],b:bat[:oid,:any]...):void -address IOftable; -comment Print an n-ary table to a file. - command io.import(b:bat[:oid,:any_2],filepath:str):bat[:oid,:any_2] 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. @@ -49382,7 +49370,7 @@ pattern io.prompt(val:any_1):void address IOprompt_val; comment Print a MAL value without brackets. -pattern io.print(val:bat[:oid,:any_2]):void +pattern io.print(val:bat[:oid,:any_1]):void address IOprint_val; comment Print a MAL value column . @@ -49390,10 +49378,6 @@ pattern io.print(val:any_1):void address IOprint_val; comment Print a MAL value tuple . -pattern io.print(order:int,b:bat[:oid,:any],b2:bat[:oid,:any]...):void -address IOotable; -comment The same as normal table print, but enforces to use the order of BAT number [1..argc] to do the printing. - pattern io.print(b1:bat[:oid,:any]...):void address IOtable; comment BATs are printed with '#' for legend lines, and the BUNs on seperate lines between brackets, containing each to comma separated values (head and tail). If multiple BATs are passed for printing, print() performs an implicit natural join, producing a multi attribute table. @@ -49414,18 +49398,6 @@ pattern io.stdin():bstream address io_stdin; comment return the input stream to the database client -pattern io.table(order:int,b1:bat[:oid,:any],b2:bat[:oid,:any]...):void -address IOtotable; -comment Print an n-ary table. - -pattern io.table(b1:bat[:oid,:any],b2:bat[:oid,:any]...):void -address IOttable; -comment Print an n-ary table. Like print, but does not print oid column - -pattern io.table(b1:bat[:oid,:any]):void -address IOttable; -comment Print an n-ary table. Like print, but does not print oid column - command iterator.filter(name:json,idx:hge,other:str):json address JSONfilterArrayDefault_hge; command iterator.filter(name:json,idx:hge):json 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 @@ -1301,13 +1301,11 @@ str INSPECTtypeName(Client cntxt, MalBlk str IOexport(bit *ret, bat *bid, str *fnme); str IOimport(bat *ret, bat *bid, str *fnme); str IOprintBoth(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int indx, str hd, str tl, int nobat); -str IOprint_tables(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str IOprint_val(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str IOprintf(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str IOprintfStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str IOprompt_val(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str IOtable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str IOtableAll(stream *f, Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int i, int order, int printhead, int printorder); str ITRbunIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str ITRbunNext(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str ITRnewChunk(lng *res, bat *vid, bat *bid, lng *granule); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
