Changeset: 1ad8e1e1127c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1ad8e1e1127c Modified Files: clients/Tests/exports.stable.out sql/test/bugs/Tests/in.stable.out Branch: sq2default Log Message:
approved output diffs (truncated from 603 to 300 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 @@ -106,7 +106,6 @@ dbl BATcalcvariance_population(dbl *avgp dbl BATcalcvariance_sample(dbl *avgp, BAT *b); BAT *BATcalcxor(BAT *b1, BAT *b2, BAT *s); BAT *BATcalcxorcst(BAT *b, const ValRecord *v, BAT *s); -bool BATcandcontains(BAT *s, oid o); bool BATcheckorderidx(BAT *b); gdk_return BATclear(BAT *b, bool force); void BATcommit(BAT *b); @@ -122,7 +121,7 @@ void BATfakeCommit(BAT *b); gdk_return BATfirstn(BAT **topn, BAT **gids, BAT *b, BAT *cands, BAT *grps, BUN n, bool asc, bool nilslast, bool distinct) __attribute__((__warn_unused_result__)); restrict_t BATgetaccess(BAT *b); gdk_return BATgroup(BAT **groups, BAT **extents, BAT **histo, BAT *b, BAT *s, BAT *g, BAT *e, BAT *h) __attribute__((__warn_unused_result__)); -const char *BATgroupaggrinit(BAT *b, BAT *g, BAT *e, BAT *s, oid *minp, oid *maxp, BUN *ngrpp, BUN *startp, BUN *endp, const oid **candp, const oid **candendp); +const char *BATgroupaggrinit(BAT *b, BAT *g, BAT *e, BAT *s, oid *minp, oid *maxp, BUN *ngrpp, struct canditer *ci, BUN *ncand); gdk_return BATgroupavg(BAT **bnp, BAT **cntsp, BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils, bool abort_on_error, int scale); BAT *BATgroupcount(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils, bool abort_on_error); BAT *BATgroupmax(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils, bool abort_on_error); @@ -156,11 +155,12 @@ void *BATmin(BAT *b, void *aggr); void *BATmin_skipnil(BAT *b, void *aggr, bit skipnil); gdk_return BATmode(BAT *b, bool transient); void BATmsync(BAT *b); +gdk_return BATnegcands(BAT *cands, BAT *odels); 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); @@ -395,6 +395,17 @@ ssize_t bitToStr(str *dst, size_t *len, ssize_t bteFromStr(const char *src, size_t *len, bte **dst, bool external); ssize_t bteToStr(str *dst, size_t *len, const bte *src, bool external); const bte bte_nil; +oid canditer_idx(struct canditer *ci, BUN p); +BUN canditer_init(struct canditer *ci, BAT *b, BAT *s); +oid canditer_last(struct canditer *ci); +oid canditer_peek(struct canditer *ci); +oid canditer_peekprev(struct canditer *ci); +oid canditer_prev(struct canditer *ci); +void canditer_reset(struct canditer *ci); +BUN canditer_search(struct canditer *ci, oid o, bool next); +void canditer_setidx(struct canditer *ci, BUN p); +BAT *canditer_slice(struct canditer *ci, BUN lo, BUN hi); +BAT *canditer_slice2(struct canditer *ci, BUN lo1, BUN hi1, BUN lo2, BUN hi2); int closedir(DIR *dir); ssize_t dblFromStr(const char *src, size_t *len, dbl **dst, bool external); ssize_t dblToStr(str *dst, size_t *len, const dbl *src, bool external); @@ -717,7 +728,9 @@ str ALGfirstn(Client cntxt, MalBlkPtr mb str ALGgroupby(bat *res, const bat *gids, const bat *cnts); str ALGintersect(bat *r1, const bat *lid, const bat *rid, const bat *slid, const bat *srid, const bit *nil_matches, const lng *estimate); str ALGjoin(bat *r1, bat *r2, const bat *l, const bat *r, const bat *sl, const bat *sr, const bit *nil_matches, const lng *estimate); +str ALGjoin1(bat *r1, const bat *l, const bat *r, const bat *sl, const bat *sr, const bit *nil_matches, const lng *estimate); str ALGleftjoin(bat *r1, bat *r2, const bat *l, const bat *r, const bat *sl, const bat *sr, const bit *nil_matches, const lng *estimate); +str ALGleftjoin1(bat *r1, const bat *l, const bat *r, const bat *sl, const bat *sr, const bit *nil_matches, const lng *estimate); str ALGmaxany(ptr result, const bat *bid); str ALGmaxany_skipnil(ptr result, const bat *bid, const bit *skipnil); str ALGminany(ptr result, const bat *bid); @@ -911,14 +924,16 @@ str CLTchangeUsername(Client cntxt, MalB str CLTcheckPermission(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTgetClientId(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTgetPasswordHash(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str CLTgetProfile(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTgetScenario(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CLTgetTimeout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTgetUsername(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTgetUsers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTmd5sum(str *ret, str *pw); +str CLTqueryTimeout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTquit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTremoveUser(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTripemd160sum(str *ret, str *pw); +str CLTsessionTimeout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTsessions(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTsetListing(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTsetPassword(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -926,10 +941,14 @@ str CLTsetPrintTimeout(void *ret, int *s str CLTsetScenario(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTsetSessionTimeout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTsetTimeout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str CLTsetmemorylimit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str CLTsetoptimizer(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str CLTsetworkerlimit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTsha1sum(str *ret, str *pw); str CLTsha2sum(str *ret, str *pw, int *bits); str CLTshutdown(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTstop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str CLTstopSession(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTsuspend(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTwakeup(void *ret, int *id); str CMDBATimprints(void *ret, bat *bid); @@ -1001,8 +1020,8 @@ str CMDcalcavg(Client cntxt, MalBlkPtr m str CMDcallBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDcallFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDcallString(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDcleanupTraces(void *res); -str CMDcloseProfilerStream(void *res); +str CMDcleanupTraces(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +str CMDcloseProfilerStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDconvert_bit(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDconvert_bte(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDconvert_dbl(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -1032,7 +1051,7 @@ str CMDgetDiskReads(lng *ret); str CMDgetDiskWrites(lng *ret); str CMDgetPageSize(int *ret); str CMDgetSystemTime(lng *ret); -str CMDgetTrace(bat *res, str *ev); +str CMDgetTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDgetUserTime(lng *ret); str CMDgetprofilerlimit(int *res); str CMDifthen(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -1151,11 +1170,9 @@ str CMDsetHeartbeat(void *res, int *ev); str CMDsetName(str *rname, const bat *b, str *name); str CMDsetprofilerlimit(void *res, int *lim); str CMDstartProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDstartTrace(void *res); -str CMDstartTracePath(void *res, str *path); +str CMDstartTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDstopProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str CMDstopTrace(void *res); -str CMDstopTracePath(void *res, str *path); +str CMDstopTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CMDstr2qgrams(bat *ret, str *val); str CMDstrlength(int *ret, str *v); str CMDvarABS(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -1206,13 +1223,19 @@ str FCTgetPlants(bat *ret, bat *ret2); str FCTshutdown(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str GROUPmulticolumngroup(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str GRPgroup1(bat *ngid, bat *next, bat *nhis, const bat *bid); +str GRPgroup11(bat *ngid, const bat *bid); str GRPgroup2(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *sid); +str GRPgroup21(bat *ngid, const bat *bid, const bat *sid); str GRPgroup3(bat *ngid, bat *next, const bat *bid); str GRPgroup4(bat *ngid, bat *next, const bat *bid, const bat *sid); str GRPsubgroup2(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *gid); +str GRPsubgroup21(bat *ngid, const bat *bid, const bat *gid); str GRPsubgroup3(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *sid, const bat *gid); +str GRPsubgroup31(bat *ngid, const bat *bid, const bat *sid, const bat *gid); str GRPsubgroup4(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *gid, const bat *eid, const bat *hid); +str GRPsubgroup41(bat *ngid, const bat *bid, const bat *gid, const bat *eid, const bat *hid); str GRPsubgroup5(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *sid, const bat *gid, const bat *eid, const bat *hid); +str GRPsubgroup51(bat *ngid, const bat *bid, const bat *sid, const bat *gid, const bat *eid, const bat *hid); str GRPsubgroup6(bat *ngid, bat *next, const bat *bid, const bat *gid); str GRPsubgroup7(bat *ngid, bat *next, const bat *bid, const bat *sid, const bat *gid); str GRPsubgroup8(bat *ngid, bat *next, const bat *bid, const bat *gid, const bat *eid, const bat *hid); @@ -1289,7 +1312,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); @@ -1332,7 +1355,7 @@ str LIKEjoin(bat *r1, bat *r2, const bat str LIKEjoin1(bat *r1, bat *r2, const bat *lid, const bat *rid, const bat *slid, const bat *srid, const bit *nil_matches, const lng *estimate); str MACROprocessor(Client cntxt, MalBlkPtr mb, Symbol t); int MAL_MAXCLIENTS; -int MALadmission(lng argclaim, lng hotclaim); +int MALadmission(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, lng argclaim); str MALassertBit(void *ret, bit *val, str *msg); str MALassertHge(void *ret, hge *val, str *msg); str MALassertInt(void *ret, int *val, str *msg); @@ -1343,6 +1366,7 @@ str MALassertStr(void *ret, str *val, st str MALassertTriple(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MALcallback(Client c, str msg); int MALcommentsOnly(MalBlkPtr mb); +lng MALdebug; str MALengine(Client c); str MALexitClient(Client c); str MALgarbagesink(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -1352,8 +1376,6 @@ str MALparser(Client c); str MALpass(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MALpipeline(Client c); str MALreader(Client c); -void MALresourceFairness(lng usec); -size_t MALrunningThreads(void); str MALstartDataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MANIFOLDevaluate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str MANIFOLDremapMultiplex(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); @@ -1443,13 +1465,16 @@ str MDBStkDepth(Client cntxt, MalBlkPtr str MDBStkTrace(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p); str MDBdummy(int *ret); str MDBdump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str MDBgetDebug(int *ret); +str MDBgetDebug(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); +str MDBgetDebugFlags(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); +str MDBgetDebugStr(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MDBgetDefinition(Client cntxt, MalBlkPtr m, MalStkPtr stk, InstrPtr p); str MDBgetExceptionContext(str *ret, str *msg); str MDBgetExceptionReason(str *ret, str *msg); str MDBgetExceptionVariable(str *ret, str *msg); str MDBgetStackFrame(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p); str MDBgetStackFrameN(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p); +str MDBgetVMsize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MDBinspect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MDBlist(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MDBlist3(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); @@ -1457,9 +1482,10 @@ str MDBlist3Detail(Client cntxt, MalBlkP str MDBlistDetail(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MDBlistMapi(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MDBsetCatch(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -str MDBsetDebug(int *ret, int *flg); -str MDBsetDebugStr(int *ret, str *nme); +str MDBsetDebug(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); +str MDBsetDebugStr(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MDBsetTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); +str MDBsetVMsize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MDBsetVarTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MDBstart(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str MDBstartFactory(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); @@ -1591,6 +1617,7 @@ str OPTconstantsImplementation(Client cn str OPTcostModelImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str OPTdataflowImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str OPTdeadcodeImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +lng OPTdebug; str OPTemptybindImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str OPTevaluateImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str OPTgarbageCollectorImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -1651,6 +1678,7 @@ str QLOGappend(Client cntxt, MalBlkPtr m str QLOGcall(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str QLOGcalls(BAT **r); str QLOGcatalog(BAT **r); +str QLOGcontextNaive(void *ret, str *release, str *version, str *revision, str *uri); str QLOGdefineNaive(void *ret, str *qry, str *opt, int *nr); str QLOGdisable(void *ret); str QLOGempty(void *ret); @@ -1846,7 +1874,7 @@ str TKNZRgetLevel(bat *r, int *level); str TKNZRlocate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str TKNZRopen(void *r, str *name); str TKNZRtakeOid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -int TRACEtable(BAT **r); +int TRACEtable(Client cntxt, BAT **r); str TRNglobal_abort(bit *ret); str TRNglobal_commit(bit *ret); str TRNglobal_sync(bit *ret); @@ -2019,13 +2047,13 @@ void chkFlow(MalBlkPtr mb); int chkInstruction(Module s, MalBlkPtr mb, InstrPtr p); void chkProgram(Module s, MalBlkPtr mb); void chkTypes(Module s, MalBlkPtr mb, int silent); -str cleanupTraces(void); +str cleanupTraces(Client cntxt); void clearStack(MalStkPtr s); -void clearTrace(void); +void clearTrace(Client cntxt); void clearVariable(MalBlkPtr mb, int varid); str clear_tableRef; int cloneVariable(MalBlkPtr dst, MalBlkPtr src, int varid); -str closeProfilerStream(void); +str closeProfilerStream(Client cntxt); str closeRef; void clrDeclarations(MalBlkPtr mb); void clrFunction(InstrPtr p); @@ -2040,6 +2068,7 @@ str compileAllOptimizers(Client cntxt); str compileOptimizer(Client cntxt, const char *name); str compileString(Symbol *fcn, Client c, str s); str connectRef; +str contextRef; str convertConstant(malType type, ValPtr vr); InstrPtr copyInstruction(InstrPtr p); MalBlkPtr copyMalBlk(MalBlkPtr mb); @@ -2118,7 +2147,6 @@ str drop_triggerRef; str drop_typeRef; str drop_userRef; str drop_viewRef; -void dumpExceptionsToStream(stream *out, str msg); void dumpModules(stream *out); str emptybindRef; str emptybindidxRef; @@ -2201,7 +2229,7 @@ str getScenarioLanguage(Client c); int getShtConstant(MalBlkPtr mb, sht val); int getStrConstant(MalBlkPtr mb, str val); lng getSystemTime(void); -BAT *getTrace(const char *ev); +BAT *getTrace(Client cntxt, const char *nme); str getTraceRef; malType getType(MalBlkPtr mb, str nme); str getTypeIdentifier(malType tpe); @@ -2235,7 +2263,6 @@ void initNamespace(void); void initParser(void); void initProfiler(void); str initQlog(void); -int initTrace(void); int inlineMALblock(MalBlkPtr mb, int pc, MalBlkPtr mc); str inplaceRef; void insertSymbol(Module scope, Symbol prg); @@ -2244,7 +2271,6 @@ str intRef; str intersectRef; str intersectcandRef; str ioRef; -str io_stderr(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str io_stdin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str io_stdout(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int isBlocking(InstrPtr p); @@ -2325,6 +2351,7 @@ MT_Lock mal_remoteLock; void mal_resource_reset(void) __attribute__((__visibility__("hidden"))); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list