MonetDB: Nov2019 - Fix compilation problem

[Martin Kersten]

Changeset: 782b28eb638d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=782b28eb638d
Modified Files:
        monetdb5/mal/mal_runtime.c
        monetdb5/mal/mal_runtime.h
        monetdb5/modules/mal/sysmon.c
Branch: Nov2019
Log Message:

Fix compilation problem


diffs (73 lines):

diff --git a/monetdb5/mal/mal_runtime.c b/monetdb5/mal/mal_runtime.c
--- a/monetdb5/mal/mal_runtime.c
+++ b/monetdb5/mal/mal_runtime.c
@@ -28,7 +28,7 @@
 
 // Keep a queue of running queries
 QueryQueue QRYqueue;
-int qtop;
+lng qtop;
 static lng qsize, qtag= 1;
 
 #define QRYreset(I)\
@@ -68,7 +68,7 @@ static str isaSQLquery(MalBlkPtr mb){
 void
 runtimeProfileInit(Client cntxt, MalBlkPtr mb, MalStkPtr stk)
 {
-       int i;
+       lng i;
        str q;
        QueryQueue tmp;
 
@@ -76,7 +76,7 @@ runtimeProfileInit(Client cntxt, MalBlkP
        tmp = QRYqueue;
        if ( QRYqueue == 0)
                QRYqueue = (QueryQueue) GDKzalloc( sizeof (struct QRYQUEUE) * 
(qsize= 1024));
-       else if ( qtop +1 == qsize )
+       else if ( qtop + 1 == qsize )
                QRYqueue = (QueryQueue) GDKrealloc( QRYqueue, sizeof (struct 
QRYQUEUE) * (qsize += 256));
        if ( QRYqueue == NULL){
                addMalException(mb,"runtimeProfileInit" MAL_MALLOC_FAIL);
@@ -116,7 +116,7 @@ runtimeProfileInit(Client cntxt, MalBlkP
 void
 runtimeProfileFinish(Client cntxt, MalBlkPtr mb, MalStkPtr stk)
 {
-       int i,j;
+       lng i,j;
 
        (void) cntxt;
        (void) mb;
@@ -146,7 +146,7 @@ runtimeProfileFinish(Client cntxt, MalBl
 void
 finishSessionProfiler(Client cntxt)
 {
-       int i,j;
+       lng i,j;
 
        (void) cntxt;
 
diff --git a/monetdb5/mal/mal_runtime.h b/monetdb5/mal/mal_runtime.h
--- a/monetdb5/mal/mal_runtime.h
+++ b/monetdb5/mal/mal_runtime.h
@@ -34,7 +34,7 @@ typedef struct QRYQUEUE{
        time_t start;
        lng runtime;
 } *QueryQueue;
-mal_export int qtop;
+mal_export lng qtop;
 
 mal_export void runtimeProfileInit(Client cntxt, MalBlkPtr mb, MalStkPtr stk);
 mal_export void runtimeProfileFinish(Client cntxt, MalBlkPtr mb, MalStkPtr 
stk);
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
@@ -29,7 +29,8 @@ SYSMONqueue(Client cntxt, MalBlkPtr mb, 
        bat *o = getArgReference_bat(stk,pci,6);
        bat *q = getArgReference_bat(stk,pci,7);
        time_t now;
-       int i, prog;
+       lng i;
+       int prog;
        str usr;
        timestamp tsn;
        str msg = MAL_SUCCEED;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list