Changeset: b2bbd8dc2710 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2bbd8dc2710
Branch: default
Log Message:
merged
diffs (truncated from 6077 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
@@ -687,7 +687,6 @@ int mo_system_config(opt **Set, int setl
const char *wsaerror(int);
# monetdb5
-str ALGprojectionpath(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str AUTHaddRemoteTableCredentials(const char *local_table, const char
*localuser, const char *uri, const char *remoteuser, const char *pass, bool
pw_encrypted);
str AUTHaddUser(oid *ret, Client c, const char *user, const char *pass);
str AUTHchangePassword(Client c, const char *oldpass, const char *passwd);
@@ -815,8 +814,6 @@ str CMDgetUserTime(lng *ret);
str CMDgetprofilerlimit(int *res);
str CMDnoopProfiler(void *res);
str CMDopenProfilerStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str CMDqgramnormalize(str *res, str *input);
-str CMDqgramselfjoin(bat *res1, bat *res2, bat *qid, bat *bid, bat *pid, bat
*lid, flt *c, int *k);
str CMDsetHeartbeat(void *res, int *ev);
str CMDsetName(str *rname, const bat *b, str *name);
str CMDsetprofilerlimit(void *res, int *lim);
@@ -824,16 +821,8 @@ str CMDstartProfiler(Client cntxt, MalBl
str CMDstartTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDstopProfiler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDstopTrace(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CMDstr2qgrams(bat *ret, str *val);
str COPYrejects(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str COPYrejects_clear(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str FCTgetArrival(bat *ret);
-str FCTgetCaller(int *ret);
-str FCTgetDeparture(bat *ret);
-str FCTgetOwners(bat *ret);
-str FCTgetPlants(bat *ret, bat *ret2);
-str FCTshutdown(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str GROUPmulticolumngroup(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
str GRPgroup1(bat *ngid, bat *next, bat *nhis, const bat *bid);
str GRPgroup11(bat *ngid, const bat *bid);
str GRPgroup2(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *sid);
@@ -852,26 +841,6 @@ str GRPsubgroup6(bat *ngid, bat *next, c
str GRPsubgroup7(bat *ngid, bat *next, const bat *bid, const bat *sid, const
bat *gid);
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 INSPECTatom_names(bat *ret);
-str INSPECTatom_sizes(bat *ret);
-str INSPECTatom_sup_names(bat *ret);
-str INSPECTequalType(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str INSPECTgetAllAddresses(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str INSPECTgetAllFunctions(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str INSPECTgetAllModules(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str INSPECTgetAllSignatures(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-str INSPECTgetComment(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str INSPECTgetDefinition(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str INSPECTgetEnvironment(bat *ret, bat *ret2);
-str INSPECTgetEnvironmentKey(str *ret, str *key);
-str INSPECTgetFunctionSize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
-str INSPECTgetSignature(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str INSPECTgetSize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str INSPECTgetSource(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str INSPECTgetkind(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str INSPECTshowFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str INSPECTshowFunction3(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
-str INSPECTtypeName(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str IOexport(void *ret, bat *bid, str *fnme);
str IOimport(void *ret, bat *bid, str *fnme);
str IOprint_val(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
@@ -879,17 +848,6 @@ str IOprintf(Client cntxt, MalBlkPtr mb,
str IOprintfStream(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str IOsetmallocsuccesscount(void *res, lng *nbytes);
str IOtable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ITRbunIterator(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ITRbunNext(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str ITRnewChunk(lng *res, bat *vid, bat *bid, lng *granule);
-str ITRnextChunk(lng *res, bat *vid, bat *bid, lng *granule);
-str ITRnext_dbl(dbl *i, dbl *step, dbl *last);
-str ITRnext_flt(flt *i, flt *step, flt *last);
-str ITRnext_hge(hge *i, hge *step, hge *last);
-str ITRnext_int(int *i, int *step, int *last);
-str ITRnext_lng(lng *i, lng *step, lng *last);
-str ITRnext_oid(oid *i, oid *step, oid *last);
-str ITRnext_sht(sht *i, sht *step, sht *last);
str MACROprocessor(Client cntxt, MalBlkPtr mb, Symbol t);
int MAL_MAXCLIENTS;
int MALadmission_claim(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci, lng argclaim);
@@ -907,10 +865,6 @@ str MALreader(Client c);
str MANIFOLDevaluate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str MANIFOLDremapMultiplex(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
p);
MALfcn MANIFOLDtypecheck(Client cntxt, MalBlkPtr mb, InstrPtr pci, int
checkprops);
-str MANUALcreateOverview(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str MATpack(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MATpackIncrement(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MATpackValues(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
int MCactiveClients(void);
str MCawakeClient(int id);
void MCcloseClient(Client c);
@@ -921,13 +875,6 @@ int MCpushClientInput(Client c, bstream
void MCstopClients(Client c);
str MCsuspendClient(int id);
int MCvalid(Client c);
-str MKEYbathash(bat *res, const bat *bid);
-str MKEYbulk_rotate_xor_hash(bat *ret, const bat *hid, const int *nbits, const
bat *bid);
-str MKEYbulkconst_rotate_xor_hash(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
-str MKEYconstbulk_rotate_xor_hash(bat *ret, const lng *h, const int *nbits,
const bat *bid);
-str MKEYhash(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
-str MKEYrotate(lng *ret, const lng *v, const int *nbits);
-str MKEYrotate_xor_hash(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p);
void MPresetProfiler(stream *fdout);
char *MSP_locate_sqlscript(const char *mod_name, bit recurse);
str MSinitClientPrg(Client cntxt, str mod, str nme);
@@ -1003,24 +950,6 @@ int QLOGisset(void);
str QLOGissetFcn(int *ret);
str QOToptimize(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
QueryQueue QRYqueue;
-str RMTbatload(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTbincopyfrom(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTbincopyto(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTbintype(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTconnect(str *ret, str *uri, str *user, str *passwd);
-str RMTconnectScen(str *ret, str *ouri, str *user, str *passwd, str *scen);
-str RMTconnectTable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTdisconnect(void *ret, str *conn);
-str RMTepilogue(void *ret);
-str RMTexec(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTget(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTisalive(int *ret, str *conn);
-str RMTprelude(void *ret);
-str RMTput(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTregister(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str RMTregisterSupervisor(int *ret, str *sup_uuid, str *query_uuid);
-str RMTresolve(bat *ret, str *pat);
-str SAMPLEuniform(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str SERVERbindBAT(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str SERVERclient(void *res, const Stream *In, const Stream *Out);
str SERVERconnect(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pc);
@@ -1111,11 +1040,6 @@ str STRsubstring(str *ret, const str *s,
str STRsubstringTail(str *ret, const str *s, const int *start);
str STRsuffix(str *ret, const str *s, const int *l);
str STRtostr(str *res, const str *src);
-str SYSMONpause(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str SYSMONqueue(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str SYSMONresume(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str SYSMONstatistics(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str SYSMONstop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str SYScpuStatistics(bat *ret, bat *ret2);
str SYSgdkEnv(bat *ret, bat *ret2);
str SYSgdkThread(bat *ret, bat *ret2);
@@ -1144,16 +1068,6 @@ str TKNZRgetLevel(bat *r, int *level);
str TKNZRlocate(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str TKNZRopen(void *r, str *name);
str TKNZRtakeOid(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str TRACERcomp_info(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str TRACERflush_buffer(void *ret);
-str TRACERreset_adapter(void *ret);
-str TRACERreset_component_level(void *ret, str *comp_id);
-str TRACERreset_flush_level(void *ret);
-str TRACERreset_layer_level(void *ret, str *layer_id);
-str TRACERset_adapter(void *ret, str *adapter_id);
-str TRACERset_component_level(void *ret, str *comp_id, str *lvl_id);
-str TRACERset_flush_level(void *ret, str *lvl_id);
-str TRACERset_layer_level(void *ret, str *layer_id, str *lvl_id);
int TRACEtable(Client cntxt, BAT **r);
str TRNglobal_abort(bit *ret);
str TRNglobal_commit(bit *ret);
@@ -1371,8 +1285,6 @@ void freeStack(MalStkPtr stk);
void freeSymbol(Symbol s);
void freeSymbolList(Symbol s);
void freeVariable(MalBlkPtr mb, int varid);
-str fstrcmp0_impl(dbl *ret, str *string1, str *string2);
-str fstrcmp_impl(dbl *ret, str *string1, str *string2, dbl *minimum);
void garbageCollector(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int flag);
void garbageElement(Client cntxt, ValPtr v);
str generatorRef;
@@ -1496,9 +1408,6 @@ str languageRef;
str last_valueRef;
str leadRef;
str leftjoinRef;
-str levenshtein_impl(int *result, str *s, str *t, int *insdel_cost, int
*replace_cost, int *transpose_cost);
-str levenshteinbasic2_impl(int *result, str *s, str *t);
-str levenshteinbasic_impl(int *result, str *s, str *t);
str likeRef;
str likejoinRef;
str likeselectRef;
@@ -1770,7 +1679,6 @@ void slash_2_dir_sep(str fname);
str sliceRef;
str sortRef;
str sortReverseRef;
-str soundex_impl(str *res, str *Name);
void sqlProfilerEvent(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str sqlRef;
str sqlcatalogRef;
@@ -1785,7 +1693,6 @@ void strAfterCall(ValPtr v, ValPtr bak);
void strBeforeCall(ValPtr v, ValPtr bak);
str strRef;
str streamsRef;
-str stringdiff_impl(int *res, str *s1, str *s2);
str subavgRef;
str subcountRef;
str subdeltaRef;
diff --git a/cmake/monetdb-toolchain.cmake b/cmake/monetdb-toolchain.cmake
--- a/cmake/monetdb-toolchain.cmake
+++ b/cmake/monetdb-toolchain.cmake
@@ -46,7 +46,6 @@ function(monetdb_default_toolchain)
MT_checkCompilerFlag("-Wvariadic-macros")
MT_checkCompilerFlag("-Wstack-protector")
MT_checkCompilerFlag("-fstack-protector-all")
- MT_checkCompilerFlag("-Wstack-protector")
MT_checkCompilerFlag("-Wpacked-bitfield-compat")
MT_checkCompilerFlag("-Wsync-nand")
MT_checkCompilerFlag("-Wjump-misses-init")
@@ -139,7 +138,6 @@ function(monetdb_default_compiler_option
add_option_if_available("-Wvariadic-macros")
add_option_if_available("-Wstack-protector")
add_option_if_available("-fstack-protector-all")
- add_option_if_available("-Wstack-protector")
add_option_if_available("-Wpacked-bitfield-compat")
add_option_if_available("-Wsync-nand")
add_option_if_available("-Wjump-misses-init")
@@ -157,6 +155,8 @@ function(monetdb_default_compiler_option
elseif(${CMAKE_C_COMPILER_ID} STREQUAL "Intel")
if(WIN32)
add_compile_options("/W3")
+ add_compile_options("/Qdiag-disable:11074")
+ add_compile_options("/Qdiag-disable:11075")
add_compile_options("/Wcheck")
add_compile_options("/Werror-all")
add_compile_options("/${INTEL_OPTION_EXTRA}wd2259")
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -73,7 +73,7 @@ static pthread_key_t tl_error_key;
static int
tl_error_init(void)
{
- if (pthread_key_create(&tl_error_key, free) < 0)
+ if (pthread_key_create(&tl_error_key, free) != 0)
return -1;
return 0;
}
@@ -403,26 +403,27 @@ my_strerror_r(int error_nr, char *buf, s
// 1. no strerror_r
// 2. gnu strerror_r (returns char* and does not always fill buffer)
// 3. xsi strerror_r (returns int and always fills the buffer)
- char *ret;
+ char *to_move;
#ifndef HAVE_STRERROR_R
// Hope for the best
- ret = strerror(error_nr);
-#else
-#ifdef STRERROR_R_CHAR_P
- // gnu strerror_r
- ret = strerror_r(error_nr, buf, buflen);
+ to_move = strerror(error_nr);
+#elif !defined(_GNU_SOURCE) || !_GNU_SOURCE
+ // standard strerror_r always writes to buf
+ int result_code = strerror_r(error_nr, buf, buflen);
+ if (result_code == 0)
+ to_move = NULL;
+ else
+ to_move = "<failed to retrieve error message>";
#else
- // standard strerror_r
- (void) strerror_r(error_nr, buf, buflen);
- ret = NULL;
+ // gnu strerror_r sometimes only returns static string, needs copy
+ to_move = strerror_r(error_nr, buf, buflen);
#endif
-#endif
- if (ret != NULL) {
+ if (to_move != NULL) {
// move to buffer
- size_t size = strlen(ret) + 1;
+ size_t size = strlen(to_move) + 1;
assert(size <= buflen);
// strerror_r may have return a pointer to/into the buffer
- memmove(buf, ret, size);
+ memmove(buf, to_move, size);
return size - 1;
} else {
return strlen(buf);
@@ -945,4 +946,3 @@ mnstr_read_block(stream *restrict s, voi
return -1;
return len;
}
-
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -83,12 +83,13 @@ checkbats(BAT *b1, BAT *b2, const char *
#define BINARY_3TYPE_FUNC(TYPE1, TYPE2, TYPE3, FUNC) \
do { \
+ i = j = 0; \
if (ci1->tpe == cand_dense && ci2->tpe == cand_dense) { \
for (k = 0; k < ci1->ncand; k++) { \
- x1 = canditer_next_dense(ci1) - candoff1; \
- x2 = canditer_next_dense(ci2) - candoff2; \
- i = x1 * incr1; \
- j = x2 * incr2; \
+ if (incr1) \
+ i = canditer_next_dense(ci1) -
candoff1; \
+ if (incr2) \
+ j = canditer_next_dense(ci2) -
candoff2; \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
