Changeset: 57bee4687875 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=57bee4687875 Modified Files: clients/Tests/MAL-signatures_all.stable.out clients/Tests/MAL-signatures_all.stable.out.int128 clients/Tests/MAL-signatures_fits_geom.stable.out clients/Tests/MAL-signatures_fits_geom.stable.out.int128 clients/Tests/MAL-signatures_geom.stable.out clients/Tests/MAL-signatures_geom.stable.out.int128 clients/Tests/MAL-signatures_none.stable.out clients/Tests/MAL-signatures_none.stable.out.int128 clients/Tests/exports.stable.out monetdb5/modules/atoms/json.c monetdb5/modules/atoms/json.h monetdb5/modules/atoms/json.mal Branch: default Log Message:
Merged with Oct2014 branch. diffs (truncated from 426 to 300 lines): 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 @@ -39353,23 +39353,23 @@ address JSONfold; comment Combine the key-value pairs into a single json object list. command json.filter(name:json,idx:lng,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_lng; comment Extract a single array element command json.filter(name:json,idx:lng):json -address JSONfilterArray; +address JSONfilterArray_lng; command json.filter(name:json,idx:int,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_int; command json.filter(name:json,idx:int):json -address JSONfilterArray; +address JSONfilterArray_int; command json.filter(name:json,idx:sht,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_sht; command json.filter(name:json,idx:sht):json -address JSONfilterArray; +address JSONfilterArray_sht; command json.filter(name:json,idx:bte,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_bte; command json.filter(name:json,idx:bte):json -address JSONfilterArray; +address JSONfilterArray_bte; command json.filter(name:json,pathexpr:str):json address JSONfilter; comment Filter all members of an object by a path expression, returning an array.Non-matching elements are skipped. diff --git a/clients/Tests/MAL-signatures_all.stable.out.int128 b/clients/Tests/MAL-signatures_all.stable.out.int128 --- a/clients/Tests/MAL-signatures_all.stable.out.int128 +++ b/clients/Tests/MAL-signatures_all.stable.out.int128 @@ -50295,23 +50295,23 @@ address JSONfold; comment Combine the key-value pairs into a single json object list. command json.filter(name:json,idx:lng,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_lng; comment Extract a single array element command json.filter(name:json,idx:lng):json -address JSONfilterArray; +address JSONfilterArray_lng; command json.filter(name:json,idx:int,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_int; command json.filter(name:json,idx:int):json -address JSONfilterArray; +address JSONfilterArray_int; command json.filter(name:json,idx:sht,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_sht; command json.filter(name:json,idx:sht):json -address JSONfilterArray; +address JSONfilterArray_sht; command json.filter(name:json,idx:bte,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_bte; command json.filter(name:json,idx:bte):json -address JSONfilterArray; +address JSONfilterArray_bte; command json.filter(name:json,pathexpr:str):json address JSONfilter; comment Filter all members of an object by a path expression, returning an array.Non-matching elements are skipped. 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 @@ -39269,23 +39269,23 @@ address JSONfold; comment Combine the key-value pairs into a single json object list. command json.filter(name:json,idx:lng,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_lng; comment Extract a single array element command json.filter(name:json,idx:lng):json -address JSONfilterArray; +address JSONfilterArray_lng; command json.filter(name:json,idx:int,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_int; command json.filter(name:json,idx:int):json -address JSONfilterArray; +address JSONfilterArray_int; command json.filter(name:json,idx:sht,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_sht; command json.filter(name:json,idx:sht):json -address JSONfilterArray; +address JSONfilterArray_sht; command json.filter(name:json,idx:bte,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_bte; command json.filter(name:json,idx:bte):json -address JSONfilterArray; +address JSONfilterArray_bte; command json.filter(name:json,pathexpr:str):json address JSONfilter; comment Filter all members of an object by a path expression, returning an array.Non-matching elements are skipped. diff --git a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 --- a/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 +++ b/clients/Tests/MAL-signatures_fits_geom.stable.out.int128 @@ -50211,23 +50211,23 @@ address JSONfold; comment Combine the key-value pairs into a single json object list. command json.filter(name:json,idx:lng,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_lng; comment Extract a single array element command json.filter(name:json,idx:lng):json -address JSONfilterArray; +address JSONfilterArray_lng; command json.filter(name:json,idx:int,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_int; command json.filter(name:json,idx:int):json -address JSONfilterArray; +address JSONfilterArray_int; command json.filter(name:json,idx:sht,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_sht; command json.filter(name:json,idx:sht):json -address JSONfilterArray; +address JSONfilterArray_sht; command json.filter(name:json,idx:bte,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_bte; command json.filter(name:json,idx:bte):json -address JSONfilterArray; +address JSONfilterArray_bte; command json.filter(name:json,pathexpr:str):json address JSONfilter; comment Filter all members of an object by a path expression, returning an array.Non-matching elements are skipped. diff --git a/clients/Tests/MAL-signatures_geom.stable.out b/clients/Tests/MAL-signatures_geom.stable.out --- a/clients/Tests/MAL-signatures_geom.stable.out +++ b/clients/Tests/MAL-signatures_geom.stable.out @@ -39245,23 +39245,23 @@ address JSONfold; comment Combine the key-value pairs into a single json object list. command json.filter(name:json,idx:lng,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_lng; comment Extract a single array element command json.filter(name:json,idx:lng):json -address JSONfilterArray; +address JSONfilterArray_lng; command json.filter(name:json,idx:int,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_int; command json.filter(name:json,idx:int):json -address JSONfilterArray; +address JSONfilterArray_int; command json.filter(name:json,idx:sht,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_sht; command json.filter(name:json,idx:sht):json -address JSONfilterArray; +address JSONfilterArray_sht; command json.filter(name:json,idx:bte,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_bte; command json.filter(name:json,idx:bte):json -address JSONfilterArray; +address JSONfilterArray_bte; command json.filter(name:json,pathexpr:str):json address JSONfilter; comment Filter all members of an object by a path expression, returning an array.Non-matching elements are skipped. diff --git a/clients/Tests/MAL-signatures_geom.stable.out.int128 b/clients/Tests/MAL-signatures_geom.stable.out.int128 --- a/clients/Tests/MAL-signatures_geom.stable.out.int128 +++ b/clients/Tests/MAL-signatures_geom.stable.out.int128 @@ -50187,23 +50187,23 @@ address JSONfold; comment Combine the key-value pairs into a single json object list. command json.filter(name:json,idx:lng,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_lng; comment Extract a single array element command json.filter(name:json,idx:lng):json -address JSONfilterArray; +address JSONfilterArray_lng; command json.filter(name:json,idx:int,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_int; command json.filter(name:json,idx:int):json -address JSONfilterArray; +address JSONfilterArray_int; command json.filter(name:json,idx:sht,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_sht; command json.filter(name:json,idx:sht):json -address JSONfilterArray; +address JSONfilterArray_sht; command json.filter(name:json,idx:bte,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_bte; command json.filter(name:json,idx:bte):json -address JSONfilterArray; +address JSONfilterArray_bte; command json.filter(name:json,pathexpr:str):json address JSONfilter; comment Filter all members of an object by a path expression, returning an array.Non-matching elements are skipped. diff --git a/clients/Tests/MAL-signatures_none.stable.out b/clients/Tests/MAL-signatures_none.stable.out --- a/clients/Tests/MAL-signatures_none.stable.out +++ b/clients/Tests/MAL-signatures_none.stable.out @@ -39074,23 +39074,23 @@ address JSONfold; comment Combine the key-value pairs into a single json object list. command json.filter(name:json,idx:lng,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_lng; comment Extract a single array element command json.filter(name:json,idx:lng):json -address JSONfilterArray; +address JSONfilterArray_lng; command json.filter(name:json,idx:int,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_int; command json.filter(name:json,idx:int):json -address JSONfilterArray; +address JSONfilterArray_int; command json.filter(name:json,idx:sht,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_sht; command json.filter(name:json,idx:sht):json -address JSONfilterArray; +address JSONfilterArray_sht; command json.filter(name:json,idx:bte,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_bte; command json.filter(name:json,idx:bte):json -address JSONfilterArray; +address JSONfilterArray_bte; command json.filter(name:json,pathexpr:str):json address JSONfilter; comment Filter all members of an object by a path expression, returning an array.Non-matching elements are skipped. diff --git a/clients/Tests/MAL-signatures_none.stable.out.int128 b/clients/Tests/MAL-signatures_none.stable.out.int128 --- a/clients/Tests/MAL-signatures_none.stable.out.int128 +++ b/clients/Tests/MAL-signatures_none.stable.out.int128 @@ -50015,23 +50015,23 @@ address JSONfold; comment Combine the key-value pairs into a single json object list. command json.filter(name:json,idx:lng,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_lng; comment Extract a single array element command json.filter(name:json,idx:lng):json -address JSONfilterArray; +address JSONfilterArray_lng; command json.filter(name:json,idx:int,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_int; command json.filter(name:json,idx:int):json -address JSONfilterArray; +address JSONfilterArray_int; command json.filter(name:json,idx:sht,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_sht; command json.filter(name:json,idx:sht):json -address JSONfilterArray; +address JSONfilterArray_sht; command json.filter(name:json,idx:bte,other:str):json -address JSONfilterArrayDefault; +address JSONfilterArrayDefault_bte; command json.filter(name:json,idx:bte):json -address JSONfilterArray; +address JSONfilterArray_bte; command json.filter(name:json,pathexpr:str):json address JSONfilter; comment Filter all members of an object by a path expression, returning an array.Non-matching elements are skipped. 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 @@ -1399,8 +1399,14 @@ str ITRnext_oid(oid *i, oid *step, oid * str ITRnext_sht(sht *i, sht *step, sht *last); str JSONdump(int *ret, json *val); str JSONfilter(json *ret, json *js, str *expr); -str JSONfilterArray(json *ret, json *j, int *index); -str JSONfilterArrayDefault(json *ret, json *j, int *index, str *other); +str JSONfilterArrayDefault_bte(json *ret, json *j, bte *index, str *other); +str JSONfilterArrayDefault_int(json *ret, json *j, int *index, str *other); +str JSONfilterArrayDefault_lng(json *ret, json *j, lng *index, str *other); +str JSONfilterArrayDefault_sht(json *ret, json *j, sht *index, str *other); +str JSONfilterArray_bte(json *ret, json *j, bte *index); +str JSONfilterArray_int(json *ret, json *j, int *index); +str JSONfilterArray_lng(json *ret, json *j, lng *index); +str JSONfilterArray_sht(json *ret, json *j, sht *index); str JSONfold(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int JSONfromString(str src, int *len, json *x); str JSONgroupStr(str *ret, const bat *bid); _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
