Changeset: 942bd9104036 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/942bd9104036 Modified Files: clients/Tests/exports.stable.out Branch: pp_hashjoin Log Message:
approved output diffs (51 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 @@ -900,6 +900,8 @@ const char copy_fromRef[]; const char corrRef[]; const char countRef[]; const char count_no_nilRef[]; +void counter_next(Sink *s); +void counter_wait(Sink *s, int nr, Pipeline *p); int cpyConstant(MalBlkPtr mb, VarPtr vr); str createException(enum malexception, const char *, _In_z_ _Printf_format_string_ const char *, ...) __attribute__((__malloc__)) __attribute__((__format__(__printf__, 3, 4))) __attribute__((__returns_nonnull__)); str createMalException(MalBlkPtr, int, enum malexception, _In_z_ _Printf_format_string_ const char *, ...) __attribute__((__malloc__)) __attribute__((__format__(__printf__, 4, 5))) __attribute__((__returns_nonnull__)); @@ -1538,8 +1540,8 @@ str flt_num2dec_sht(Client ctx, sht *res void freeVariables(Client c, MalBlkPtr mb, MalStkPtr glb, int oldvtop); str getBackendContext(Client cntxt, backend **be); str getSQLContext(Client cntxt, MalBlkPtr mb, mvc **c, backend **b); -u_int32_t get_le_uint32(unsigned char *c); -u_int32_t get_uint32(unsigned char *c); +uint32_t get_le_uint32(unsigned char *c); +uint32_t get_uint32(unsigned char *c); str hge_dec2_bte(Client ctx, bte *res, const int *s1, const hge *v); str hge_dec2_dbl(Client ctx, dbl *res, const int *s1, const hge *v); str hge_dec2_flt(Client ctx, flt *res, const int *s1, const hge *v); @@ -1619,19 +1621,19 @@ pqc_file *pqc_copy(pqc_file *pq); pqc_file *pqc_dup(pqc_file *pq); int pqc_get_field(char *in, int *fieldid, int *type); pqc_filemetadata *pqc_get_filemetadata(pqc_file *pq); -int pqc_get_int32(char *in, u_int32_t *v); -int pqc_get_int64(char *in, u_int64_t *v); +int pqc_get_int32(char *in, uint32_t *v); +int pqc_get_int64(char *in, uint64_t *v); int pqc_get_list(char *in, int *size, int *type); const pqc_schema_element *pqc_get_schema_elements(pqc_file *pq, int *nr); int pqc_get_string(char *in, char **s, int *len); -int pqc_get_zint32(char *in, u_int32_t *v); -int pqc_get_zint64(char *in, u_int64_t *v); -int64_t pqc_mark_chunk(pqc_reader_t *r, int nr_workers, int wnr, u_int64_t nrows); +int pqc_get_zint32(char *in, uint32_t *v); +int pqc_get_zint64(char *in, uint64_t *v); +int64_t pqc_mark_chunk(pqc_reader_t *r, int nr_workers, int wnr, uint64_t nrows); int pqc_open(pqc_file **pq, char *fn); -int pqc_put_int32(char *in, u_int32_t v); -int pqc_put_int64(char *in, u_int64_t v); +int pqc_put_int32(char *in, uint32_t v); +int pqc_put_int64(char *in, uint64_t v); int64_t pqc_read(pqc_file *pq, int64_t offset, char *buffer, int nrbytes); -int64_t pqc_read_chunk(pqc_reader_t *r, int wnr, void *d, void *vd, u_int64_t nrows, int *ssize, int *dict); +int64_t pqc_read_chunk(pqc_reader_t *r, int wnr, void *d, void *vd, uint64_t nrows, int *ssize, int *dict); int pqc_read_filemetadata(pqc_file *pq); int pqc_read_schema(pqc_file *pq); pqc_reader_t *pqc_reader(pqc_reader_t *p, pqc_file *pq, int nr_workers, pqc_filemetadata *fmd, int colnr, int64_t nrows, const void *nil); _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
