Changeset: 0734c0d46e63 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0734c0d46e63 Added Files: sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.py sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.err sql/test/BugTracker-2018/Tests/grant-role-not-idempotent.Bug-6660.stable.out sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.stable.err sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.stable.out sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.err sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.out.int128 sql/test/testdb-reload/Tests/All sql/test/testdb-reload/Tests/reload.py sql/test/testdb-reload/Tests/reload.stable.err sql/test/testdb-reload/Tests/reload.stable.out sql/test/testdb-reload/Tests/reload.timeout sql/test/testdb/Tests/dump-nogeom.reqtests sql/test/testdb/Tests/dump-nogeom.sql sql/test/testdb/Tests/dump-nogeom.stable.err sql/test/testdb/Tests/dump-nogeom.stable.out sql/test/testdb/Tests/load-geom.reqtests sql/test/testdb/Tests/load-geom.sql sql/test/testdb/Tests/load-geom.stable.err sql/test/testdb/Tests/load-geom.stable.out Modified Files: clients/Tests/exports.stable.out clients/mapiclient/dump.c clients/mapiclient/mclient.c clients/mapiclient/msqldump.c gdk/ChangeLog gdk/gdk.h gdk/gdk_atoms.c gdk/gdk_atoms.h gdk/gdk_batop.c gdk/gdk_bbp.c gdk/gdk_calc.c gdk/gdk_private.h gdk/gdk_storage.c gdk/gdk_string.c gdk/gdk_system.c gdk/gdk_utils.c gdk/gdk_value.c geom/monetdb5/geom.c geom/monetdb5/geom.h geom/sql/conformance/Tests/T13.stable.out geom/sql/conformance/Tests/T14.stable.out geom/sql/conformance/Tests/T17.stable.out geom/sql/conformance/Tests/T18.stable.out geom/sql/conformance/Tests/T23.stable.out geom/sql/conformance/Tests/T24.stable.out geom/sql/conformance/Tests/T27.stable.out geom/sql/conformance/Tests/T29.stable.out geom/sql/conformance/Tests/T31.stable.out geom/sql/conformance/Tests/T34.stable.out geom/sql/conformance/Tests/T47.stable.out geom/sql/conformance/Tests/T48.stable.out geom/sql/conformance/Tests/T49.stable.out geom/sql/conformance/Tests/T50.stable.out geom/sql/conformance/Tests/T52.stable.out geom/sql/conformance/Tests/T8.stable.out geom/sql/functions/Tests/ST_AsEWKT.stable.out geom/sql/functions/Tests/ST_AsText.stable.out geom/sql/pg_regression/Tests/boundary.stable.out geom/sql/pg_regression/Tests/delaunaytriangles.stable.out monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out monetdb5/mal/Tests/tst1200.stable.out monetdb5/mal/Tests/tst1205.stable.out monetdb5/mal/mal_atom.c monetdb5/mal/mal_instruction.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_profiler.c 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/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/bat5.c monetdb5/modules/mal/mal_io.c monetdb5/modules/mal/remote.c monetdb5/modules/mal/tablet.c rpm.mk.in sql/ChangeLog sql/backends/monet5/UDF/capi/capi.c sql/backends/monet5/UDF/pyapi/conversion.c sql/backends/monet5/UDF/pyapi/convert_loops.h sql/backends/monet5/UDF/pyapi/type_conversion.c sql/backends/monet5/sql.c sql/backends/monet5/sql_cast.c sql/backends/monet5/sql_cat.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/sql_upgrades.c sql/backends/monet5/vaults/bam/Tests/query2.1.stable.out sql/backends/monet5/vaults/bam/Tests/query2.10.stable.out sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out.int128 sql/backends/monet5/wlr.c sql/benchmarks/ATIS/load.sql sql/benchmarks/VOC/voc_dump.sql sql/benchmarks/moa/load1.sql sql/common/sql_string.c sql/common/sql_string.h sql/include/sql_catalog.h sql/jdbc/tests/Tests/BugResultSetMetaData_Bug_6183.stable.out sql/server/rel_dump.c sql/server/rel_exp.c sql/server/rel_psm.c sql/server/rel_select.c sql/server/rel_updates.c sql/server/sql_atom.c sql/server/sql_parser.y sql/server/sql_privileges.c sql/server/sql_scan.c sql/storage/bat/res_table.c sql/storage/store.c sql/test/ADT2006/benesamo.sql sql/test/ADT2006/bram.sql sql/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.stable.out sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.sql sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err sql/test/BugTracker-2009/Tests/drop-sequence-crash.SF-2854195.stable.err sql/test/BugTracker-2009/Tests/drop-sequence-crash.SF-2854195.stable.out sql/test/BugTracker-2010/Tests/multiple-common-table-expressions.Bug-2664.sql sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.py sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.sql sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.stable.out sql/test/BugTracker-2012/Tests/time-export-bug.Bug-2963.sql sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.sql sql/test/BugTracker-2013/Tests/env_errors.Bug-3370.stable.err sql/test/BugTracker-2013/Tests/median-null.Bug-3280.sql sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.sql sql/test/BugTracker-2014/Tests/oid-table-assert.Bug-3514.sql sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out sql/test/BugTracker-2015/Tests/dump-DELETE.Bug-3850.stable.out sql/test/BugTracker-2015/Tests/is_null_limit.Bug-3684.sql sql/test/BugTracker-2015/Tests/msqldump-merge-and-remote-tables.Bug-3774.stable.out sql/test/BugTracker-2015/Tests/project_rewrite.Bug-3693_2.sql sql/test/BugTracker-2015/Tests/quantile_function_resolution.Bug-3773.stable.out sql/test/BugTracker-2017/Tests/crash-in-topn.Bug-6478.sql sql/test/BugTracker-2017/Tests/crash-on-limit-rename.Bug-6502.sql sql/test/BugTracker-2017/Tests/semijoinunion.Bug-6150.sql sql/test/BugTracker-2018/Tests/All sql/test/BugTracker-2018/Tests/case_with_orderby_limit.Bug-6512.sql sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.err sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.stable.out sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.sql sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.out sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.sql sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.stable.out sql/test/BugTracker-2018/Tests/prepared-statement-with-udf.Bug-6650.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.sql sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.out sql/test/Dump/Tests/dump.stable.out sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out sql/test/Tests/identifiers.stable.err sql/test/Tests/identifiers.stable.out sql/test/Users/Tests/grantMonetdb.stable.err sql/test/Users/Tests/grantMonetdbToSchemaOwner.Bug-3771.stable.err sql/test/Users/Tests/grantRole.Bug-3772.stable.err sql/test/Users/Tests/renameUser.stable.err sql/test/Users/Tests/role.stable.err sql/test/Users/Tests/role2.stable.err sql/test/Users/Tests/schema.stable.err sql/test/VOC/VOCinsert.sql sql/test/bugs/escape_quote-bug-sf-1006469.sql sql/test/copy/Tests/int_parse.sql sql/test/copy/Tests/int_parse.stable.err sql/test/copy/Tests/int_parse_best.sql sql/test/copy/Tests/key_copy.sql sql/test/copy/Tests/key_copy.stable.err sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128 sql/test/emptydb/Tests/check.SQL.py sql/test/json/Tests/coercions.sql sql/test/json/Tests/coercions.stable.out sql/test/json/Tests/jsonvalidity.Bug-3753.stable.out sql/test/orderidx/Tests/imprints_all_types.stable.out sql/test/orderidx/Tests/imprints_hge_type.stable.out.int128 sql/test/orderidx/Tests/oidx_all_types.stable.out sql/test/orderidx/Tests/oidx_hge_type.stable.out.int128 sql/test/pg_regress/Tests/box.stable.out sql/test/pg_regress/Tests/oid.sql sql/test/pg_regress/Tests/oid.stable.err.32bit sql/test/pg_regress/Tests/oid.stable.err.int128 sql/test/pg_regress/Tests/oid.stable.out sql/test/pg_regress/Tests/oid.stable.out.32bit sql/test/pg_regress/Tests/path.stable.out sql/test/pg_regress/Tests/point.stable.out sql/test/pg_regress/Tests/polygon.stable.out sql/test/remote/Tests/ssbm.SQL.py sql/test/sql_xml/load.sql sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out.int128 sql/test/testdb-upgrade-chain/Tests/dump.stable.out sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128 sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128 sql/test/testdb-upgrade/Tests/dump.stable.out sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128 sql/test/testdb/Tests/All sql/test/testdb/Tests/dump.reqtests sql/test/testdb/Tests/dump.stable.out sql/test/testdb/Tests/load.sql sql/test/testdb/Tests/load.stable.out sql/test/testdb/Tests/package.reqtests sql/test/wlcr/Tests/wlc01.py sql/test/wlcr/Tests/wlc100.py sql/test/wlcr/Tests/wlc20.py sql/test/wlcr/Tests/wlc21.py sql/test/wlcr/Tests/wlc30.py sql/test/wlcr/Tests/wlc40.py sql/test/wlcr/Tests/wlc50.py sql/test/wlcr/Tests/wlc70.py sql/test/wlcr/Tests/wlr01.py sql/test/wlcr/Tests/wlr100.py sql/test/wlcr/Tests/wlr20.py sql/test/wlcr/Tests/wlr30.py sql/test/wlcr/Tests/wlr40.py sql/test/wlcr/Tests/wlr50.py sql/test/wlcr/Tests/wlr70.py testing/malcheck.py testing/process.py tools/mserver/mserver5.c Branch: merge-statements Log Message:
Merge with default diffs (truncated from 231734 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 @@ -8,13 +8,13 @@ stdout of test 'exports` in directory 'c # gdk int ALIGNsynced(BAT *b1, BAT *b2); int ATOMallocate(const char *nme); -ptr ATOMdup(int id, const void *val); +void *ATOMdup(int id, const void *val); bte ATOMelmshift(int sz); char *ATOMformat(int id, const void *val); int ATOMindex(const char *nme); size_t ATOMlen(int id, const void *v); str ATOMname(int id); -ptr ATOMnil(int id); +void *ATOMnil(int id); int ATOMprint(int id, const void *val, stream *fd); gdk_return BATappend(BAT *b, BAT *n, BAT *s, bool force) __attribute__((__warn_unused_result__)); void BATassertProps(BAT *b); @@ -301,8 +301,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); -ssize_t OIDfromStr(const char *src, size_t *len, oid **dst); -ssize_t OIDtoStr(str *dst, size_t *len, const oid *src); +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); BUN ORDERfnd(BAT *b, const void *v); BUN ORDERfndfirst(BAT *b, const void *v); BUN ORDERfndlast(BAT *b, const void *v); @@ -318,21 +318,21 @@ int THRgettid(void); int THRhighwater(void); Thread THRnew(const char *name); int THRprintf(stream *s, _In_z_ _Printf_format_string_ const char *format, ...) __attribute__((__format__(__printf__, 2, 3))); -void THRsetdata(int, ptr); +void THRsetdata(int, void *); void TMabort(void); gdk_return TMcommit(void); gdk_return TMsubcommit(BAT *bl); gdk_return TMsubcommit_list(bat *subcommit, int cnt); void VALclear(ValPtr v); int VALcmp(const ValRecord *p, const ValRecord *q); -ptr VALconvert(int typ, ValPtr t); +void *VALconvert(int typ, ValPtr t); ValPtr VALcopy(ValPtr dst, const ValRecord *src); void VALempty(ValPtr v); char *VALformat(const ValRecord *res); void *VALget(ValPtr v); ValPtr VALinit(ValPtr d, int tpe, const void *s); int VALisnil(const ValRecord *v); -ValPtr VALset(ValPtr v, int t, ptr p); +ValPtr VALset(ValPtr v, int t, void *p); gdk_return VARcalcabsolute(ValPtr ret, const ValRecord *v); gdk_return VARcalcadd(ValPtr ret, const ValRecord *lft, const ValRecord *rgt, bool abort_on_error); gdk_return VARcalcand(ValPtr ret, const ValRecord *lft, const ValRecord *rgt); @@ -367,16 +367,16 @@ size_t _MT_npages; size_t _MT_pagesize; const union _dbl_nil_t _dbl_nil_; const union _flt_nil_t _flt_nil_; -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); +ssize_t batFromStr(const char *src, size_t *len, bat **dst, bool external); +ssize_t batToStr(str *dst, size_t *len, const bat *src, bool external); +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 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; int closedir(DIR *dir); -ssize_t dblFromStr(const char *src, size_t *len, dbl **dst); -ssize_t dblToStr(str *dst, size_t *len, const dbl *src); +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); const dbl dbl_nil; char *dirname(char *path); int dlclose(void *handle); @@ -385,8 +385,8 @@ void *dlopen(const char *file, int mode) void *dlsym(void *handle, const char *name); 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); -ssize_t fltToStr(str *dst, size_t *len, const flt *src); +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); const flt flt_nil; geomcatalogfix_fptr geomcatalogfix_get(void); void geomcatalogfix_set(geomcatalogfix_fptr); @@ -397,14 +397,14 @@ void geomversion_set(void); bat getBBPsize(void); char *get_bin_path(void); int gettimeofday(struct timeval *tv, int *ignore_zone); -ssize_t hgeFromStr(const char *src, size_t *len, hge **dst); -ssize_t hgeToStr(str *dst, size_t *len, const hge *src); +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); const hge hge_nil; -ssize_t intFromStr(const char *src, size_t *len, int **dst); -ssize_t intToStr(str *dst, size_t *len, const int *src); +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); const int int_nil; -ssize_t lngFromStr(const char *src, size_t *len, lng **dst); -ssize_t lngToStr(str *dst, size_t *len, const lng *src); +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); const lng lng_nil; gdk_return log_abort(logger *lg); gdk_return log_bat(logger *lg, BAT *b, const char *n, char tpe, oid id); @@ -453,15 +453,15 @@ 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); -ssize_t ptrFromStr(const char *src, size_t *len, ptr **dst); -ssize_t ptrToStr(str *dst, size_t *len, const ptr *src); +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); const ptr ptr_nil; struct dirent *readdir(DIR *dir); void rewinddir(DIR *dir); -ssize_t shtFromStr(const char *src, size_t *len, sht **dst); -ssize_t shtToStr(str *dst, size_t *len, const sht *src); +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); const sht sht_nil; -ssize_t strFromStr(const char *restrict src, size_t *restrict len, str *restrict dst); +ssize_t strFromStr(const char *restrict src, size_t *restrict len, str *restrict dst, bool external); BUN strHash(const char *s); size_t strLen(const char *s); int strNil(const char *s); @@ -839,7 +839,7 @@ 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); -ssize_t BLOBfromstr(const char *instr, size_t *l, blob **val); +ssize_t BLOBfromstr(const char *instr, size_t *l, blob **val, bool external); int BLOBget(Heap *h, int *bun, int *l, blob **val); BUN BLOBhash(const blob *b); void BLOBheap(Heap *heap, size_t capacity); @@ -851,7 +851,7 @@ var_t BLOBput(Heap *h, var_t *bun, const blob *BLOBread(blob *a, stream *s, size_t cnt); str BLOBsqlblob_fromstr(sqlblob **b, const char **d); str BLOBtoblob(blob **retval, str *s); -ssize_t BLOBtostr(str *tostr, size_t *l, const blob *pin); +ssize_t BLOBtostr(str *tostr, size_t *l, const blob *pin, bool external); 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); @@ -1200,9 +1200,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); -ssize_t IDfromString(const char *src, size_t *len, identifier *retval); +ssize_t IDfromString(const char *src, size_t *len, identifier *retval, bool external); str IDprelude(void *ret); -ssize_t IDtoString(str *retval, size_t *len, const char *handle); +ssize_t IDtoString(str *retval, size_t *len, const char *handle, bool external); 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); @@ -1221,7 +1221,7 @@ 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); -ssize_t INETfromString(const char *src, size_t *len, inet **retval); +ssize_t INETfromString(const char *src, size_t *len, inet **retval, bool external); str INEThost(str *retval, const inet *val); str INEThostmask(inet *retval, const inet *val); str INETmasklen(int *retval, const inet *val); @@ -1231,7 +1231,7 @@ str INETnew(inet *retval, str *in); const inet *INETnull(void); str INETsetmasklen(inet *retval, const inet *val, const int *msk); str INETtext(str *retval, const inet *val); -ssize_t INETtoString(str *retval, size_t *len, const inet *handle); +ssize_t INETtoString(str *retval, size_t *len, const inet *handle, bool external); str INSPECTatom_names(bat *ret); str INSPECTatom_sizes(bat *ret); str INSPECTatom_sup_names(bat *ret); @@ -1284,7 +1284,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); -ssize_t JSONfromString(const char *src, size_t *len, json *x); +ssize_t JSONfromString(const char *src, size_t *len, json *x, bool external); str JSONgroupStr(str *ret, const bat *bid); str JSONisarray(bit *ret, json *j); str JSONisobject(bit *ret, json *j); @@ -1306,7 +1306,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); -ssize_t JSONtoString(str *s, size_t *len, const char *src); +ssize_t JSONtoString(str *s, size_t *len, const char *src, bool external); str JSONunfold(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str JSONvalueArray(json *ret, json *arg); str JSONvalueTable(bat *ret, json *j); @@ -1779,8 +1779,8 @@ str SERVERsetAlias(void *ret, int *mid, str SERVERstop(void *ret); str SERVERsuspend(void *ret); str SERVERtrace(void *ret, int *mid, int *flag); -ssize_t SQLBLOBfromstr(const char *instr, size_t *l, blob **val); -ssize_t SQLBLOBtostr(str *tostr, size_t *l, const blob *pin); +ssize_t SQLBLOBfromstr(const char *instr, size_t *l, blob **val, bool external); +ssize_t SQLBLOBtostr(str *tostr, size_t *l, const blob *pin, bool external); 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); @@ -1911,7 +1911,7 @@ int TYPE_sqlblob; int TYPE_timestamp; int TYPE_tzone; int TYPE_xml; -ssize_t URLfromString(const char *src, size_t *len, str *u); +ssize_t URLfromString(const char *src, size_t *len, str *u, bool external); str URLgetAnchor(str *retval, url *val); str URLgetBasename(str *retval, url *t); str URLgetContent(str *retval, url *Str1); @@ -1930,10 +1930,10 @@ 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); -ssize_t URLtoString(str *s, size_t *len, const char *src); +ssize_t URLtoString(str *s, size_t *len, const char *src, bool external); int UUIDcompare(const uuid *l, const uuid *r); str UUIDequal(bit *retval, uuid **l, uuid **r); -ssize_t UUIDfromString(const char *svalue, size_t *len, uuid **retval); +ssize_t UUIDfromString(const char *svalue, size_t *len, uuid **retval, bool external); str UUIDgenerateUuid(uuid **retval); BUN UUIDhash(const void *u); str UUIDisaUUID(bit *retval, str *u); @@ -1941,7 +1941,7 @@ const uuid *UUIDnull(void); str UUIDprelude(void *ret); uuid *UUIDread(uuid *u, stream *s, size_t cnt); str UUIDstr2uuid(uuid **retval, str *s); -ssize_t UUIDtoString(str *retval, size_t *len, const uuid *value); +ssize_t UUIDtoString(str *retval, size_t *len, const uuid *value, bool external); str UUIDuuid2str(str *retval, uuid **u); gdk_return UUIDwrite(const uuid *u, stream *s, size_t cnt); str WLCaction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -1978,7 +1978,7 @@ str XMLdocument(xml *x, str *s); str XMLelement(xml *ret, str *name, xml *nspace, xml *attr, xml *val); str XMLelementSmall(xml *ret, str *name, xml *val); str XMLforest(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); -ssize_t XMLfromString(const char *src, size_t *len, xml *x); +ssize_t XMLfromString(const char *src, size_t *len, xml *x, bool external); str XMLisdocument(bit *x, str *s); str XMLparse(xml *x, str *doccont, str *s, str *option); str XMLpi(xml *x, str *target, str *s); @@ -1986,7 +1986,7 @@ str XMLprelude(void *ret); size_t XMLquotestring(const char *s, char *buf, size_t len); str XMLroot(xml *x, xml *v, str *version, str *standalone); str XMLstr2xml(xml *x, const char **s); -ssize_t XMLtoString(str *s, size_t *len, const char *src); +ssize_t XMLtoString(str *s, size_t *len, const char *src, bool external); size_t XMLunquotestring(const char **p, char q, char *buf); str XMLxml2str(str *s, xml *x); str XMLxml2xml(xml *x, xml *s); @@ -2079,8 +2079,8 @@ str closeRef; void clrDeclarations(MalBlkPtr mb); void clrFunction(InstrPtr p); void clrInstruction(InstrPtr p); -ssize_t color_fromstr(const char *colorStr, size_t *len, color **c); -ssize_t color_tostr(char **colorStr, size_t *len, const color *c); +ssize_t color_fromstr(const char *colorStr, size_t *len, color **c, bool external); +ssize_t color_tostr(char **colorStr, size_t *len, const color *c, bool external); str columnBindRef; str columnRef; str comment_onRef; @@ -2114,11 +2114,11 @@ str create_viewRef; str crossRef; str dataflowRef; str dateRef; -ssize_t date_fromstr(const char *buf, size_t *len, date **d); -ssize_t date_tostr(str *buf, size_t *len, const date *val); -ssize_t daytime_fromstr(const char *buf, size_t *len, daytime **ret); -ssize_t daytime_tostr(str *buf, size_t *len, const daytime *val); -ssize_t daytime_tz_fromstr(const char *buf, size_t *len, daytime **ret); +ssize_t date_fromstr(const char *buf, size_t *len, date **d, bool external); +ssize_t date_tostr(str *buf, size_t *len, const date *val, bool external); +ssize_t daytime_fromstr(const char *buf, size_t *len, daytime **ret, bool external); +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 **ret, bool external); str dblRef; str deblockdataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); void debugFunction(stream *fd, MalBlkPtr mb, MalStkPtr stk, int flg, int first, int size); @@ -2561,8 +2561,8 @@ str rollbackRef; str row_numberRef; str rpcRef; str rsColumnRef; -ssize_t rule_fromstr(const char *buf, size_t *len, rule **d); -ssize_t rule_tostr(str *buf, size_t *len, const rule *r); +ssize_t rule_fromstr(const char *buf, size_t *len, rule **d, bool external); +ssize_t rule_tostr(str *buf, size_t *len, const rule *r, bool external); str runMAL(Client c, MalBlkPtr mb, MalBlkPtr mbcaller, MalStkPtr env); str runMALDebugger(Client cntxt, MalBlkPtr mb); str runMALdataflow(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr stk); @@ -2649,11 +2649,11 @@ str thetajoinRef; str thetaselectRef; _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
