Changeset: cbbca5bad36a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/cbbca5bad36a
Modified Files:
monetdb5/modules/mal/sysmon.c
Branch: scatter
Log Message:
hard cast for windows (which is right about the possible overflow)
diffs (24 lines):
diff --git a/monetdb5/modules/mal/sysmon.c b/monetdb5/modules/mal/sysmon.c
--- a/monetdb5/modules/mal/sysmon.c
+++ b/monetdb5/modules/mal/sysmon.c
@@ -195,7 +195,7 @@ SYSMONqueue(Client cntxt, MalBlkPtr mb,
if( i == qhead)
break;
}
- if( QRYqueue[i].query && (cntxt->user == MAL_ADMIN ||
+ if( QRYqueue[i].query && (cntxt->user == MAL_ADMIN ||
strcmp(cntxt->username,
QRYqueue[i].username) == 0) ){
qtag = (lng) QRYqueue[i].tag;
if (BUNappend(tag, &qtag, false) != GDK_SUCCEED)
@@ -239,9 +239,9 @@ SYSMONqueue(Client cntxt, MalBlkPtr mb,
else
wrk = QRYqueue[i].workers;
if( QRYqueue[i].mb)
- mem = 1 + QRYqueue[i].mb->memory /
LL_CONSTANT(1048576);
+ mem = (int)(1 + QRYqueue[i].mb->memory /
LL_CONSTANT(1048576));
else
- mem = QRYqueue[i].memory;
+ mem = (int)QRYqueue[i].memory;
if ( BUNappend(workers, &wrk, false) != GDK_SUCCEED ||
BUNappend(memory, &mem, false) != GDK_SUCCEED)
goto bailout;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
