MonetDB: default - Add a cast for CentOS 7.
Changeset: 48174832a557 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/48174832a557
Modified Files:
sql/server/rel_unnest.c
Branch: default
Log Message:
Add a cast for CentOS 7.
diffs (12 lines):
diff --git a/sql/server/rel_unnest.c b/sql/server/rel_unnest.c
--- a/sql/server/rel_unnest.c
+++ b/sql/server/rel_unnest.c
@@ -2239,7 +2239,7 @@ exp_reset_card_and_freevar_set_physical_
switch(e->type) {
case e_aggr:
case e_func: {
- e->card =
list_empty(e->l)?rel?rel->card:CARD_MULTI:exps_card(e->l);
+ e->card =
list_empty(e->l)?rel?rel->card:(unsigned)CARD_MULTI:exps_card(e->l);
} break;
case e_column: {
sql_exp *le = NULL, *re = NULL;
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Add a cast.
Changeset: fce6b9ca68cd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fce6b9ca68cd
Modified Files:
clients/mapiclient/dump.c
Branch: default
Log Message:
Add a cast.
diffs (12 lines):
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -2188,7 +2188,7 @@ dump_table(Mapi mid, const char *schema,
fprintf(stderr, "no tables matching %s.%s\n",
schema, tname);
goto doreturn;
}
- tables = malloc(rows * sizeof(struct tables));
+ tables = malloc((size_t) rows * sizeof(struct tables));
if (tables == NULL) {
mapi_close_handle(hdl);
fprintf(stderr, "malloc failure\n");
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Add a cast.
Changeset: 41ddb0aed303 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/41ddb0aed303 Modified Files: sql/backends/monet5/sql_statistics.c Branch: default Log Message: Add a cast. diffs (12 lines): diff --git a/sql/backends/monet5/sql_statistics.c b/sql/backends/monet5/sql_statistics.c --- a/sql/backends/monet5/sql_statistics.c +++ b/sql/backends/monet5/sql_statistics.c @@ -51,7 +51,7 @@ sql_set_stats(Client cntxt, MalBlkPtr mb if (getArgType(mb, pci, 4) != TYPE_lng) throw(SQL, "sql.set_stats", SQLSTATE(42000) "Wrong value type '%s'", BATatoms[getArgType(mb, pci, 4)].name); lng cnt = *getArgReference_lng(stk, pci, 4); - double est = cnt; + double est = (double) cnt; store->storage_api.set_stats_col(tr, c, , NULL, NULL); } return msg; ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Add a cast, use const char *, use designators...
Changeset: 1266171dc98e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1266171dc98e
Modified Files:
monetdb5/mal/mal_scenario.c
monetdb5/mal/mal_session.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_scenario.h
Branch: default
Log Message:
Add a cast, use const char *, use designators in struct initialization.
diffs (118 lines):
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
@@ -106,29 +106,26 @@
#endif
static struct SCENARIO scenarioRec[MAXSCEN] = {
- {"mal", "mal",
-0, 0, /* hardwired MALinit*/
-0, 0, /* implicit */
-"MALinitClient", (MALfcn) ,
-"MALexitClient", (MALfcn) ,
-"MALreader", (MALfcn) ,
-"MALparser", (MALfcn) ,
-"MALoptimizer", 0,
-0, 0,
-"MALengine", (MALfcn) ,
-"MALcallback", (MALfcn) },
- {0, 0, /* name */
-0, 0, /* init */
-0, 0, /* exit */
-0, 0, /* initClient */
-0, 0, /* exitClient */
-0, 0, /* reader */
-0, 0, /* parser */
-0, 0, /* optimizer */
-0, 0, /* scheduler */
-0, 0, /* callback */
-0, 0 /* engine */
-}
+ { .name = "mal",
+ .language = "mal",
+ .initClient = "MALinitClient",
+ .initClientCmd = (MALfcn) MALinitClient,
+ .exitClient = "MALexitClient",
+ .exitClientCmd = (MALfcn) MALexitClient,
+ .reader = "MALreader",
+ .readerCmd = (MALfcn) MALreader,
+ .parser = "MALparser",
+ .parserCmd = (MALfcn) MALparser,
+ .optimizer = "MALoptimizer",
+ .optimizerCmd = NULL,
+ .engine = "MALengine",
+ .engineCmd = (MALfcn) MALengine,
+ .callback = "MALcallback",
+ .callbackCmd = (MALfcn) MALcallback,
+ },
+ {
+ .name = NULL,
+ }
};
static str fillScenario(Client c, Scenario scen);
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -412,7 +412,7 @@ MSscheduleClient(str command, str challe
c->blocksize = blocksize;
if (!GDKembedded() && c->phase[MAL_SCENARIO_INITCLIENT]) {
- str (*init_client)(Client c, str passwd, str challenge, str
algo) = c->phase[MAL_SCENARIO_INITCLIENT];
+ str (*init_client)(Client, const char *, const char *, const
char *) = (str (*)(Client, const char *, const char *, const char *))
c->phase[MAL_SCENARIO_INITCLIENT];
if ((msg = init_client(c, passwd, challenge, algo)) !=
MAL_SUCCEED) {
mnstr_printf(fout, "!%s\n", msg);
if (passwd)
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -310,7 +310,7 @@ SQLexecPostLoginTriggers(Client c)
}
static str
-userCheckCredentials( mvc *m, Client c, str pwhash, str challenge, str algo)
+userCheckCredentials( mvc *m, Client c, const char *pwhash, const char
*challenge, const char *algo)
{
oid uid = getUserOIDByName(m, c->username);
@@ -365,7 +365,7 @@ userCheckCredentials( mvc *m, Client c,
}
static char*
-SQLprepareClient(Client c, str pwhash, str challenge, str algo)
+SQLprepareClient(Client c, const char *pwhash, const char *challenge, const
char *algo)
{
mvc *m = NULL;
backend *be = NULL;
@@ -828,7 +828,7 @@ SQLtrans(mvc *m)
}
str
-SQLinitClient(Client c, str passwd, str challenge, str algo)
+SQLinitClient(Client c, const char *passwd, const char *challenge, const char
*algo)
{
str msg = MAL_SUCCEED;
@@ -848,7 +848,7 @@ SQLinitClient(Client c, str passwd, str
}
str
-SQLinitClientFromMAL(Client c, str passwd, str challenge, str algo)
+SQLinitClientFromMAL(Client c, const char *passwd, const char *challenge,
const char *algo)
{
str msg = MAL_SUCCEED;
diff --git a/sql/backends/monet5/sql_scenario.h
b/sql/backends/monet5/sql_scenario.h
--- a/sql/backends/monet5/sql_scenario.h
+++ b/sql/backends/monet5/sql_scenario.h
@@ -22,8 +22,8 @@ sql5_export str SQLtrans(mvc *m);
sql5_export str SQLexit(Client c);
sql5_export str SQLexitClient(Client c);
sql5_export str SQLresetClient(Client c);
-sql5_export str SQLinitClient(Client c, str passwd, str challenge, str algo);
-sql5_export str SQLinitClientFromMAL(Client c, str passwd, str challenge, str
algo);
+sql5_export str SQLinitClient(Client c, const char *passwd, const char
*challenge, const char *algo);
+sql5_export str SQLinitClientFromMAL(Client c, const char *passwd, const char
MonetDB: default - Add another cast.
Changeset: 817ab6e4e472 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/817ab6e4e472
Modified Files:
gdk/gdk.h
Branch: default
Log Message:
Add another cast.
diffs (12 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1438,7 +1438,7 @@ BATsettrivprop(BAT *b)
} else if (b->batCount <= 1) {
b->tnosorted = b->tnorevsorted = 0;
b->tnokey[0] = b->tnokey[1] = 0;
- b->tunique_est = b->batCount;
+ b->tunique_est = (double) b->batCount;
if (ATOMlinear(b->ttype)) {
b->tsorted = true;
b->trevsorted = true;
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Add a cast.
Changeset: c24361fdf123 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c24361fdf123
Modified Files:
gdk/gdk.h
Branch: default
Log Message:
Add a cast.
diffs (12 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1495,7 +1495,7 @@ BATsettrivprop(BAT *b)
b->tkey = c != 0;
b->tnokey[0] = 0;
b->tnokey[1] = !b->tkey;
- b->tunique_est = 1 + b->tkey;
+ b->tunique_est = (double) (1 + b->tkey);
} else if (!ATOMlinear(b->ttype)) {
b->tsorted = false;
b->trevsorted = false;
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - Add a cast.
Changeset: ab405cca73dc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ab405cca73dc
Modified Files:
monetdb5/modules/kernel/batmmath.c
Branch: default
Log Message:
Add a cast.
diffs (19 lines):
diff --git a/monetdb5/modules/kernel/batmmath.c
b/monetdb5/modules/kernel/batmmath.c
--- a/monetdb5/modules/kernel/batmmath.c
+++ b/monetdb5/modules/kernel/batmmath.c
@@ -381,13 +381,13 @@ CMDscience_bat_##FUNC(Client cntxt, MalB
static double
cot(double x)
{
- return (1/tan(x));
+ return 1 / tan(x);
}
static float
cotf(float x)
{
- return (1/tan(x));
+ return (float) (1 / tan(x));
}
static double
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Add a cast.
Changeset: b2400e2de214 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2400e2de214 Modified Files: gdk/gdk_aggr.c Branch: default Log Message: Add a cast. diffs (12 lines): diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c --- a/gdk/gdk_aggr.c +++ b/gdk/gdk_aggr.c @@ -2700,7 +2700,7 @@ BATcalcavg(BAT *b, BAT *s, dbl *avg, BUN if (scale != 0 && !is_dbl_nil(*avg)) *avg *= pow(10.0, (double) scale); if (vals) - *vals = n; + *vals = (BUN) n; return GDK_SUCCEED; } ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Add a cast.
Changeset: ec5478d67c3c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ec5478d67c3c Modified Files: gdk/gdk_atomic.h Branch: default Log Message: Add a cast. diffs (19 lines): diff --git a/gdk/gdk_atomic.h b/gdk/gdk_atomic.h --- a/gdk/gdk_atomic.h +++ b/gdk/gdk_atomic.h @@ -147,6 +147,7 @@ ATOMIC_CAS(ATOMIC_TYPE *var, ATOMIC_BASE *exp = old; return false; } +#define ATOMIC_CAS(var, exp, des) ATOMIC_CAS(var, exp, (ATOMIC_BASE_TYPE) (des)) #define ATOMIC_ADD(var, val) _InterlockedExchangeAdd64(var, (ATOMIC_BASE_TYPE) (val)) #define ATOMIC_SUB(var, val) _InterlockedExchangeAdd64(var, -(ATOMIC_BASE_TYPE) (val)) #define ATOMIC_INC(var)_InterlockedIncrement64(var) @@ -183,6 +184,7 @@ ATOMIC_CAS(ATOMIC_TYPE *var, ATOMIC_BASE *exp = old; return false; } +#define ATOMIC_CAS(var, exp, des) ATOMIC_CAS(var, exp, (ATOMIC_BASE_TYPE) (des)) #define ATOMIC_ADD(var, val) _InterlockedExchangeAdd(var, (ATOMIC_BASE_TYPE) (val)) #define ATOMIC_SUB(var, val) _InterlockedExchangeAdd(var, -(ATOMIC_BASE_TYPE) (val)) #define ATOMIC_INC(var)_InterlockedIncrement(var) ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Add a cast.
Changeset: d0b9da0ec1a4 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d0b9da0ec1a4
Modified Files:
sql/backends/monet5/sql.c
Branch: default
Log Message:
Add a cast.
diffs (12 lines):
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -4515,7 +4515,7 @@ sql_storage(Client cntxt, MalBlkPtr mb,
} else if
(ATOMvarsized(bn->ttype)) {
sz =
BATcount(bn);
if (sz
> 0)
-
w = (bn->tvheap->free + sz / 2) / sz;
+
w = (int) ((bn->tvheap->free + sz / 2) / sz);
else
w = 0;
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Add a cast.
Changeset: 3df0cc1d3ce9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3df0cc1d3ce9
Modified Files:
monetdb5/mal/mal_resource.c
Branch: default
Log Message:
Add a cast.
diffs (12 lines):
diff --git a/monetdb5/mal/mal_resource.c b/monetdb5/mal/mal_resource.c
--- a/monetdb5/mal/mal_resource.c
+++ b/monetdb5/mal/mal_resource.c
@@ -194,7 +194,7 @@ MALresourceFairness(lng usec)
clk = clk > FAIRNESS_THRESHOLD? FAIRNESS_THRESHOLD:clk;
/* always keep one running to avoid all waiting */
- while (clk > DELAYUNIT && users > 1 && mal_running > GDKnr_threads &&
rss > MEMORY_THRESHOLD) {
+ while (clk > DELAYUNIT && users > 1 && mal_running > (ATOMIC_TYPE)
GDKnr_threads && rss > MEMORY_THRESHOLD) {
if ( delayed++ == 0){
PARDEBUG mnstr_printf(GDKstdout, "#delay
initial ["LLFMT"] memory "SZFMT"[%f]\n", clk, rss, MEMORY_THRESHOLD );
PARDEBUG mnstr_flush(GDKstdout);
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Add a cast.
Changeset: 2a60e4f4c966 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2a60e4f4c966
Modified Files:
gdk/gdk_project.c
Branch: default
Log Message:
Add a cast.
diffs (12 lines):
diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -591,7 +591,7 @@ BATprojectchain(BAT **bats)
GDKerror("BATprojectchain: does
not match always\n");
goto bunins_failed;
}
- *v++ = o + offset;
+ *v++ = (oid) (o + offset);
}
}
} else {
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Add a cast.
Changeset: 915e51872e90 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=915e51872e90
Modified Files:
gdk/gdk_join.c
Branch: default
Log Message:
Add a cast.
diffs (21 lines):
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -1286,7 +1286,7 @@ mergejoin(BAT *r1, BAT *r2, BAT *l, BAT
if (only_misses) {
if (lcand) {
while (nlx > 0) {
- APPEND(r1, lcand[-nlx]);
+ APPEND(r1,
lcand[-(ssize_t)nlx]);
nlx--;
}
} else {
@@ -1309,7 +1309,7 @@ mergejoin(BAT *r1, BAT *r2, BAT *l, BAT
}
if (lcand) {
while (nlx > 0) {
- APPEND(r1, lcand[-nlx]);
+ APPEND(r1,
lcand[-(ssize_t)nlx]);
APPEND(r2, oid_nil);
nlx--;
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Add a cast to debug message.
Changeset: 80681ad54bf8 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=80681ad54bf8 Modified Files: gdk/gdk_heap.c Branch: default Log Message: Add a cast to debug message. diffs (12 lines): diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c --- a/gdk/gdk_heap.c +++ b/gdk/gdk_heap.c @@ -568,7 +568,7 @@ HEAPfree(Heap *h, int remove) HEAPDEBUG fprintf(stderr, #munmap(base= PTRFMT , size= SZFMT ) = %d\n, PTRFMTCAST(void *)h-base, - h-size, ret); + h-size, (int) ret); } } h-base = NULL; ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Add a cast to debug message.
Changeset: 4572d5bbe27e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4572d5bbe27e Modified Files: gdk/gdk_private.h Branch: default Log Message: Add a cast to debug message. diffs (12 lines): diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h --- a/gdk/gdk_private.h +++ b/gdk/gdk_private.h @@ -406,7 +406,7 @@ GDKmunmap_debug(void *ptr, size_t len, c gdk_return res = GDKmunmap(ptr, len); ALLOCDEBUG fprintf(stderr, #GDKmunmap( PTRFMT , SZFMT ) - %d [%s:%d]\n, - PTRFMTCAST ptr, len, res, filename, lineno); + PTRFMTCAST ptr, len, (int) res, filename, lineno); return res; } #define GDKmunmap(p, l)GDKmunmap_debug((p), (l), __FILE__, __LINE__) ___ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Add a cast.
Changeset: 9a7e90abee11 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9a7e90abee11
Modified Files:
monetdb5/modules/mal/joinpath.c
Branch: default
Log Message:
Add a cast.
diffs (21 lines):
diff --git a/monetdb5/modules/mal/joinpath.c b/monetdb5/modules/mal/joinpath.c
--- a/monetdb5/modules/mal/joinpath.c
+++ b/monetdb5/modules/mal/joinpath.c
@@ -212,7 +212,7 @@ ALGjoinChain(Client cntxt, int top, BAT
oc = *(oid *) BUNtail(iter[0], lo);
for(i = 1; i pcol; i++)
if (oc + offset[i] size[i]) {
- v = BUNtail(iter[i], oc + offset[i]);
+ v = BUNtail(iter[i], (BUN) (oc + offset[i]));
oc = *(oid*) v;
if (oc == oid_nil)
goto bunins_failed;
@@ -222,7 +222,7 @@ ALGjoinChain(Client cntxt, int top, BAT
continue;
// update the join result and keep track of properties
if (oc + offset[pcol] size[pcol]){
- v = BUNtail(iter[pcol], oc + offset[pcol]);
+ v = BUNtail(iter[pcol], (BUN) (oc + offset[pcol]));
bunfastapp(bn,v);
cnt++;
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Add a cast.
Changeset: 529f2045e5ae for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=529f2045e5ae
Modified Files:
gdk/gdk_atoms.c
Branch: default
Log Message:
Add a cast.
diffs (12 lines):
diff --git a/gdk/gdk_atoms.c b/gdk/gdk_atoms.c
--- a/gdk/gdk_atoms.c
+++ b/gdk/gdk_atoms.c
@@ -1665,7 +1665,7 @@ OIDdirty(void)
{
int ret;
MT_lock_set(MT_system_lock, OIDdirty);
- ret = ATOMIC_GET(GDKoid, GDKoidLock, OIDdirty) GDKflushed;
+ ret = (oid) ATOMIC_GET(GDKoid, GDKoidLock, OIDdirty) GDKflushed;
MT_lock_unset(MT_system_lock, OIDdirty);
return ret;
}
___
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
