Changeset: 7d2ad02783dd for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7d2ad02783dd Added Files: sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.bat sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.SQL.sh sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.stable.err sql/jdbc/tests/Tests/Bug_PrepStmtSetString_6382.stable.out sql/test/BugTracker-2017/Tests/udf_crash_subquery_scalar_paramters.Bug-6399.sql sql/test/BugTracker-2017/Tests/udf_crash_subquery_scalar_paramters.Bug-6399.stable.err sql/test/BugTracker-2017/Tests/udf_crash_subquery_scalar_paramters.Bug-6399.stable.out sql/test/Tests/constant-not-in.sql sql/test/Tests/constant-not-in.stable.err sql/test/Tests/constant-not-in.stable.out Modified Files: NT/monetdb_config.h.in clients/Tests/exports.stable.out clients/mapiclient/mclient.c clients/mapiclient/mhelp.c clients/mapilib/mapi.c common/stream/stream.c configure.ag gdk/ChangeLog gdk/gdk.h gdk/gdk_aggr.c gdk/gdk_atoms.c gdk/gdk_atoms.h gdk/gdk_bat.c gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_firstn.c gdk/gdk_heap.c gdk/gdk_logger.c gdk/gdk_orderidx.c gdk/gdk_storage.c gdk/gdk_utils.c gdk/gdk_value.c geom/lib/libgeom.c geom/lib/libgeom.h geom/monetdb5/geom.c geom/monetdb5/geom.h geom/monetdb5/geomBulk.c monetdb5/mal/Tests/tst1200.malC monetdb5/mal/Tests/tst1200.stable.out monetdb5/mal/Tests/tst1203.malC monetdb5/mal/Tests/tst1203.stable.out monetdb5/mal/Tests/tst1205.malC monetdb5/mal/mal.h monetdb5/mal/mal_atom.c monetdb5/mal/mal_atom.h monetdb5/mal/mal_authorize.c monetdb5/mal/mal_client.h monetdb5/mal/mal_exception.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_instruction.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_module.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_scenario.c monetdb5/modules/atoms/Tests/inet01.stable.out monetdb5/modules/atoms/Tests/json04.stable.out monetdb5/modules/atoms/blob.c monetdb5/modules/atoms/blob.h monetdb5/modules/atoms/color.c monetdb5/modules/atoms/color.h monetdb5/modules/atoms/identifier.c monetdb5/modules/atoms/inet.c monetdb5/modules/atoms/json.c monetdb5/modules/atoms/json.h monetdb5/modules/atoms/mtime.c monetdb5/modules/atoms/mtime.h monetdb5/modules/atoms/str.c monetdb5/modules/atoms/url.c monetdb5/modules/atoms/url.h monetdb5/modules/atoms/uuid.c monetdb5/modules/atoms/xml.c monetdb5/modules/atoms/xml.h monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/bat5.c monetdb5/modules/kernel/batcolor.c monetdb5/modules/kernel/mmath.h monetdb5/modules/mal/inspect.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/mal_mapi.c monetdb5/modules/mal/mdb.c monetdb5/modules/mal/oltp.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/tablet.h monetdb5/modules/mal/wlc.c monetdb5/optimizer/opt_evaluate.c monetdb5/optimizer/opt_json.c monetdb5/optimizer/opt_macro.c monetdb5/optimizer/opt_mergetable.c monetdb5/optimizer/opt_multiplex.c monetdb5/optimizer/opt_oltp.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_pipes.h monetdb5/optimizer/opt_prelude.h monetdb5/optimizer/opt_remap.c monetdb5/optimizer/opt_remoteQueries.c monetdb5/optimizer/opt_support.c sql/backends/monet5/UDF/pyapi/Tests/pyapi_returntypes.stable.out sql/backends/monet5/UDF/pyapi/conversion.c sql/backends/monet5/UDF/pyapi/emit.c sql/backends/monet5/UDF/pyapi/type_conversion.c sql/backends/monet5/generator/generator.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql.c sql/backends/monet5/sql_cast.c sql/backends/monet5/sql_cast_impl_int.h sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_result.c sql/backends/monet5/sql_result.h sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_statistics.c sql/backends/monet5/vaults/bam/mykstring.h sql/backends/monet5/wlr.c sql/common/sql_keyword.c sql/common/sql_mem.c sql/common/sql_stack.c sql/common/sql_string.c sql/common/sql_types.c sql/include/sql_keyword.h sql/jdbc/tests/Tests/All sql/server/rel_exp.c sql/server/rel_optimizer.c sql/server/rel_planner.c sql/server/rel_select.c sql/server/rel_select.h sql/server/rel_semantic.c sql/server/rel_updates.c sql/server/sql_atom.c sql/server/sql_env.c sql/server/sql_env.h sql/server/sql_mvc.c sql/server/sql_parser.y sql/server/sql_scan.c sql/server/sql_scan.h sql/storage/bat/bat_table.c sql/storage/store.c sql/storage/store_dependency.c sql/storage/store_sequence.c sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Darwin sql/test/BugTracker-2010/Tests/error-truncated.Bug-2615.stable.err.Windows sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.sql sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out.int128 sql/test/BugTracker-2016/Tests/storagemodel.stable.out.Darwin sql/test/BugTracker-2017/Tests/All sql/test/Tests/All sql/test/mapi/Tests/sql_int128.stable.out.int128 sql/test/pg_regress/Tests/float8.stable.err.Windows sql/test/pg_regress/Tests/oid.stable.err.32bit testing/malcheck.py tools/merovingian/daemon/controlrunner.c Branch: data-vaults Log Message:
Merge with default diffs (truncated from 13024 to 300 lines): diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in --- a/NT/monetdb_config.h.in +++ b/NT/monetdb_config.h.in @@ -755,9 +755,6 @@ /* Release name or "unreleased" */ #define MONETDB_RELEASE "unreleased" -/* Suffix for C++ files */ -#define MX_CXX_SUFFIX "cxx" - /* Define if you do not want assertions */ /* #undef NDEBUG */ 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 @@ -13,9 +13,9 @@ int ATOMallocate(const char *nme); int ATOMcmp(int id, const void *v_1, const void *v_2); ptr ATOMdup(int id, const void *val); bte ATOMelmshift(int sz); -int ATOMformat(int id, const void *val, char **buf); +ssize_t ATOMformat(int id, const void *val, char **buf); int ATOMindex(const char *nme); -int ATOMlen(int id, const void *v); +size_t ATOMlen(int id, const void *v); str ATOMname(int id); ptr ATOMnil(int id); int ATOMprint(int id, const void *val, stream *fd); @@ -303,8 +303,8 @@ int MT_munmap(void *p, size_t len); int MT_path_absolute(const char *path); void MT_sleep_ms(unsigned int ms); void OIDXdestroy(BAT *b); -int OIDfromStr(const char *src, int *len, oid **dst); -int OIDtoStr(str *dst, int *len, const oid *src); +ssize_t OIDfromStr(const char *src, size_t *len, oid **dst); +ssize_t OIDtoStr(str *dst, size_t *len, const oid *src); BUN ORDERfnd(BAT *b, const void *v); BUN ORDERfndfirst(BAT *b, const void *v); BUN ORDERfndlast(BAT *b, const void *v); @@ -330,7 +330,7 @@ int VALcmp(const ValRecord *p, const Val ptr VALconvert(int typ, ValPtr t); ValPtr VALcopy(ValPtr dst, const ValRecord *src); void VALempty(ValPtr v); -int VALformat(char **buf, const ValRecord *res); +ssize_t VALformat(char **buf, const ValRecord *res); void *VALget(ValPtr v); ValPtr VALinit(ValPtr d, int tpe, const void *s); int VALisnil(const ValRecord *v); @@ -368,26 +368,26 @@ BAT *VIEWcreate(oid seq, BAT *b); BAT *VIEWcreate_(oid seq, BAT *b, int stable); size_t _MT_npages; size_t _MT_pagesize; -int batFromStr(const char *src, int *len, bat **dst); -int batToStr(str *dst, int *len, const bat *src); -int bitFromStr(const char *src, int *len, bit **dst); -int bitToStr(str *dst, int *len, const bit *src); -int bteFromStr(const char *src, int *len, bte **dst); -int bteToStr(str *dst, int *len, const bte *src); +ssize_t batFromStr(const char *src, size_t *len, bat **dst); +ssize_t batToStr(str *dst, size_t *len, const bat *src); +ssize_t bitFromStr(const char *src, size_t *len, bit **dst); +ssize_t bitToStr(str *dst, size_t *len, const bit *src); +ssize_t bteFromStr(const char *src, size_t *len, bte **dst); +ssize_t bteToStr(str *dst, size_t *len, const bte *src); const bte bte_nil; int closedir(DIR *dir); -int dblFromStr(const char *src, int *len, dbl **dst); -int dblToStr(str *dst, int *len, const dbl *src); +ssize_t dblFromStr(const char *src, size_t *len, dbl **dst); +ssize_t dblToStr(str *dst, size_t *len, const dbl *src); const dbl dbl_nil; char *dirname(char *path); int dlclose(void *handle); char *dlerror(void); void *dlopen(const char *file, int mode); void *dlsym(void *handle, const char *name); -int escapedStr(char *dst, const char *src, int dstlen, const char *sep1, const char *sep2, int quote); -int escapedStrlen(const char *src, const char *sep1, const char *sep2, int quote); -int fltFromStr(const char *src, int *len, flt **dst); -int fltToStr(str *dst, int *len, const flt *src); +size_t escapedStr(char *dst, const char *src, size_t dstlen, const char *sep1, const char *sep2, int quote); +size_t escapedStrlen(const char *src, const char *sep1, const char *sep2, int quote); +ssize_t fltFromStr(const char *src, size_t *len, flt **dst); +ssize_t fltToStr(str *dst, size_t *len, const flt *src); const flt flt_nil; geomcatalogfix_fptr geomcatalogfix_get(void); void geomcatalogfix_set(geomcatalogfix_fptr); @@ -399,14 +399,14 @@ bat getBBPsize(void); char *get_bin_path(void); int gettimeofday(struct timeval *tv, int *ignore_zone); int gprof_pthread_create(pthread_t *__restrict, __const pthread_attr_t *__restrict, void *( *fcn)(void *), void *__restrict); -int hgeFromStr(const char *src, int *len, hge **dst); -int hgeToStr(str *dst, int *len, const hge *src); +ssize_t hgeFromStr(const char *src, size_t *len, hge **dst); +ssize_t hgeToStr(str *dst, size_t *len, const hge *src); const hge hge_nil; -int intFromStr(const char *src, int *len, int **dst); -int intToStr(str *dst, int *len, const int *src); +ssize_t intFromStr(const char *src, size_t *len, int **dst); +ssize_t intToStr(str *dst, size_t *len, const int *src); const int int_nil; -int lngFromStr(const char *src, int *len, lng **dst); -int lngToStr(str *dst, int *len, const lng *src); +ssize_t lngFromStr(const char *src, size_t *len, lng **dst); +ssize_t lngToStr(str *dst, size_t *len, const lng *src); const lng lng_nil; gdk_return log_abort(logger *lg); gdk_return log_bat(logger *lg, BAT *b, const char *n); @@ -471,17 +471,17 @@ void pthread_sema_init(pthread_sema_t *s void pthread_sema_init(pthread_sema_t *s, int flag, int nresources); void pthread_sema_up(pthread_sema_t *s); void pthread_sema_up(pthread_sema_t *s); -int ptrFromStr(const char *src, int *len, ptr **dst); -int ptrToStr(str *dst, int *len, const ptr *src); +ssize_t ptrFromStr(const char *src, size_t *len, ptr **dst); +ssize_t ptrToStr(str *dst, size_t *len, const ptr *src); const ptr ptr_nil; struct dirent *readdir(DIR *dir); void rewinddir(DIR *dir); -int shtFromStr(const char *src, int *len, sht **dst); -int shtToStr(str *dst, int *len, const sht *src); +ssize_t shtFromStr(const char *src, size_t *len, sht **dst); +ssize_t shtToStr(str *dst, size_t *len, const sht *src); const sht sht_nil; -int strFromStr(const char *src, int *len, str *dst); +ssize_t strFromStr(const char *src, size_t *len, str *dst); BUN strHash(const char *s); -int strLen(const char *s); +size_t strLen(const char *s); int strNil(const char *s); const char str_nil[2]; gdk_return void_inplace(BAT *b, oid id, const void *val, bit force) __attribute__((__warn_unused_result__)); @@ -819,25 +819,25 @@ str BKCsetTransient(void *r, const bat * str BKCsetkey(bat *res, const bat *bid, const bit *param); str BKCshrinkBAT(bat *ret, const bat *bid, const bat *did); str BLOBblob_blob(blob **d, blob **s); -str BLOBblob_fromstr(blob **b, str *d); -int BLOBcmp(blob *l, blob *r); +str BLOBblob_fromstr(blob **b, const char **d); +int BLOBcmp(const blob *l, const blob *r); void BLOBdel(Heap *h, var_t *index); str BLOBfromblob(str *retval, blob **b); str BLOBfromidx(str *retval, blob **binp, int *index); -int BLOBfromstr(char *instr, int *l, blob **val); +ssize_t BLOBfromstr(const char *instr, size_t *l, blob **val); int BLOBget(Heap *h, int *bun, int *l, blob **val); -BUN BLOBhash(blob *b); +BUN BLOBhash(const blob *b); void BLOBheap(Heap *heap, size_t capacity); -int BLOBlength(blob *p); +size_t BLOBlength(const blob *p); str BLOBnitems(int *ret, blob *b); -blob *BLOBnull(void); +const blob *BLOBnull(void); str BLOBprelude(void *ret); -var_t BLOBput(Heap *h, var_t *bun, blob *val); +var_t BLOBput(Heap *h, var_t *bun, const blob *val); blob *BLOBread(blob *a, stream *s, size_t cnt); -str BLOBsqlblob_fromstr(sqlblob **b, str *d); +str BLOBsqlblob_fromstr(sqlblob **b, const char **d); str BLOBtoblob(blob **retval, str *s); -int BLOBtostr(str *tostr, int *l, blob *pin); -gdk_return BLOBwrite(blob *a, stream *s, size_t cnt); +ssize_t BLOBtostr(str *tostr, size_t *l, const blob *pin); +gdk_return BLOBwrite(const blob *a, stream *s, size_t cnt); str CALCmax(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str CALCmax_no_nil(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); str CALCmin(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); @@ -860,23 +860,23 @@ str CLRbatStr(bat *ret, const bat *l); str CLRbatValue(bat *ret, const bat *l); str CLRbatValueInt(bat *ret, const bat *l); str CLRbatycc(bat *ret, const bat *l, const bat *bid2, const bat *bid3); -str CLRblue(int *b, color *c); -str CLRcb(int *g, color *c); -str CLRcolor(color *c, str *val); -str CLRcr(int *r, color *c); -str CLRgreen(int *g, color *c); -str CLRhsv(color *c, flt *h, flt *s, flt *v); -str CLRhue(flt *r, color *c); -str CLRhueInt(int *r, color *c); -str CLRluminance(int *r, color *c); -str CLRred(int *r, color *c); -str CLRrgb(color *rgb, int *r, int *g, int *b); -str CLRsaturation(flt *g, color *c); -str CLRsaturationInt(int *g, color *c); -str CLRstr(str *val, color *c); -str CLRvalue(flt *b, color *c); -str CLRvalueInt(int *b, color *c); -str CLRycc(color *c, int *y, int *cr, int *cb); +str CLRblue(int *b, const color *c); +str CLRcb(int *g, const color *c); +str CLRcolor(color *c, const char **val); +str CLRcr(int *r, const color *c); +str CLRgreen(int *g, const color *c); +str CLRhsv(color *c, const flt *h, const flt *s, const flt *v); +str CLRhue(flt *r, const color *c); +str CLRhueInt(int *r, const color *c); +str CLRluminance(int *r, const color *c); +str CLRred(int *r, const color *c); +str CLRrgb(color *rgb, const int *r, const int *g, const int *b); +str CLRsaturation(flt *g, const color *c); +str CLRsaturationInt(int *g, const color *c); +str CLRstr(str *val, const color *c); +str CLRvalue(flt *b, const color *c); +str CLRvalueInt(int *b, const color *c); +str CLRycc(color *c, const int *y, const int *cr, const int *cb); str CLTActions(bat *ret); str CLTInfo(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str CLTLastCommand(bat *ret); @@ -1142,9 +1142,9 @@ str GRPsubgroup7(bat *ngid, bat *next, c str GRPsubgroup8(bat *ngid, bat *next, const bat *bid, const bat *gid, const bat *eid, const bat *hid); str GRPsubgroup9(bat *ngid, bat *next, const bat *bid, const bat *sid, const bat *gid, const bat *eid, const bat *hid); str IDentifier(identifier *retval, str *in); -int IDfromString(str src, int *len, identifier *retval); +ssize_t IDfromString(const char *src, size_t *len, identifier *retval); str IDprelude(void *ret); -int IDtoString(str *retval, int *len, identifier handle); +ssize_t IDtoString(str *retval, size_t *len, const char *handle); str ILIKEjoin(bat *r1, bat *r2, const bat *lid, const bat *rid, const str *esc, const bat *slid, const bat *srid, const bit *nil_matches, const lng *estimate); str ILIKEjoin1(bat *r1, bat *r2, const bat *lid, const bat *rid, const bat *slid, const bat *srid, const bit *nil_matches, const lng *estimate); str INET_comp_CS(bit *retval, const inet *val1, const inet *val2); @@ -1163,17 +1163,17 @@ str INET_isnil(bit *retval, const inet * str INETabbrev(str *retval, const inet *val); str INETbroadcast(inet *retval, const inet *val); int INETcompare(const inet *l, const inet *r); -int INETfromString(const char *src, int *len, inet **retval); +ssize_t INETfromString(const char *src, size_t *len, inet **retval); str INEThost(str *retval, const inet *val); str INEThostmask(inet *retval, const inet *val); str INETmasklen(int *retval, const inet *val); str INETnetmask(inet *retval, const inet *val); str INETnetwork(inet *retval, const inet *val); str INETnew(inet *retval, str *in); -inet *INETnull(void); +const inet *INETnull(void); str INETsetmasklen(inet *retval, const inet *val, const int *msk); str INETtext(str *retval, const inet *val); -int INETtoString(str *retval, int *len, const inet *handle); +ssize_t INETtoString(str *retval, size_t *len, const inet *handle); str INSPECTatom_names(bat *ret); str INSPECTatom_sizes(bat *ret); str INSPECTatom_sup_names(bat *ret); @@ -1226,7 +1226,7 @@ str JSONfilterArray_int(json *ret, json str JSONfilterArray_lng(json *ret, json *j, lng *index); str JSONfilterArray_sht(json *ret, json *j, sht *index); str JSONfold(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -int JSONfromString(str src, int *len, json *x); +ssize_t JSONfromString(const char *src, size_t *len, json *x); str JSONgroupStr(str *ret, const bat *bid); str JSONisarray(bit *ret, json *j); str JSONisobject(bit *ret, json *j); @@ -1248,7 +1248,7 @@ str JSONsubjson(bat *retval, bat *bid, b str JSONsubjsoncand(bat *retval, bat *bid, bat *gid, bat *eid, bat *id, bit *skip_nils); str JSONtextGrouped(bat *ret, bat *bid, bat *gid, bat *ext, bit *flg); str JSONtextString(str *ret, bat *bid); -int JSONtoString(str *s, int *len, json src); +ssize_t JSONtoString(str *s, size_t *len, const char *src); str JSONunfold(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str JSONvalueArray(json *ret, json *arg); str JSONvalueTable(bat *ret, json *j); @@ -1714,8 +1714,8 @@ str SERVERsetAlias(void *ret, int *mid, str SERVERstop(void *ret); str SERVERsuspend(void *ret); str SERVERtrace(void *ret, int *mid, int *flag); -int SQLBLOBfromstr(char *instr, int *l, blob **val); -int SQLBLOBtostr(str *tostr, int *l, const blob *pin); +ssize_t SQLBLOBfromstr(const char *instr, size_t *l, blob **val); +ssize_t SQLBLOBtostr(str *tostr, size_t *l, const blob *pin); BUN SQLload_file(Client cntxt, Tablet *as, bstream *b, stream *out, const char *csep, const char *rsep, char quote, lng skip, lng maxrow, int best); str STRBytes(int *res, const str *arg1); str STRConcat(str *res, const str *val1, const str *val2); @@ -1846,7 +1846,7 @@ int TYPE_sqlblob; int TYPE_timestamp; int TYPE_tzone; int TYPE_xml; -int URLfromString(str src, int *len, str *u); +ssize_t URLfromString(const char *src, size_t *len, str *u); str URLgetAnchor(str *retval, url *val); str URLgetBasename(str *retval, url *t); str URLgetContent(str *retval, url *Str1); @@ -1865,18 +1865,18 @@ str URLnew(url *u, str *val); str URLnew3(url *u, str *protocol, str *server, str *file); str URLnew4(url *u, str *protocol, str *server, int *port, str *file); str URLnoop(url *u, url *val); -int URLtoString(str *s, int *len, str src); +ssize_t URLtoString(str *s, size_t *len, const char *src); int UUIDcompare(const uuid *l, const uuid *r); str UUIDequal(bit *retval, uuid **l, uuid **r); -int UUIDfromString(const char *svalue, int *len, uuid **retval); +ssize_t UUIDfromString(const char *svalue, size_t *len, uuid **retval); str UUIDgenerateUuid(uuid **retval); BUN UUIDhash(const void *u); str UUIDisaUUID(bit *retval, str *u); -uuid *UUIDnull(void); +const uuid *UUIDnull(void); str UUIDprelude(void *ret); uuid *UUIDread(uuid *u, stream *s, size_t cnt); str UUIDstr2uuid(uuid **retval, str *s); -int UUIDtoString(str *retval, int *len, const uuid *value); +ssize_t UUIDtoString(str *retval, size_t *len, const uuid *value); _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
