Changeset: db3e39ea0485 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=db3e39ea0485
Added Files:
sql/test/BugTracker-2017/Tests/copy_into_crash.Bug-6404.sql
sql/test/BugTracker-2017/Tests/copy_into_crash.Bug-6404.stable.err
sql/test/BugTracker-2017/Tests/copy_into_crash.Bug-6404.stable.out
sql/test/BugTracker-2017/Tests/null_matches_in_outer.Bug-6398.sql
sql/test/BugTracker-2017/Tests/null_matches_in_outer.Bug-6398.stable.err
sql/test/BugTracker-2017/Tests/null_matches_in_outer.Bug-6398.stable.out
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.stable.err
sql/test/BugTracker-2017/Tests/side-effect.Bug-6397.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
sql/test/bugs/Tests/unicode_varchar-bug-sf-1041324_JdbcClient.stable.out.Windows
Modified Files:
buildtools/autogen/autogen/msc.py
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/ReadlineTools.c
clients/mapiclient/eventparser.c
clients/mapiclient/mhelp.c
clients/mapiclient/tomograph.c
clients/mapilib/mapi.c
clients/odbc/driver/ODBCConvert.c
clients/odbc/driver/ODBCUtil.c
common/options/monet_options.c
common/stream/stream_socket.h
common/utils/mutils.c
common/utils/strptime.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_posix.c
gdk/gdk_private.h
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_utils.c
gdk/gdk_value.c
geom/lib/libgeom.c
geom/monetdb5/geom.c
geom/monetdb5/geom.h
monetdb5/extras/rapi/Makefile.ag
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_atom.c
monetdb5/mal/mal_atom.h
monetdb5/mal/mal_client.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_readline.c
monetdb5/mal/mal_type.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/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/orderidx.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/sysmon.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tablet.h
monetdb5/modules/mal/txtsim.c
monetdb5/modules/mal/wlc.c
monetdb5/optimizer/opt_garbageCollector.c
monetdb5/optimizer/opt_jit.c
monetdb5/optimizer/opt_jit.h
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_projectionpath.c
monetdb5/optimizer/opt_pushselect.c
monetdb5/optimizer/opt_remoteQueries.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/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_cast.h
sql/backends/monet5/sql_cast_impl_int.h
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.h
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statistics.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/vaults/bam/bam_db_interface.h
sql/backends/monet5/vaults/bam/bam_export.c
sql/backends/monet5/vaults/bam/bam_export.h
sql/backends/monet5/vaults/bam/bam_loader.h
sql/backends/monet5/vaults/fits/fits.c
sql/backends/monet5/vaults/netcdf/netcdf.c
sql/backends/monet5/vaults/shp/shp.c
sql/backends/monet5/wlr.c
sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
sql/common/sql_string.c
sql/include/sql_relation.h
sql/jdbc/tests/Tests/Test_CisValid.stable.out
sql/server/Makefile.ag
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_optimizer.c
sql/server/rel_planner.c
sql/server/rel_updates.c
sql/server/sql_atom.c
sql/server/sql_decimal.c
sql/server/sql_parser.y
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_table.c
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err.Windows
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out
sql/test/BugTracker-2011/Tests/crash_on_alias.Bug-2798.stable.out.int128
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker-2017/Tests/sqllitelogistest_case.Bug-6335.sql
sql/test/Tests/All
testing/Mtimeout.c
testing/difflib.c
testing/helpers.h
testing/malcheck.py
tools/merovingian/daemon/controlrunner.c
Branch: trails
Log Message:
Merge with default
diffs (truncated from 13100 to 300 lines):
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -98,7 +98,7 @@ def msc_assignment(fd, var, values, msc)
o = ""
for v in values:
o = o + " " + v.replace('/', '\\')
- if var[0] != '@':
+ if var[0] != '@' and '.' not in var:
fd.write("%s = %s\n" % (var, o))
def msc_cflags(fd, var, values, msc):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -8376,19 +8376,15 @@ Ready.
[ "sql", "dec_round", "command sql.dec_round(v:int, r:int):int ",
"int_dec_round_wrap;", "round off the value v to nearests multiple of r"
]
[ "sql", "dec_round", "command sql.dec_round(v:lng, r:lng):lng ",
"lng_dec_round_wrap;", "round off the value v to nearests multiple of r"
]
[ "sql", "dec_round", "command sql.dec_round(v:sht, r:sht):sht ",
"sht_dec_round_wrap;", "round off the value v to nearests multiple of r"
]
-[ "sql", "declaredTable", "pattern
sql.declaredTable(name:str):int ", "mvc_declared_table_wrap;", "Prepare
a declared table" ]
[ "sql", "delete", "pattern sql.delete(mvc:int, sname:str,
tname:str, b:any):int ", "mvc_delete_wrap;", "Delete a row from a
table. Returns sequence number for order dependece." ]
[ "sql", "delta", "command sql.delta(col:bat[:any_3],
uid:bat[:oid], uval:bat[:any_3]):bat[:any_3] ", "DELTAbat2;", "Return
column bat with delta's applied." ]
[ "sql", "delta", "command sql.delta(col:bat[:any_3],
uid:bat[:oid], uval:bat[:any_3], ins:bat[:any_3]):bat[:any_3] ",
"DELTAbat;", "Return column bat with delta's applied." ]
[ "sql", "dense_rank", "pattern sql.dense_rank(b:any_1, p:bit,
o:bit):int ", "SQLdense_rank;", "return the densely ranked groups"
]
[ "sql", "diff", "pattern sql.diff(b:any_1):bit ", "SQLdiff;",
"return true if cur != prev row" ]
[ "sql", "diff", "pattern sql.diff(p:bit, b:any_1):bit ",
"SQLdiff;", "return true if cur != prev row" ]
-[ "sql", "dropDeclaredTable", "pattern
sql.dropDeclaredTable(name:str):void ", "mvc_drop_declared_table_wrap;",
"drop a declared table" ]
-[ "sql", "dropDeclaredTables", "pattern
sql.dropDeclaredTables(nr:int):void ", "mvc_drop_declared_tables_wrap;",
"drop top n declared tables" ]
[ "sql", "drop_func_upgrade_oct2014", "pattern
sql.drop_func_upgrade_oct2014(id:int):int ", "UPGdrop_func;", "Drop
the function identified by id, needed for the Oct2014 upgrade" ]
[ "sql", "drop_hash", "pattern sql.drop_hash(sch:str, tbl:str):void
", "SQLdrop_hash;", "Drop hash indices for the given table" ]
[ "sql", "droporderindex", "pattern sql.droporderindex(sch:str,
tbl:str, col:str):void ", "sql_droporderindex;", "Drop the order index on a
column" ]
-[ "sql", "dtColumn", "pattern sql.dtColumn(rs:int, tname:str,
name:str, typename:str, digits:int, scale:int):void ",
"mvc_declared_table_column_wrap;", "" ]
[ "sql", "dump_cache", "pattern sql.dump_cache() (query:bat[:str],
count:bat[:int]) ", "dump_cache;", "dump the content of the query cache" ]
[ "sql", "dump_opt_stats", "pattern sql.dump_opt_stats()
(rewrite:bat[:str], count:bat[:int]) ", "dump_opt_stats;", "dump the
optimizer rewrite statistics" ]
[ "sql", "dump_trace", "pattern sql.dump_trace() (event:bat[:int],
clk:bat[:str], pc:bat[:str], thread:bat[:int], ticks:bat[:lng],
rssMB:bat[:lng], vmMB:bat[:lng], reads:bat[:lng], writes:bat[:lng],
minflt:bat[:lng], majflt:bat[:lng], nvcsw:bat[:lng], stmt:bat[:str]) ",
"dump_trace;", "dump the trace statistics" ]
@@ -8415,6 +8411,7 @@ Ready.
[ "sql", "getVariable", "pattern sql.getVariable(mvc:int,
varname:str):any_1 ", "getVariable;", "Get the value of a session variable" ]
[ "sql", "getVersion", "command sql.getVersion(clientid:int):lng ",
"mvc_getVersion;", "Return the database version identifier for a client."
]
[ "sql", "get_value", "pattern sql.get_value(sname:str,
sequence:str):lng ", "mvc_get_value;", "return the current value of the
sequence" ]
+[ "sql", "grow", "pattern sql.grow(tid:bat[:oid], X_0:any_1):int ",
"mvc_grow_wrap;", "Resize the tid column of a declared table." ]
[ "sql", "importTable", "pattern sql.importTable(sname:str, tname:str,
fname:str...):bat[:any]... ", "mvc_bin_import_table_wrap;", "Import a
table from the files (fname)" ]
[ "sql", "include", "pattern sql.include(fname:str):void ",
"SQLinclude;", "Compile and execute a sql statements on the file" ]
[ "sql", "init", "pattern sql.init():void ", "SQLinitEnvironment;",
"Initialize the environment for MAL" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -10739,19 +10739,15 @@ Ready.
[ "sql", "dec_round", "command sql.dec_round(v:int, r:int):int ",
"int_dec_round_wrap;", "round off the value v to nearests multiple of r"
]
[ "sql", "dec_round", "command sql.dec_round(v:lng, r:lng):lng ",
"lng_dec_round_wrap;", "round off the value v to nearests multiple of r"
]
[ "sql", "dec_round", "command sql.dec_round(v:sht, r:sht):sht ",
"sht_dec_round_wrap;", "round off the value v to nearests multiple of r"
]
-[ "sql", "declaredTable", "pattern
sql.declaredTable(name:str):int ", "mvc_declared_table_wrap;", "Prepare
a declared table" ]
[ "sql", "delete", "pattern sql.delete(mvc:int, sname:str,
tname:str, b:any):int ", "mvc_delete_wrap;", "Delete a row from a
table. Returns sequence number for order dependece." ]
[ "sql", "delta", "command sql.delta(col:bat[:any_3],
uid:bat[:oid], uval:bat[:any_3]):bat[:any_3] ", "DELTAbat2;", "Return
column bat with delta's applied." ]
[ "sql", "delta", "command sql.delta(col:bat[:any_3],
uid:bat[:oid], uval:bat[:any_3], ins:bat[:any_3]):bat[:any_3] ",
"DELTAbat;", "Return column bat with delta's applied." ]
[ "sql", "dense_rank", "pattern sql.dense_rank(b:any_1, p:bit,
o:bit):int ", "SQLdense_rank;", "return the densely ranked groups"
]
[ "sql", "diff", "pattern sql.diff(b:any_1):bit ", "SQLdiff;",
"return true if cur != prev row" ]
[ "sql", "diff", "pattern sql.diff(p:bit, b:any_1):bit ",
"SQLdiff;", "return true if cur != prev row" ]
-[ "sql", "dropDeclaredTable", "pattern
sql.dropDeclaredTable(name:str):void ", "mvc_drop_declared_table_wrap;",
"drop a declared table" ]
-[ "sql", "dropDeclaredTables", "pattern
sql.dropDeclaredTables(nr:int):void ", "mvc_drop_declared_tables_wrap;",
"drop top n declared tables" ]
[ "sql", "drop_func_upgrade_oct2014", "pattern
sql.drop_func_upgrade_oct2014(id:int):int ", "UPGdrop_func;", "Drop
the function identified by id, needed for the Oct2014 upgrade" ]
[ "sql", "drop_hash", "pattern sql.drop_hash(sch:str, tbl:str):void
", "SQLdrop_hash;", "Drop hash indices for the given table" ]
[ "sql", "droporderindex", "pattern sql.droporderindex(sch:str,
tbl:str, col:str):void ", "sql_droporderindex;", "Drop the order index on a
column" ]
-[ "sql", "dtColumn", "pattern sql.dtColumn(rs:int, tname:str,
name:str, typename:str, digits:int, scale:int):void ",
"mvc_declared_table_column_wrap;", "" ]
[ "sql", "dump_cache", "pattern sql.dump_cache() (query:bat[:str],
count:bat[:int]) ", "dump_cache;", "dump the content of the query cache" ]
[ "sql", "dump_opt_stats", "pattern sql.dump_opt_stats()
(rewrite:bat[:str], count:bat[:int]) ", "dump_opt_stats;", "dump the
optimizer rewrite statistics" ]
[ "sql", "dump_trace", "pattern sql.dump_trace() (event:bat[:int],
clk:bat[:str], pc:bat[:str], thread:bat[:int], ticks:bat[:lng],
rssMB:bat[:lng], vmMB:bat[:lng], reads:bat[:lng], writes:bat[:lng],
minflt:bat[:lng], majflt:bat[:lng], nvcsw:bat[:lng], stmt:bat[:str]) ",
"dump_trace;", "dump the trace statistics" ]
@@ -10778,6 +10774,7 @@ Ready.
[ "sql", "getVariable", "pattern sql.getVariable(mvc:int,
varname:str):any_1 ", "getVariable;", "Get the value of a session variable" ]
[ "sql", "getVersion", "command sql.getVersion(clientid:int):lng ",
"mvc_getVersion;", "Return the database version identifier for a client."
]
[ "sql", "get_value", "pattern sql.get_value(sname:str,
sequence:str):lng ", "mvc_get_value;", "return the current value of the
sequence" ]
+[ "sql", "grow", "pattern sql.grow(tid:bat[:oid], X_0:any_1):int ",
"mvc_grow_wrap;", "Resize the tid column of a declared table." ]
[ "sql", "importTable", "pattern sql.importTable(sname:str, tname:str,
fname:str...):bat[:any]... ", "mvc_bin_import_table_wrap;", "Import a
table from the files (fname)" ]
[ "sql", "include", "pattern sql.include(fname:str):void ",
"SQLinclude;", "Compile and execute a sql statements on the file" ]
[ "sql", "init", "pattern sql.init():void ", "SQLinitEnvironment;",
"Initialize the environment for MAL" ]
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);
+char *ATOMformat(int id, const void *val);
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);
+char *VALformat(const ValRecord *res);
void *VALget(ValPtr v);
ValPtr VALinit(ValPtr d, int tpe, const void *s);
int VALisnil(const ValRecord *v);
@@ -368,28 +368,28 @@ 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);
cqfix_fptr cqfix_get(void);
void cqfix_set(cqfix_fptr);
-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);
@@ -401,14 +401,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);
@@ -473,17 +473,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__));
@@ -826,11 +826,11 @@ 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(const 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(const blob *b);
void BLOBheap(Heap *heap, size_t capacity);
-int BLOBlength(const blob *p);
+size_t BLOBlength(const blob *p);
str BLOBnitems(int *ret, blob *b);
const blob *BLOBnull(void);
str BLOBprelude(void *ret);
@@ -838,7 +838,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);
-int BLOBtostr(str *tostr, int *l, const blob *pin);
+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);
@@ -1144,9 +1144,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(const char *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, const char *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);
@@ -1165,7 +1165,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);
-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);
@@ -1175,7 +1175,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);
-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);
@@ -1228,7 +1228,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(const char *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);
@@ -1250,7 +1250,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, const char *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);
@@ -1716,8 +1716,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(const 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);
@@ -1848,7 +1848,7 @@ int TYPE_sqlblob;
int TYPE_timestamp;
int TYPE_tzone;
int TYPE_xml;
-int URLfromString(const char *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);
@@ -1867,10 +1867,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);
-int URLtoString(str *s, int *len, const char *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);
@@ -1878,7 +1878,7 @@ const uuid *UUIDnull(void);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
