Changeset: 164849ee9934 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=164849ee9934
Modified Files:
sql/backends/monet5/sql_basket.c
sql/backends/monet5/sql_basket.h
sql/backends/monet5/sql_cquery.c
Branch: timetrails
Log Message:
Compilation issues
diffs (45 lines):
diff --git a/sql/backends/monet5/sql_basket.c b/sql/backends/monet5/sql_basket.c
--- a/sql/backends/monet5/sql_basket.c
+++ b/sql/backends/monet5/sql_basket.c
@@ -768,7 +768,7 @@ BSKTstatus (Client cntxt, MalBlkPtr mb,
for (i = 1; i < bsktTop; i++)
if (baskets[i].table) {
bn = BSKTbindColumn(baskets[i].schema,
baskets[i].table, baskets[i].cols[0]);
- baskets[i].events = bn ? (lng) BATcount( bn): 0;
+ baskets[i].events = bn ? BATcount( bn): 0;
if( BUNappend(seen, &baskets[i].seen, FALSE) !=
GDK_SUCCEED ||
BUNappend(schema, baskets[i].schema, FALSE) !=
GDK_SUCCEED ||
BUNappend(table, baskets[i].table, FALSE) !=
GDK_SUCCEED ||
diff --git a/sql/backends/monet5/sql_basket.h b/sql/backends/monet5/sql_basket.h
--- a/sql/backends/monet5/sql_basket.h
+++ b/sql/backends/monet5/sql_basket.h
@@ -40,7 +40,7 @@ typedef struct{
/* statistics */
timestamp seen;
- int events; /* total number of events grabbed */
+ BUN events; /* total number of events grabbed */
int cycles;
str error;
/* concurrency control between petrinet/{receptor,emitter} */
diff --git a/sql/backends/monet5/sql_cquery.c b/sql/backends/monet5/sql_cquery.c
--- a/sql/backends/monet5/sql_cquery.c
+++ b/sql/backends/monet5/sql_cquery.c
@@ -146,7 +146,7 @@ CQentry(int idx)
str
CQlog( Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){
- BAT *tickbat, *modbat, *fcnbat, *timebat, *errbat;
+ BAT *tickbat = 0, *modbat = 0, *fcnbat = 0, *timebat = 0, *errbat = 0;
bat *tickret, *modret, *fcnret, *timeret, *errorret;
(void) cntxt;
@@ -891,7 +891,7 @@ CQscheduler(void *dummy)
break;
MT_sleep_ms(delay);
if( delay < 20 * cycleDelay)
- delay *= 1.2;
+ delay = (int) (delay *1.2);
}
}
#ifdef DEBUG_CQUERY
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
