MonetDB: newstorage - fixed testweb compilation errors

[Rene Tassy]

Changeset: 543114662599 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=543114662599
Modified Files:
        sql/storage/bat/bat_storage.c
Branch: newstorage
Log Message:

fixed testweb compilation errors


diffs (52 lines):

diff --git a/sql/storage/bat/bat_storage.c b/sql/storage/bat/bat_storage.c
--- a/sql/storage/bat/bat_storage.c
+++ b/sql/storage/bat/bat_storage.c
@@ -165,6 +165,7 @@ delta_bind_bat( sql_delta *bat, int acce
 
        assert(access == RDONLY || access == RD_INS);
        assert(bat != NULL);
+       (void)access;
        /*if (temp || access == RD_INS) {
                assert(bat->ibid);
                b = temp_descriptor(bat->ibid);
@@ -659,23 +660,9 @@ timestamps_insert(sql_trans *tr, sql_tim
        BAT *insb = temp_descriptor(ts->insbid);
        BAT *delb = temp_descriptor(ts->delbid);
 
-       int i;
+       wrd i;
        int nts=0;
 
-       /** if (isEbat(insb)) {
-                temp_destroy(ts->insbid);
-                ts->insbid = temp_copy(insb->batCacheid, FALSE);
-                bat_destroy(insb);
-                insb = temp_descriptor(ts->insbid);
-        }
-
-       if (isEbat(delb)) {
-               temp_destroy(ts->delbid);
-               ts->delbid = temp_copy(delb->batCacheid, FALSE);
-               bat_destroy(delb);
-               delb = temp_descriptor(ts->delbid);
-       } */
-
        assert(!insb || insb->htype == TYPE_void);
        assert(!delb || delb->htype == TYPE_void);
 
@@ -684,11 +671,12 @@ timestamps_insert(sql_trans *tr, sql_tim
 
        nts = (tr->wtime) * (-1);
 
+       /* insert negative timestamps until commit */
        for(i=cnt; i>0; i--) {
-               /* insert negative timestamps until commit */
-               BUNinplace(insb, (BATcount(insb) - i), insb->H, (ptr)&nts, 
TRUE);
-               BUNinplace(delb, (BATcount(delb) - i), delb->H, (ptr)&int_nil, 
TRUE);
+               BUNinplace(insb, (BATcount(insb) - (BUN)i), insb->H, (ptr)&nts, 
TRUE);
+               BUNinplace(delb, (BATcount(delb) - (BUN)i), delb->H, 
(ptr)&int_nil, TRUE);
        }
+
        bat_destroy(insb);
        bat_destroy(delb);
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list