MonetDB: newstorage - cleanup

[Niels Nes]

Changeset: 4b84361882a0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4b84361882a0
Modified Files:
        sql/benchmarks/tpch/load.sh
        sql/storage/bat/bat_storage.c
        sql/storage/bat/bat_storage.h
        sql/storage/store.c
Branch: newstorage
Log Message:

cleanup


diffs (149 lines):

diff --git a/sql/benchmarks/tpch/load.sh b/sql/benchmarks/tpch/load.sh
--- a/sql/benchmarks/tpch/load.sh
+++ b/sql/benchmarks/tpch/load.sh
@@ -35,7 +35,7 @@ SF='sf-0.01'
 #SF='sf-5'
 
 dir=`echo $SF | tr '[a-z]' '[A-Z]'`
-$SQL < c.sql-dec-primary-foreign
+#$SQL < c.sql-dec-primary-foreign
 #$SQL < c.sql-dec
 #cat load-$SF-LOCKED.sql$T | sed -e s+PWD+$PWD/$dir+ | $SQL 
 cat load-$SF.sql$T | sed -e s+PWD+$PWD/$dir+ | $SQL
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
@@ -45,16 +45,16 @@ bind_ts_ins(sql_timestamps *ts, int acce
 }
 
 static BAT *
-bind_ts_insert(sql_trans *tr, sql_table *t, int access) {
-
+bind_ts_insert(sql_trans *tr, sql_table *t, int access) 
+{
        assert(t->data);
        t->s->base.rtime = t->base.rtime = tr->stime;
        return bind_ts_ins(t->data, access);
 }
 
 static BAT *
-bind_ts_del(sql_timestamps *ts, int access) {
-
+bind_ts_del(sql_timestamps *ts, int access) 
+{
        BAT *b;
 
 #ifdef NDEBUG
@@ -273,7 +273,7 @@ dup_delta(sql_trans *tr, sql_delta *obat
        return LOG_OK;
 }
 
-int 
+static int 
 dup_bat(sql_trans *tr, sql_table *t, sql_delta *obat, sql_delta *bat, int 
type, int oc_isnew, int c_isnew)
 {
        return dup_delta( tr, obat, bat, type, oc_isnew, c_isnew, 
isTempTable(t), t->sz);
@@ -405,7 +405,7 @@ timestamps_insert(sql_trans *tr, sql_tab
        wrd i;
        int nts=0;
 
-       BUN first = ts->slot;
+       oid first = ts->slot;
 
        assert(!insb || insb->htype == TYPE_void);
        assert(!delb || delb->htype == TYPE_void);
@@ -419,8 +419,8 @@ timestamps_insert(sql_trans *tr, sql_tab
 
        /* insert negative timestamps until commit */
        for(i=cnt; i>0; i--) {
-               BUNinplace(insb, first, insb->H, (ptr)&nts, TRUE);
-               BUNinplace(delb, first, delb->H, &int_nil, TRUE);
+               BUNinplace(insb, first, NULL, (ptr)&nts, TRUE);
+               BUNinplace(delb, first, NULL, &int_nil, TRUE);
                first++;
        }
 
@@ -464,8 +464,8 @@ insert_bat2col(sql_timestamps *ts, sql_d
 }
 
 static void
-claim_tab(sql_trans *tr, sql_table *t, wrd cnt) {
-
+claim_tab(sql_trans *tr, sql_table *t, wrd cnt) 
+{
        sql_timestamps *ts;
 
        node *n;
@@ -650,7 +650,7 @@ timestamps_delete_bat(sql_trans *tr, sql
                BATloop(i, p, q) {
                        BUN slot = *(BUN*)Tloc(i,p);
                        ts->deleted = slot;
-                       BUNinplace(delb, slot, delb->H, (ptr)&nts, TRUE);
+                       BUNinplace(delb, slot, NULL, (ptr)&nts, TRUE);
                }
                bat_destroy(delb);
        }
@@ -674,7 +674,6 @@ delete_tab(sql_trans *tr, sql_table *t, 
        sql_timestamps *ts;
        node *n;
 
-
        if (bat_debug==2)
                printf("#in delete_tab\n");
 
@@ -1057,8 +1056,8 @@ load_timestamps(sql_trans *tr, sql_times
 }
 
 static int
-create_timestamps(sql_trans *tr, sql_table *t) {
-
+create_timestamps(sql_trans *tr, sql_table *t) 
+{
        int ok = LOG_OK;
        BAT *b;
        sql_timestamps *ts = t->data;
@@ -1624,7 +1623,7 @@ gtr_minmax( sql_trans *tr )
        return _gtr_update(tr, &gtr_minmax_table);
 }
 
-int 
+static int 
 tr_update_delta( sql_trans *tr, sql_delta *obat, sql_delta *cbat)
 {
        int ok = LOG_OK;
@@ -1669,7 +1668,7 @@ tr_update_delta( sql_trans *tr, sql_delt
        return ok;
 }
 
-int
+static int
 tr_update_tsbats(sql_trans *tr, sql_timestamps *tts, sql_timestamps *fts) {
 
         int ok = LOG_OK;
diff --git a/sql/storage/bat/bat_storage.h b/sql/storage/bat/bat_storage.h
--- a/sql/storage/bat/bat_storage.h
+++ b/sql/storage/bat/bat_storage.h
@@ -54,11 +54,5 @@ typedef struct sql_timestamps {
 /* initialize bat storage call back functions interface */
 extern int bat_storage_init( store_functions *sf );
 
-extern int tr_update_delta( sql_trans *tr, sql_delta *obat, sql_delta *cbat );
-extern int tr_update_tsbats(sql_trans *tr, sql_timestamps *fts, sql_timestamps 
*tts);
-
-extern int dup_bat(sql_trans *tr, sql_table *t, sql_delta *obat, sql_delta 
*bat, int type, int oc_isnew, int c_isnew);
-extern sql_delta * timestamp_delta( sql_delta *d, int ts);
-
 #endif /*BATSTORAGE_H */
 
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -1600,7 +1600,7 @@ store_manager(void)
                                return;
                }
                MT_lock_set(&bs_lock, "store_manager");
-               if (store_nr_active || GDKexiting() ||
+               if (1 || store_nr_active || GDKexiting() ||
                        logger_funcs.changes() < 1000) {
                        MT_lock_unset(&bs_lock, "store_manager");
                        continue;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list