Changeset: c3bd9e6f4d06 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c3bd9e6f4d06 Modified Files: clients/Tests/exports.stable.out Branch: default Log Message:
Approve output diffs (128 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 @@ -1505,6 +1505,7 @@ str JSONpath(json *ret, json *js, str *e 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 JSONresultSet(str *res, bat *u, bat *rev, bat *js); str JSONstr2json(json *ret, str *j); str JSONtext(json *ret, json *js, str *expr); int JSONtoString(str *s, int *len, json src); @@ -1807,6 +1808,7 @@ int OPTgroupsImplementation(Client cntxt int OPTinlineImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); int OPTisAlias(InstrPtr p); int OPTjoinPathImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); +int OPTjsonImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str OPTlegAdvice(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int OPTlegAdviceInternal(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str OPTmacro(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); @@ -2034,31 +2036,27 @@ str QOTshowPlan(Client cntxt, MalBlkPtr void QOTstatisticsExit(void); void QOTupdateStatistics(str nme, int prop, lng val); QueryQueue QRYqueue; +void RECYCLEdump(stream *s); +void RECYCLEdumpDataTrans(stream *s); str RECYCLEdumpQPatWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +void RECYCLEdumpRecyclerPool(stream *s); str RECYCLEdumpWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -int RECYCLEentry(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -str RECYCLEepilogue(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -void RECYCLEexit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p, lng ticks); -str RECYCLEgetAdmission(int *p); -str RECYCLEgetCache(int *p); -bte RECYCLEgetQryCat(int qidx); -str RECYCLEgetReuse(int *p); +lng RECYCLEentry(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p, int pc); +void RECYCLEexit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p, int pc, lng ticks); void RECYCLEinit(void); -void RECYCLEinitQPat(int sz); +void RECYCLEinitRecyclePool(int sz); int RECYCLEinterest(InstrPtr p); -str RECYCLElog(int *d, str *nm); str RECYCLEmonitor(int *d, int *p); int RECYCLEnewQryStat(MalBlkPtr mb); -str RECYCLEprelude(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -void RECYCLEreset(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -str RECYCLEresetCMD(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -str RECYCLEsetAdmission(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); +str RECYCLEreset(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p, int pc); +str RECYCLErunningStat(Client cntxt, MalBlkPtr mb); str RECYCLEsetCache(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -str RECYCLEsetReuse(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); void RECYCLEshutdown(Client cntxt); str RECYCLEshutdownWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -str RECYCLEstart(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str RECYCLEstop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str RECYCLEstart(Client cntxt, MalBlkPtr mb); +str RECYCLEstartWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); +str RECYCLEstop(Client cntxt, MalBlkPtr mb); +str RECYCLEstopWrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str RMTbatload(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str RMTbincopyfrom(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str RMTbincopyto(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -2400,7 +2398,6 @@ str activateCounter(str name); str addOptimizerPipe(Client cntxt, MalBlkPtr mb, str name); str addPipeDefinition(Client cntxt, str name, str pipe); void addtoMalBlkHistory(MalBlkPtr mb, str marker); -int admissionPolicy; str affectedRowsRef; str aggrRef; str alarmRef; @@ -2496,6 +2493,7 @@ str crossRef; int cstToken(Client cntxt, ValPtr val); str datacellRef; str datacyclotronRef; +int dataflowConflict(InstrPtr p); str dataflowRef; int date_fromstr(str buf, int *len, date **d); int date_tostr(str *buf, int *len, date *val); @@ -2712,6 +2710,7 @@ int isUpdateInstruction(InstrPtr p); str iteratorRef; str joinPathRef; str joinRef; +str jsonRef; str kdifferenceRef; int keepProp; str kunionRef; @@ -2787,7 +2786,6 @@ str mark_grpRef; str matRef; str materializeRef; str materializeRef; -aggrFun maxAggr; str maxRef; str max_no_nilRef; void mdbClrBreakRequest(Client cntxt, str name); @@ -2808,7 +2806,6 @@ str mdbTrapClient(Client cntxt, MalBlkPt int memoryclaims; lng memorypool; str mergecandRef; -aggrFun minAggr; str minRef; str min_no_nilRef; str minusRef; @@ -2980,7 +2977,6 @@ str queryRef; str querylogRef; str rankRef; str rank_grpRef; -int rcachePolicy; int readConsole(Client cntxt); MalStkPtr reallocGlobalStack(MalStkPtr s, int cnt); MalStkPtr reallocStack(MalStkPtr s, int cnt); @@ -2989,8 +2985,6 @@ double recycleAlpha; MalBlkPtr recycleBlk; int recycleCacheLimit; int recycleMaxInterest; -lng recycleMemory; -QryPatPtr recycleQPat; str recycleRef; lng recycleSearchTime; lng recycleTime; @@ -3018,7 +3012,6 @@ void resetVarName(MalBlkPtr mb, int i); void resizeMalBlk(MalBlkPtr mb, int maxstmt, int maxvar); int resolveType(int dsttype, int srctype); str resultSetRef; -int reusePolicy; str reuseRef; malType reverseBatType(malType v); str reverseRef; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
