Changeset: a06b929dfc4e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a06b929dfc4e Modified Files: clients/R/Tests/dbi.R clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out clients/nodejs/monetdb/mapiclient.js gdk/ChangeLog gdk/gdk.h gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_logger.c gdk/gdk_setop.c gdk/gdk_storage.c monetdb5/ChangeLog monetdb5/mal/Tests/tst025.mal monetdb5/mal/Tests/tst025.stable.out monetdb5/mal/Tests/tst032.stable.out monetdb5/mal/Tests/tst033.stable.out monetdb5/mal/Tests/tst034.stable.out monetdb5/mal/Tests/tst201.stable.out monetdb5/mal/Tests/tst810.stable.out monetdb5/mal/mal_debugger.c monetdb5/modules/atoms/Makefile.ag monetdb5/modules/atoms/Tests/xml10.mal monetdb5/modules/atoms/Tests/xml10.stable.out monetdb5/modules/atoms/batxml.c monetdb5/modules/atoms/batxml.mal monetdb5/modules/atoms/batxml.sql monetdb5/modules/atoms/xml.sql monetdb5/modules/kernel/Tests/TriBool.malC monetdb5/modules/kernel/Tests/TriBool.stable.out 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/mal/Tests/batpartition.stable.out monetdb5/modules/mal/Tests/inspect05.stable.out.int128 monetdb5/modules/mal/Tests/iterator03.stable.out monetdb5/modules/mal/Tests/mapi01.stable.out monetdb5/modules/mal/Tests/mapi07.stable.out monetdb5/modules/mal/Tests/partition.stable.out monetdb5/modules/mal/Tests/tokenizer00.stable.out monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mal_io.mal monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/mat.c monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out monetdb5/tests/gdkTests/Tests/scanselect.stable.out monetdb5/tests/mapi/Tests/sample3.stable.out sql/backends/monet5/bam/bam_export.c sql/backends/monet5/sql.c sql/backends/monet5/sql_scenario.c sql/server/sql_mvc.c sql/storage/bat/bat_table.c sql/storage/restrict/restrict_table.c sql/test/sql_xml/Tests/funcs.sql testing/Mtest.py.in tools/merovingian/client/monetdb.c Branch: leftmart Log Message:
merge with default diffs (truncated from 3093 to 300 lines): diff --git a/clients/R/Tests/dbi.R b/clients/R/Tests/dbi.R --- a/clients/R/Tests/dbi.R +++ b/clients/R/Tests/dbi.R @@ -90,15 +90,15 @@ dbRemoveTable(con,tname) stopifnot(identical(dbExistsTable(con,tname),FALSE)) # test csv import -file <- tempfile() -write.table(iris,file,sep=",") +tf <- tempfile() +write.table(iris,tf,sep=",",row.names=FALSE) tname2 <- "Need to quote this table name" -monetdb.read.csv(con,file,tname) -monetdb.read.csv(con,file,tname2) +monetdb.read.csv(con,tf,tname) +monetdb.read.csv(con,tf,tname2) ### dbListTables(con) -unlink(file) +unlink(tf) stopifnot(identical(dbExistsTable(con,tname),TRUE)) stopifnot(identical(dbExistsTable(con,tname2),TRUE)) iris3 <- dbReadTable(con,tname) 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 @@ -31313,14 +31313,6 @@ pattern bat.new(ht:oid,tt:any_1):bat[:oi address CMDBATnew; comment Creates a new empty transient BAT, with head- and tail-types as indicated. -command bat.orderReverse(b:bat[:oid,:any_1]):bat[:oid,:any_1] -address BKCorder_rev; -comment Reverse sorts the BAT itself on the head, in place. - -command bat.order(b:bat[:oid,:any_1]):bat[:oid,:any_1] -address BKCorder; -comment Sorts the BAT itself on the head, in place. - pattern bat.partition(b:bat[:oid,:any_1],pieces:int,n:int):bat[:oid,:any_1] address CMDBATpartition2; comment Create the n-th slice over the BAT broken into several pieces. @@ -38423,22 +38415,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,21 +38443,17 @@ 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 . 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. +comment Print a MAL value. 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. +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 on the void head, producing a multi attribute table. pattern io.print(val:any_1,lst:any...):void address IOprint_val; @@ -38495,18 +38471,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.next(step:dbl,last:dbl):dbl address ITRnext_dbl; comment Advances the iterator with a fixed value @@ -41626,18 +41590,6 @@ command xml.aggr(val:bat[:oid,:xml]):xml address BATXMLgroup; comment Aggregate the XML values. -command xml.agg(val:bat[:oid,:xml]):xml -address BATXMLgroup; -comment Aggregate the XML values over groups specified. - -command xml.agg(val:bat[:oid,:xml],grp:bat[:oid,:oid]):bat[:oid,:xml] -address BATXMLagg; -comment Aggregate the XML values over groups specified. - -command xml.agg(val:bat[:oid,:xml],grp:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:xml] -address BATXMLagg3; -comment Aggregate the XML values over groups specified. - command xml.attribute(name:str,val:str):xml address XMLattribute; comment Construct an attribute value pair 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 @@ -40358,14 +40358,6 @@ pattern bat.new(ht:oid,tt:any_1):bat[:oi address CMDBATnew; comment Creates a new empty transient BAT, with head- and tail-types as indicated. -command bat.orderReverse(b:bat[:oid,:any_1]):bat[:oid,:any_1] -address BKCorder_rev; -comment Reverse sorts the BAT itself on the head, in place. - -command bat.order(b:bat[:oid,:any_1]):bat[:oid,:any_1] -address BKCorder; -comment Sorts the BAT itself on the head, in place. - pattern bat.partition(b:bat[:oid,:any_1],pieces:int,n:int):bat[:oid,:any_1] address CMDBATpartition2; comment Create the n-th slice over the BAT broken into several pieces. @@ -49342,22 +49334,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,21 +49362,17 @@ 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 . 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. +comment Print a MAL value. 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. +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 on the void head, producing a multi attribute table. pattern io.print(val:any_1,lst:any...):void address IOprint_val; @@ -49414,18 +49390,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 @@ -52573,18 +52537,6 @@ command xml.aggr(val:bat[:oid,:xml]):xml address BATXMLgroup; comment Aggregate the XML values. -command xml.agg(val:bat[:oid,:xml]):xml -address BATXMLgroup; -comment Aggregate the XML values over groups specified. - -command xml.agg(val:bat[:oid,:xml],grp:bat[:oid,:oid]):bat[:oid,:xml] -address BATXMLagg; -comment Aggregate the XML values over groups specified. - -command xml.agg(val:bat[:oid,:xml],grp:bat[:oid,:oid],e:bat[:oid,:any_1]):bat[:oid,:xml] -address BATXMLagg3; -comment Aggregate the XML values over groups specified. - command xml.attribute(name:str,val:str):xml address XMLattribute; comment Construct an attribute value pair 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 @@ -153,17 +153,14 @@ void *BATmin(BAT *b, void *aggr); void BATmmap(BAT *b, int hb, int tb, int hh, int th, int force); gdk_return BATmode(BAT *b, int onoff); void BATmsync(BAT *b); -gdk_return BATmultiprintf(stream *f, int argc, BAT *argv[], int printoid, int order, int printorderby); int BATname(BAT *b, const char *nme); BAT *BATnew(int hdtype, int tltype, BUN capacity, int role) __attribute__((warn_unused_result)); -gdk_return BATorder(BAT *b); -gdk_return BATorder_rev(BAT *b); int BATordered(BAT *b); int BATordered_rev(BAT *b); BAT *BATouterjoin(BAT *l, BAT *r, BUN estimate); BAT *BATprev(BAT *b); gdk_return BATprint(BAT *b); -gdk_return BATprintcols(stream *s, int argc, BAT *argv[]); +gdk_return BATprintcolumns(stream *s, int argc, BAT *argv[]); gdk_return BATprintf(stream *f, BAT *b); gdk_return BATprod(void *res, int tp, BAT *b, BAT *s, int skip_nils, int abort_on_error, int nil_if_empty); BAT *BATproject(BAT *l, BAT *r); @@ -182,10 +179,6 @@ void BATsetcapacity(BAT *b, BUN cnt); void BATsetcount(BAT *b, BUN cnt); void BATsetprop(BAT *b, int idx, int type, void *v); BAT *BATslice(BAT *b, BUN low, BUN high); -BAT *BATsort(BAT *b); -BAT *BATsort_rev(BAT *b); -BAT *BATssort(BAT *b); -BAT *BATssort_rev(BAT *b); gdk_return BATsubbandjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, const void *c1, const void *c2, int li, int hi, BUN estimate); gdk_return BATsubcross(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr); BAT *BATsubdiff(BAT *l, BAT *r, BAT *sl, BAT *sr, int nil_matches, BUN estimate); @@ -772,8 +765,6 @@ str ALGslice(bat *ret, const bat *bid, c str ALGslice_int(bat *ret, const bat *bid, const int *start, const int *end); str ALGslice_oid(bat *ret, const bat *bid, const oid *start, const oid *end); str ALGslice_wrd(bat *ret, const bat *bid, const wrd *start, const wrd *end); -str ALGssort(bat *result, const bat *bid); -str ALGssort_rev(bat *result, const bat *bid); str ALGstdev(dbl *res, const bat *bid); str ALGstdevp(dbl *res, const bat *bid); str ALGsubbandjoin(bat *r1, bat *r2, const bat *lid, const bat *rid, const bat *slid, const bat *srid, const void *low, const void *high, const bit *li, const bit *hi, const lng *estimate); @@ -809,8 +800,6 @@ str ALGtinter(bat *result, const bat *li str ALGtmark(bat *result, const bat *bid, const oid *base); str ALGtmark_default(bat *result, const bat *bid); str ALGtmarkp(bat *result, const bat *bid, const int *nr_parts, const int *part_nr); -str ALGtsort(bat *result, const bat *bid); -str ALGtsort_rev(bat *result, const bat *bid); str ALGvariance(dbl *res, const bat *bid); str ALGvariancep(dbl *res, const bat *bid); str AUTHaddUser(oid *ret, Client c, str *user, str *pass); @@ -833,8 +822,6 @@ str BATPCREnotilike(bat *ret, const bat str BATPCREnotilike2(bat *ret, const bat *b, const str *pat); str BATPCREnotlike(bat *ret, const bat *b, const str *pat, const str *esc); str BATPCREnotlike2(bat *ret, const bat *b, const str *pat); -str BATXMLagg(bat *ret, const bat *bid, const bat *grp); -str BATXMLagg3(bat *ret, const bat *bid, const bat *grp, const bat *e); str BATXMLattribute(bat *ret, const char *const *name, const bat *bid); str BATXMLcomment(bat *ret, const bat *bid); str BATXMLconcat(bat *ret, const bat *bid, const bat *rid); @@ -889,8 +876,6 @@ str BKCisTransient(bit *res, const bat * str BKCmergecand(bat *ret, const bat *aid, const bat *bid); str BKCmirror(bat *ret, const bat *bid); str BKCnewBAT(bat *res, const int *ht, const int *tt, const BUN *cap, int role); -str BKCorder(bat *ret, const bat *bid); -str BKCorder_rev(bat *ret, const bat *bid); str BKCpersists(void *r, const bat *bid, const bit *flg); str BKCreuseBAT(bat *ret, const bat *bid, const bat *did); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
