Changeset: 9b4ac96e4d7e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9b4ac96e4d7e
Modified Files:
sql/server/sql_parser.y
Branch: optimizer-testing
Log Message:
merged with jun2023
diffs (246 lines):
diff --git a/geom/monetdb5/geomBulk.c b/geom/monetdb5/geomBulk.c
--- a/geom/monetdb5/geomBulk.c
+++ b/geom/monetdb5/geomBulk.c
@@ -1259,7 +1259,6 @@ wkbFilter_bat(bat *aBATfiltered_id, bat
bit outBIT;
BATiter aBAT_iter, bBAT_iter;
BUN i = 0;
- int remainingElements = 0;
//get the descriptor of the BAT
if ((aBAT = BATdescriptor(*aBAT_id)) == NULL) {
@@ -1318,7 +1317,6 @@ wkbFilter_bat(bat *aBATfiltered_id, bat
BBPunfix(bBATfiltered->batCacheid);
throw(MAL, "batgeom.MBRfilter", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
}
- remainingElements++;
}
}
bat_iterator_end(&aBAT_iter);
@@ -1348,7 +1346,6 @@ wkbFilter_geom_bat(bat *BATfiltered_id,
BATiter BAToriginal_iter;
BUN i = 0;
mbr *geomMBR;
- int remainingElements = 0;
str err = NULL;
//get the descriptor of the BAT
@@ -1406,7 +1403,6 @@ wkbFilter_geom_bat(bat *BATfiltered_id,
GDKfree(MBRoriginal);
throw(MAL, "batgeom.MBRfilter", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
}
- remainingElements++;
}
GDKfree(MBRoriginal);
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -105,7 +105,7 @@ mal_export const char *mal_version(void)
#define VARRETS 2
typedef int malType;
-typedef str (*MALfcn) ();
+typedef str (*MALfcn) (ptr v, ...);
typedef struct SYMDEF {
struct SYMDEF *peer; /* where to look next */
diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h
--- a/monetdb5/mal/mal_client.h
+++ b/monetdb5/mal/mal_client.h
@@ -46,6 +46,7 @@ typedef struct CLIENT_INPUT {
struct CLIENT;
typedef str (*init_client)(struct CLIENT *, const char *, const char *, const
char *);
+typedef str (*exit_client)(struct CLIENT *);
typedef void (*engine_fptr)(struct CLIENT *);
typedef struct CLIENT {
@@ -63,7 +64,7 @@ typedef struct CLIENT {
str scenario; /* scenario management references */
engine_fptr engine;
init_client initClient;
- MALfcn exitClient;
+ exit_client exitClient;
/* if set to 'S' it will put
the process to sleep */
bit sqlprofiler; /* control off-line sql
performance monitoring */
/*
diff --git a/monetdb5/mal/mal_instruction.h b/monetdb5/mal/mal_instruction.h
--- a/monetdb5/mal/mal_instruction.h
+++ b/monetdb5/mal/mal_instruction.h
@@ -217,4 +217,5 @@ mal_export void strBeforeCall(ValPtr v,
mal_export void strAfterCall(ValPtr v, ValPtr bak);
mal_export void batBeforeCall(ValPtr v, ValPtr bak);
mal_export void batAfterCall(ValPtr v, ValPtr bak);
+
#endif /* _MAL_INSTR_H */
diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c
--- a/monetdb5/mal/mal_interpreter.c
+++ b/monetdb5/mal/mal_interpreter.c
@@ -47,7 +47,7 @@ malCommandCall(MalStkPtr stk, InstrPtr p
switch (pci->argc) {
case 0:
- ret = (*pci->fcn)();
+ ret = (*(str (*)())pci->fcn)();
break;
case 1:
ret = (*pci->fcn)(
diff --git a/monetdb5/mal/mal_scenario.c b/monetdb5/mal/mal_scenario.c
--- a/monetdb5/mal/mal_scenario.c
+++ b/monetdb5/mal/mal_scenario.c
@@ -80,7 +80,7 @@ static struct SCENARIO scenarioRec[MAXSC
.initClient = "MALinitClient",
.initClientCmd = (init_client) MALinitClient,
.exitClient = "MALexitClient",
- .exitClientCmd = (MALfcn) MALexitClient,
+ .exitClientCmd = (exit_client) MALexitClient,
.engine = "MALengine",
.engineCmd = (engine_fptr)MALengine,
},
diff --git a/monetdb5/mal/mal_scenario.h b/monetdb5/mal/mal_scenario.h
--- a/monetdb5/mal/mal_scenario.h
+++ b/monetdb5/mal/mal_scenario.h
@@ -28,7 +28,7 @@ typedef struct SCENARIO {
str initClient;
init_client initClientCmd;
str exitClient;
- MALfcn exitClientCmd;
+ exit_client exitClientCmd;
str engine;
engine_fptr engineCmd;
} *Scenario;
diff --git a/monetdb5/modules/atoms/json.c b/monetdb5/modules/atoms/json.c
--- a/monetdb5/modules/atoms/json.c
+++ b/monetdb5/modules/atoms/json.c
@@ -1668,7 +1668,6 @@ static str
JSONunfoldContainer(JSON *jt, int idx, BAT *bo, BAT *bk, BAT *bv, oid *o)
{
int i, last;
- int cnt = 0;
char *r;
last = jt->elm[idx].tail;
@@ -1716,7 +1715,6 @@ JSONunfoldContainer(JSON *jt, int idx, B
goto memfail;
}
(*o)++;
- cnt++;
if (i == last)
break;
}
diff --git a/monetdb5/modules/mal/manifold.c b/monetdb5/modules/mal/manifold.c
--- a/monetdb5/modules/mal/manifold.c
+++ b/monetdb5/modules/mal/manifold.c
@@ -59,7 +59,7 @@ typedef struct{
do {
\
Type *v = (Type*) mut->args[0].first;
\
for (;;) {
\
- msg = (*mut->pci->fcn)(v, __VA_ARGS__);
\
+ msg = (*((str (*)(Type *, ...))mut->pci->fcn))(v,
__VA_ARGS__); \
if (msg) break;
\
if (++oo == olimit)
\
break;
\
@@ -107,7 +107,7 @@ typedef struct{
case TYPE_str:
\
default: {
\
for (;;) {
\
- msg = (*mut->pci->fcn)(&y, __VA_ARGS__);
\
+ msg = (*((str (*)(str *, ...))mut->pci->fcn))(&y,
__VA_ARGS__); \
if (msg)
\
break;
\
if (bunfastapp(mut->args[0].b, (void*) y) !=
GDK_SUCCEED) \
diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -465,7 +465,6 @@ output_file_default(Tablet *as, BAT *ord
char *localbuf = GDKmalloc(len);
BUN p, q;
oid id;
- BUN i = 0;
BUN offset = as->offset;
if (buf == NULL || localbuf == NULL) {
@@ -479,7 +478,6 @@ output_file_default(Tablet *as, BAT *ord
GDKfree(localbuf);
return res;
}
- i++;
}
GDKfree(localbuf);
GDKfree(buf);
diff --git a/monetdb5/optimizer/opt_pipes.c b/monetdb5/optimizer/opt_pipes.c
--- a/monetdb5/optimizer/opt_pipes.c
+++ b/monetdb5/optimizer/opt_pipes.c
@@ -454,7 +454,7 @@ addOptimizerPipe(Client cntxt, MalBlkPtr
p = newFcnCall(mb, optimizerRef, pipes[i].def[j]);
if (p == NULL)
throw(MAL, "optimizer.addOptimizerPipe",
SQLSTATE(HY013) MAL_MALLOC_FAIL);
- p->fcn = OPTwrapper;
+ p->fcn = (MALfcn)OPTwrapper;
p->token = PATcall;
pushInstruction(mb, p);
}
diff --git a/sql/backends/monet5/sql_user.c b/sql/backends/monet5/sql_user.c
--- a/sql/backends/monet5/sql_user.c
+++ b/sql/backends/monet5/sql_user.c
@@ -221,9 +221,9 @@ parse_schema_path_str(mvc *m, str schema
throw(SQL, "sql.schema_path",
SQLSTATE(HY013) MAL_MALLOC_FAIL);
}
if (strcmp(next_schema, "sys") == 0)
- m->schema_path_has_sys = 1;
+ m->schema_path_has_sys = true;
else if (strcmp(next_schema, "tmp") ==
0)
- m->schema_path_has_tmp = 1;
+ m->schema_path_has_tmp = true;
}
bp = 0;
diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -1370,7 +1370,7 @@ create_trigger(sql_query *query, dlist *
if (old_name)
stack_update_rel_view(sql, old_name,
new_name?rel_dup(rel):rel);
}
- sql->use_views = 1; /* leave the 'use_views' hack to where it belongs */
+ sql->use_views = true; /* leave the 'use_views' hack to where it
belongs */
sql->session->schema = ss;
sq = sequential_block(query, NULL, NULL, stmts, NULL, 1);
sql->session->schema = old_schema;
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -840,7 +840,7 @@ mvc_create(sql_store *store, sql_allocat
list_destroy(m->schema_path);
return NULL;
}
- m->schema_path_has_sys = 1;
+ m->schema_path_has_sys = true;
m->schema_path_has_tmp = 0;
m->store = store;
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -811,6 +811,7 @@ SQLCODE SQLERROR UNDER WHENEVER
sqlstmt:
sql SCOLON
{
+ (void)yynerrs;
if (m->sym) {
append_symbol(m->sym->data.lval, $$);
$$ = m->sym;
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -97,6 +97,9 @@ endif(HAVE_GETENTROPY)
if (NOT WIN32)
set(NOT_WIN32_FALSE "#")
endif()
+if (SANITIZER)
+ set(SANITIZER_FALSE "#")
+endif()
configure_file(Mtest.py.in
${CMAKE_CURRENT_BINARY_DIR}/Mtest.py
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
