Changeset: 5c216563c22f for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/5c216563c22f Modified Files: clients/Tests/exports.stable.out Branch: resource_management Log Message:
approve test diffs (265 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 @@ -3,13 +3,13 @@ int ALIGNsynced(BAT *b1, BAT *b2); int ATOMallocate(const char *nme); void *ATOMdup(int id, const void *val); uint8_t ATOMelmshift(int sz) __attribute__((__const__)); -char *ATOMformat(int id, const void *val) __attribute__((__warn_unused_result__)); +char *ATOMformat(allocator *ma, int id, const void *val) __attribute__((__warn_unused_result__)); gdk_return ATOMheap(int id, Heap *hp, size_t cap) __attribute__((__warn_unused_result__)); int ATOMindex(const char *nme); size_t ATOMlen(int id, const void *v); const char *ATOMname(int id); void *ATOMnil(int id) __attribute__((__malloc__)); -int ATOMprint(int id, const void *val, stream *fd); +int ATOMprint(allocator *ma, int id, const void *val, stream *fd); BAT *BATall_grp(BAT *l, BAT *g, BAT *e, BAT *s); BAT *BATallnotequal_grp(BAT *l, BAT *r, BAT *g, BAT *e, BAT *s); BAT *BATallnotequal_grp2(BAT *l, BAT *r, BAT *rid, BAT *g, BAT *e, BAT *s); @@ -113,7 +113,7 @@ bool BATcheckorderidx(BAT *b); gdk_return BATclear(BAT *b, bool force); void BATcommit(BAT *b, BUN size); BAT *BATconstant(oid hseq, int tt, const void *val, BUN cnt, role_t role); -BAT *BATconvert(BAT *b, BAT *s, int tp, uint8_t scale1, uint8_t scale2, uint8_t precision); +BAT *BATconvert(allocator *ma, BAT *b, BAT *s, int tp, uint8_t scale1, uint8_t scale2, uint8_t precision); BUN BATcount_no_nil(BAT *b, BAT *s); gdk_return BATdel(BAT *b, BAT *d) __attribute__((__warn_unused_result__)); BAT *BATdense(oid hseq, oid tseq, BUN cnt) __attribute__((__warn_unused_result__)); @@ -127,27 +127,27 @@ ValPtr BATgetprop(BAT *b, enum prop_t id ValPtr BATgetprop_nolock(BAT *b, enum prop_t idx); gdk_return BATgroup(BAT **groups, BAT **extents, BAT **histo, BAT *b, BAT *s, BAT *g, BAT *e, BAT *h) __attribute__((__access__(write_only, 1))) __attribute__((__access__(write_only, 2))) __attribute__((__access__(write_only, 3))) __attribute__((__warn_unused_result__)); const char *BATgroupaggrinit(BAT *b, BAT *g, BAT *e, BAT *s, oid *minp, oid *maxp, BUN *ngrpp, struct canditer *ci); -gdk_return BATgroupavg(BAT **bnp, BAT **cntsp, BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils, int scale); -gdk_return BATgroupavg3(BAT **avgp, BAT **remp, BAT **cntp, BAT *b, BAT *g, BAT *e, BAT *s, bool skip_nils); -BAT *BATgroupavg3combine(BAT *avg, BAT *rem, BAT *cnt, BAT *g, BAT *e, bool skip_nils); +gdk_return BATgroupavg(allocator *ma, BAT **bnp, BAT **cntsp, BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils, int scale); +gdk_return BATgroupavg3(allocator *, BAT **avgp, BAT **remp, BAT **cntp, BAT *b, BAT *g, BAT *e, BAT *s, bool skip_nils); +BAT *BATgroupavg3combine(allocator *, BAT *avg, BAT *rem, BAT *cnt, BAT *g, BAT *e, bool skip_nils); BAT *BATgroupcorrelation(BAT *b1, BAT *b2, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); -BAT *BATgroupcount(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); +BAT *BATgroupcount(allocator *ma, BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); BAT *BATgroupcovariance_population(BAT *b1, BAT *b2, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); BAT *BATgroupcovariance_sample(BAT *b1, BAT *b2, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); BAT *BATgroupedfirstn(BUN n, BAT *s, BAT *g, int nbats, BAT **bats, bool *asc, bool *nilslast) __attribute__((__warn_unused_result__)); -BAT *BATgroupmax(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); -BAT *BATgroupmedian(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); -BAT *BATgroupmedian_avg(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); -BAT *BATgroupmin(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); -BAT *BATgroupprod(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); -BAT *BATgroupquantile(BAT *b, BAT *g, BAT *e, BAT *s, int tp, double quantile, bool skip_nils); -BAT *BATgroupquantile_avg(BAT *b, BAT *g, BAT *e, BAT *s, int tp, double quantile, bool skip_nils); -BAT *BATgroupstdev_population(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); -BAT *BATgroupstdev_sample(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); +BAT *BATgroupmax(allocator *ma, BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); +BAT *BATgroupmedian(allocator *ma, BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); +BAT *BATgroupmedian_avg(allocator *ma, BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); +BAT *BATgroupmin(allocator *ma, BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); +BAT *BATgroupprod(allocator *ma, BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); +BAT *BATgroupquantile(allocator *ma, BAT *b, BAT *g, BAT *e, BAT *s, int tp, double quantile, bool skip_nils); +BAT *BATgroupquantile_avg(allocator *ma, BAT *b, BAT *g, BAT *e, BAT *s, int tp, double quantile, bool skip_nils); +BAT *BATgroupstdev_population(allocator *ma, BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); +BAT *BATgroupstdev_sample(allocator *ma, BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); BAT *BATgroupstr_group_concat(allocator *alloc, BAT *b, BAT *g, BAT *e, BAT *s, BAT *sep, bool skip_nils, const char *restrict separator); -BAT *BATgroupsum(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); -BAT *BATgroupvariance_population(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); -BAT *BATgroupvariance_sample(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); +BAT *BATgroupsum(allocator *ma, BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); +BAT *BATgroupvariance_population(allocator *ma, BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); +BAT *BATgroupvariance_sample(allocator *ma, BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); BUN BATgrows(BAT *b); BUN BATguess_uniques(BAT *b, struct canditer *ci); gdk_return BAThash(BAT *b); @@ -173,8 +173,8 @@ bool BATordered_rev(BAT *b); gdk_return BATorderidx(BAT *b, bool stable); gdk_return BAToutercross(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, bool max_one) __attribute__((__access__(write_only, 1))) __attribute__((__access__(write_only, 2))) __attribute__((__warn_unused_result__)); gdk_return BATouterjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, bool nil_matches, bool match_one, BUN estimate) __attribute__((__access__(write_only, 1))) __attribute__((__access__(write_only, 2))) __attribute__((__warn_unused_result__)); -gdk_return BATprint(stream *s, BAT *b); -gdk_return BATprintcolumns(stream *s, int argc, BAT *argv[]); +gdk_return BATprint(allocator *ma, stream *s, BAT *b); +gdk_return BATprintcolumns(allocator *ma, stream *s, int argc, BAT *argv[]); gdk_return BATprod(void *res, int tp, BAT *b, BAT *s, bool skip_nils, bool nil_if_empty); BAT *BATproject(BAT *restrict l, BAT *restrict r); BAT *BATproject2(BAT *restrict l, BAT *restrict r1, BAT *restrict r2); @@ -398,8 +398,8 @@ void MT_thread_setworking(const char *wo void *MT_tls_get(MT_TLS_t key); void MT_tls_set(MT_TLS_t key, void *val); void OIDXdestroy(BAT *b); -ssize_t OIDfromStr(const char *src, size_t *len, oid **dst, bool external); -ssize_t OIDtoStr(str *dst, size_t *len, const oid *src, bool external); +ssize_t OIDfromStr(allocator *ma, const char *src, size_t *len, oid **dst, bool external); +ssize_t OIDtoStr(allocator *ma, str *dst, size_t *len, const oid *src, bool external); BUN ORDERfnd(BAT *b, Heap *oidxh, const void *v); BUN ORDERfndfirst(BAT *b, Heap *oidxh, const void *v); BUN ORDERfndlast(BAT *b, Heap *oidxh, const void *v); @@ -421,7 +421,7 @@ int VALcmp(const ValRecord *p, const Val void *VALconvert(allocator *ma, int typ, ValPtr t); ValPtr VALcopy(allocator *va, ValPtr dst, const ValRecord *src) __attribute__((__access__(write_only, 1))); void VALempty(ValPtr v) __attribute__((__access__(write_only, 1))); -char *VALformat(const ValRecord *res) __attribute__((__warn_unused_result__)); +char *VALformat(allocator *ma, const ValRecord *res) __attribute__((__warn_unused_result__)); void *VALget(ValPtr v); ValPtr VALinit(allocator *va, ValPtr d, int tpe, const void *s) __attribute__((__access__(write_only, 1))); bool VALisnil(const ValRecord *v); @@ -463,11 +463,11 @@ const union _flt_nil_t _flt_nil_; allocator *allocator_get_parent(const allocator *alloc); bool allocator_tmp_active(const allocator *alloc); char *asctime_r(const struct tm *restrict, char *restrict); -ssize_t bitFromStr(const char *src, size_t *len, bit **dst, bool external); -ssize_t bitToStr(str *dst, size_t *len, const bit *src, bool external); +ssize_t bitFromStr(allocator *ma, const char *src, size_t *len, bit **dst, bool external); +ssize_t bitToStr(allocator *ma, str *dst, size_t *len, const bit *src, bool external); size_t blobsize(size_t nitems) __attribute__((__const__)); -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); +ssize_t bteFromStr(allocator *ma, const char *src, size_t *len, bte **dst, bool external); +ssize_t bteToStr(allocator *ma, str *dst, size_t *len, const bte *src, bool external); const bte bte_nil; oid canditer_idx(const struct canditer *ci, BUN p) __attribute__((__pure__)); void canditer_init(struct canditer *ci, BAT *b, BAT *s) __attribute__((__access__(write_only, 1))); @@ -494,10 +494,10 @@ bte date_dayofweek(date dt) __attribute_ sht date_dayofyear(date dt) __attribute__((__const__)); int date_decade(date dt) __attribute__((__const__)); int date_diff(date d1, date d2) __attribute__((__const__)); -ssize_t date_fromstr(const char *buf, size_t *len, date **d, bool external); +ssize_t date_fromstr(allocator *ma, const char *buf, size_t *len, date **d, bool external); bte date_month(date dt) __attribute__((__const__)); bte date_quarter(date dt) __attribute__((__const__)); -ssize_t date_tostr(str *buf, size_t *len, const date *val, bool external); +ssize_t date_tostr(allocator *ma, str *buf, size_t *len, const date *val, bool external); bte date_usweekofyear(date dt) __attribute__((__const__)); bte date_weekofyear(date dt) __attribute__((__const__)); int date_year(date dt) __attribute__((__const__)); @@ -505,17 +505,17 @@ daytime daytime_add_usec(daytime tm, lng daytime daytime_add_usec_modulo(daytime tm, lng usec) __attribute__((__const__)); daytime daytime_create(int hour, int minute, int second, int usec) __attribute__((__const__)); lng daytime_diff(daytime d1, daytime d2) __attribute__((__const__)); -ssize_t daytime_fromstr(const char *buf, size_t *len, daytime **d, bool external); +ssize_t daytime_fromstr(allocator *ma, const char *buf, size_t *len, daytime **d, bool external); bte daytime_hour(daytime tm) __attribute__((__const__)); bte daytime_min(daytime tm) __attribute__((__const__)); -ssize_t daytime_precision_tostr(str *buf, size_t *len, const daytime dt, int precision, bool external); +ssize_t daytime_precision_tostr(allocator *ma, str *buf, size_t *len, const daytime dt, int precision, bool external); int daytime_sec(daytime tm) __attribute__((__const__)); int daytime_sec_usec(daytime tm) __attribute__((__const__)); -ssize_t daytime_tostr(str *buf, size_t *len, const daytime *val, bool external); -ssize_t daytime_tz_fromstr(const char *buf, size_t *len, daytime **d, bool external); +ssize_t daytime_tostr(allocator *ma, str *buf, size_t *len, const daytime *val, bool external); +ssize_t daytime_tz_fromstr(allocator *ma, const char *buf, size_t *len, daytime **d, bool external); int daytime_usec(daytime tm) __attribute__((__const__)); -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); +ssize_t dblFromStr(allocator *ma, const char *src, size_t *len, dbl **dst, bool external); +ssize_t dblToStr(allocator *ma, str *dst, size_t *len, const dbl *src, bool external); const dbl dbl_nil; int dlclose(void *handle); char *dlerror(void); @@ -525,24 +525,24 @@ void *dlsym(void *handle, const char *na exception_buffer *eb_init(exception_buffer *eb) __attribute__((__access__(write_only, 1))); size_t escapedStr(char *restrict dst, const char *restrict src, size_t dstlen, const char *sep1, const char *sep2, int quote); size_t escapedStrlen(const char *restrict src, const char *sep1, const char *sep2, int quote); -ssize_t fltFromStr(const char *src, size_t *len, flt **dst, bool external); -ssize_t fltToStr(str *dst, size_t *len, const flt *src, bool external); +ssize_t fltFromStr(allocator *ma, const char *src, size_t *len, flt **dst, bool external); +ssize_t fltToStr(allocator *ma, str *dst, size_t *len, const flt *src, bool external); const flt flt_nil; gdk_return gdk_add_callback(const char *name, gdk_callback_func *f, int argc, void *argv[], int interval); gdk_return gdk_remove_callback(const char *, gdk_callback_func *f); bat getBBPsize(void); int gettimeofday(struct timeval *tv, int *ignore_zone); struct tm *gmtime_r(const time_t *restrict, struct tm *restrict); -ssize_t hgeFromStr(const char *src, size_t *len, hge **dst, bool external); -ssize_t hgeToStr(str *dst, size_t *len, const hge *src, bool external); +ssize_t hgeFromStr(allocator *ma, const char *src, size_t *len, hge **dst, bool external); +ssize_t hgeToStr(allocator *ma, str *dst, size_t *len, const hge *src, bool external); const hge hge_nil; const inet4 inet4_nil; const inet6 inet6_nil; -ssize_t intFromStr(const char *src, size_t *len, int **dst, bool external); -ssize_t intToStr(str *dst, size_t *len, const int *src, bool external); +ssize_t intFromStr(allocator *ma, const char *src, size_t *len, int **dst, bool external); +ssize_t intToStr(allocator *ma, str *dst, size_t *len, const int *src, bool external); const int int_nil; -ssize_t lngFromStr(const char *src, size_t *len, lng **dst, bool external); -ssize_t lngToStr(str *dst, size_t *len, const lng *src, bool external); +ssize_t lngFromStr(allocator *ma, const char *src, size_t *len, lng **dst, bool external); +ssize_t lngToStr(allocator *ma, str *dst, size_t *len, const lng *src, bool external); const lng lng_nil; struct tm *localtime_r(const time_t *restrict, struct tm *restrict); gdk_return log_activate(logger *lg); @@ -553,17 +553,17 @@ gdk_return log_bat_persists(logger *lg, gdk_return log_bat_transient(logger *lg, log_id id); lng log_changes(logger *lg); gdk_return log_constant(logger *lg, int type, const void *val, log_id id, lng offset, lng cnt, lng total_cnt); -logger *log_create(int debug, const char *fn, const char *logdir, int version, preversionfix_fptr prefuncp, postversionfix_fptr postfuncp, void *funcdata); +logger *log_create(allocator *ma, int debug, const char *fn, const char *logdir, int version, preversionfix_fptr prefuncp, postversionfix_fptr postfuncp, void *funcdata); gdk_return log_delta(logger *lg, BAT *uid, BAT *uval, log_id id); void log_destroy(logger *lg); log_bid log_find_bat(logger *lg, log_id id); -gdk_return log_flush(logger *lg, ulng saved_id); +gdk_return log_flush(allocator *ma, logger *lg, ulng saved_id); void log_printinfo(logger *lg); int log_sequence(logger *lg, int seq, lng *id); gdk_return log_tend(logger *lg); gdk_return log_tflush(logger *lg, ulng log_file_id, ulng commit_ts); gdk_return log_tsequence(logger *lg, int seq, lng id); -gdk_return log_tstart(logger *lg, bool flushnow, ulng *log_file_id); +gdk_return log_tstart(allocator *ma, logger *lg, bool flushnow, ulng *log_file_id); ATOMIC_TYPE lvl_per_component[]; void *mdlopen(const char *library, int mode); int mo_add_option(opt **Set, int setlen, opt_kind kind, const char *name, const char *value); @@ -573,8 +573,8 @@ void mo_free_options(opt *set, int setle void mo_print_options(opt *set, int setlen); int mo_system_config(opt **Set, int setlen); const oid oid_nil; -ssize_t ptrFromStr(const char *src, size_t *len, ptr **dst, bool external); -ssize_t ptrToStr(str *dst, size_t *len, const ptr *src, bool external); +ssize_t ptrFromStr(allocator *ma, const char *src, size_t *len, ptr **dst, bool external); +ssize_t ptrToStr(allocator *ma, str *dst, size_t *len, const ptr *src, bool external); const ptr ptr_nil; void *sa_alloc(allocator *sa, size_t sz); void sa_close(allocator *sa); @@ -589,12 +589,12 @@ char *sa_strconcat(allocator *sa, const char *sa_strdup(allocator *sa, const char *s); char *sa_strndup(allocator *sa, const char *s, size_t l); void *sa_zalloc(allocator *sa, size_t sz); -ssize_t shtFromStr(const char *src, size_t *len, sht **dst, bool external); -ssize_t shtToStr(str *dst, size_t *len, const sht *src, bool external); +ssize_t shtFromStr(allocator *ma, const char *src, size_t *len, sht **dst, bool external); +ssize_t shtToStr(allocator *ma, str *dst, size_t *len, const sht *src, bool external); const sht sht_nil; -ssize_t sql_daytime_fromstr(const char *buf, daytime *d, long tz_sec, bool tzlocal); -ssize_t sql_timestamp_fromstr(const char *buf, timestamp *d, long tz_sec, bool tzlocal); -ssize_t strFromStr(const char *restrict src, size_t *restrict len, str *restrict dst, bool external); +ssize_t sql_daytime_fromstr(allocator *ma, const char *buf, daytime *d, long tz_sec, bool tzlocal); +ssize_t sql_timestamp_fromstr(allocator *ma, const char *buf, timestamp *d, long tz_sec, bool tzlocal); +ssize_t strFromStr(allocator *ma, const char *restrict src, size_t *restrict len, str *restrict dst, bool external); const char str_nil[2]; int strerror_r(int errnum, char *buf, size_t buflen); timestamp timestamp_add_month(timestamp t, int m) __attribute__((__const__)); @@ -605,12 +605,12 @@ date timestamp_date(timestamp t) __attri daytime timestamp_daytime(timestamp t) __attribute__((__const__)); lng timestamp_diff(timestamp t1, timestamp t2) __attribute__((__const__)); timestamp timestamp_fromdate(date dt) __attribute__((__const__)); -ssize_t timestamp_fromstr(const char *buf, size_t *len, timestamp **d, bool external); +ssize_t timestamp_fromstr(allocator *ma, const char *buf, size_t *len, timestamp **d, bool external); timestamp timestamp_fromtime(time_t timeval) __attribute__((__const__)); timestamp timestamp_fromusec(lng usec) __attribute__((__const__)); -ssize_t timestamp_precision_tostr(str *buf, size_t *len, timestamp val, int precision, bool external); -ssize_t timestamp_tostr(str *buf, size_t *len, const timestamp *val, bool external); -ssize_t timestamp_tz_fromstr(const char *buf, size_t *len, timestamp **ret, bool external); +ssize_t timestamp_precision_tostr(allocator *ma, str *buf, size_t *len, timestamp val, int precision, bool external); +ssize_t timestamp_tostr(allocator *ma, str *buf, size_t *len, const timestamp *val, bool external); +ssize_t timestamp_tz_fromstr(allocator *ma, const char *buf, size_t *len, timestamp **ret, bool external); const timestamp unixepoch; const uuid uuid_nil; gdk_return void_inplace(BAT *b, oid id, const void *val, bool force) __attribute__((__warn_unused_result__)); @@ -815,7 +815,7 @@ BUN SQLload_file(Client cntxt, Tablet *a str TABLETcollect(BAT **bats, Tablet *as); str TABLETcreate_bats(Tablet *as, BUN est); void TABLETdestroy_format(Tablet *as); -int TABLEToutput_file(Tablet *as, BAT *order, stream *s, bstream *in); +int TABLEToutput_file(allocator *ma, Tablet *as, BAT *order, stream *s, bstream *in); int TRACEtable(Client cntxt, BAT **r); int TYPE_xml; int UTF8_strlen(const char *s); _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
