Changeset: bd0ab35fa9da for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bd0ab35fa9da Modified Files: clients/Tests/exports.stable.out Branch: default Log Message:
Approve after 448afdb73926, 6ee937768576, 7cb15cb98fc1, cb3e424bfcc4, 23712fd32936. diffs (55 lines): 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 @@ -1311,7 +1311,6 @@ str CMDscience_bat_cst_pow_flt(int *ret, str CMDsetAllProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc); str CMDsetFilterProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDsetFilterVariable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc); -str CMDsetFootprintFlag(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDsetNoneProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDsetProfilerFile(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDsetProfilerStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -1404,6 +1403,7 @@ str GRPmulticolumngroup(Client cntxt, Ma str GRPsubgroup1(bat *ngid, bat *next, bat *nhis, bat *bid); str GRPsubgroup2(bat *ngid, bat *next, bat *nhis, bat *bid, bat *gid); str GRPsubgroup4(bat *ngid, bat *next, bat *nhis, bat *bid, bat *gid, bat *eid, bat *hid); +double HeartbeatCPUload(void); str IDentifier(str *retval, str *in); int IDfromString(str src, int *len, str *retval); str IDprelude(void); @@ -1489,6 +1489,27 @@ 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 JSONfilterArray(json *ret, json *j, int *index); +str JSONfilterObject(json *ret, json *j, str *pat); +str JSONfilterObjectAll(json *ret, json *j, str *pat); +int JSONfromString(str src, int *len, json *x); +str JSONisarray(int *ret, json *j); +str JSONisobject(int *ret, json *j); +str JSONisvalid(int *ret, json *j); +str JSONjson2str(str *ret, json *j); +str JSONlength(int *ret, json *j); +str JSONnames(int *ret, json *j); +str JSONnest(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str JSONpath(json *ret, json *js, str *expr); +str JSONprelude(int *ret); +str JSONrenderarray(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str JSONrenderobject(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str JSONstr2json(json *ret, str *j); +int JSONtoString(str *s, int *len, json src); +str JSONunnest(int *key, int *val, json *j); +str JSONunnestGrouped(int *grp, int *key, int *val, json *j); +str JSONunnestOne(int *val, json *j); +str JSONvalues(int *ret, json *j); str LCKcreate(monet_lock *l); str LCKdestroy(int *res, monet_lock *l); str LCKset(int *res, monet_lock *l); @@ -2285,6 +2306,7 @@ int TYPE_blob; int TYPE_date; int TYPE_daytime; int TYPE_identifier; +int TYPE_json; int TYPE_rule; int TYPE_sqlblob; int TYPE_timestamp; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list