Changeset: 4bd393d1b4e8 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4bd393d1b4e8 Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/Tests/exports.stable.out Branch: default Log Message:
Approve output diffs (45 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 @@ -11138,7 +11138,7 @@ stdout of test 'MAL-signatures` in direc [ "iterator", "next", "command iterator.next(step:sht, last:sht):sht ", "ITRnext_sht;", "" ] [ "json", "#fromstr", "command json.#fromstr():void ", "JSONfromString;", "Validate a string to be JSON compliant. A NOOP if valid json, NULL otherwise." ] [ "json", "#tostr", "command json.#tostr():void ", "JSONtoString;", "Convert JSON to its string equivalent. Dealing with escape characters" ] -[ "json", "dump", "command json.dump(j:json):void ", "JSONdump;", "" ] +[ "json", "dump", "pattern json.dump(j:json):void ", "JSONdump;", "" ] [ "json", "filter", "command json.filter(name:json, pathexpr:str):json ", "JSONfilter;", "Filter all members of an object by a path expression, returning an array.\nNon-matching elements are skipped." ] [ "json", "filter", "command json.filter(name:json, idx:bte, other:str):json ", "JSONfilterArrayDefault_bte;", "" ] [ "json", "filter", "command json.filter(name:json, idx:int, other:str):json ", "JSONfilterArrayDefault_int;", "" ] 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 @@ -15539,7 +15539,7 @@ stdout of test 'MAL-signatures` in direc [ "iterator", "next", "command iterator.next(step:sht, last:sht):sht ", "ITRnext_sht;", "" ] [ "json", "#fromstr", "command json.#fromstr():void ", "JSONfromString;", "Validate a string to be JSON compliant. A NOOP if valid json, NULL otherwise." ] [ "json", "#tostr", "command json.#tostr():void ", "JSONtoString;", "Convert JSON to its string equivalent. Dealing with escape characters" ] -[ "json", "dump", "command json.dump(j:json):void ", "JSONdump;", "" ] +[ "json", "dump", "pattern json.dump(j:json):void ", "JSONdump;", "" ] [ "json", "filter", "command json.filter(name:json, pathexpr:str):json ", "JSONfilter;", "Filter all members of an object by a path expression, returning an array.\nNon-matching elements are skipped." ] [ "json", "filter", "command json.filter(name:json, idx:bte, other:str):json ", "JSONfilterArrayDefault_bte;", "" ] [ "json", "filter", "command json.filter(name:json, idx:int, other:str):json ", "JSONfilterArrayDefault_int;", "" ] 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 @@ -161,7 +161,7 @@ bool BATordered(BAT *b); bool BATordered_rev(BAT *b); gdk_return BATorderidx(BAT *b, bool stable); gdk_return BATouterjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, bool nil_matches, BUN estimate) __attribute__((__warn_unused_result__)); -gdk_return BATprint(BAT *b); +gdk_return BATprint(stream *s, BAT *b); gdk_return BATprintcolumns(stream *s, int argc, BAT *argv[]); gdk_return BATprod(void *res, int tp, BAT *b, BAT *s, bool skip_nils, bool abort_on_error, bool nil_if_empty); BAT *BATproject(BAT *l, BAT *r); @@ -1300,7 +1300,7 @@ str ITRnext_int(int *i, int *step, int * str ITRnext_lng(lng *i, lng *step, lng *last); str ITRnext_oid(oid *i, oid *step, oid *last); str ITRnext_sht(sht *i, sht *step, sht *last); -str JSONdump(void *ret, json *val); +str JSONdump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str JSONfilter(json *ret, json *js, str *expr); str JSONfilterArrayDefault_bte(json *ret, json *j, bte *index, str *other); str JSONfilterArrayDefault_hge(json *ret, json *j, hge *index, str *other); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
