MonetDB: Feb2013 - merging (+ conflict fixes) from Oct2012

[Niels Nes]

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

merging (+ conflict fixes) from Oct2012


diffs (64 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
@@ -278,7 +278,6 @@ delta_append_bat( sql_delta *bat, BAT *i
                bat_destroy(bat->cached);
                bat->cached = NULL;
        }
-       bat->cnt += BATcount(i);
        if (!isEbat(b)){
                /* try to use mmap() */
                if (BATcount(b)+BATcount(i) > (BUN) REMAP_PAGE_MAXSIZE) { 
@@ -292,6 +291,7 @@ delta_append_bat( sql_delta *bat, BAT *i
                b = temp_descriptor(bat->ibid);
        }
        BATappend(b, i, TRUE);
+       bat->cnt += BATcount(i);
        bat_destroy(b);
 }
 
@@ -1202,6 +1202,7 @@ gtr_update_delta( sql_trans *tr, sql_del
                }
                assert(cur->T->heap.storage != STORE_PRIV);
                BATappend(cur,ins,TRUE);
+               cbat->cnt = cbat->ibase = BATcount(cur);
                BATcleanProps(cur);
                temp_destroy(cbat->ibid);
                cbat->ibid = e_bat(cur->ttype);
diff --git a/sql/storage/bat/bat_utils.c b/sql/storage/bat/bat_utils.c
--- a/sql/storage/bat/bat_utils.c
+++ b/sql/storage/bat/bat_utils.c
@@ -91,21 +91,10 @@ temp_copy(log_bid b, int temp)
        return r;
 }
 
-void
-update_table_bat(BAT *b, BAT *ub)
-{
-       if (ub && BATcount(ub)) {
-               void_replace_bat(b, ub, TRUE);
-               BATclear(ub, TRUE);
-               BATcommit(ub);
-       }
-}
-
 BUN
 append_inserted(BAT *b, BAT *i )
 {
-       BUN nr = 0;
-       BUN r;
+       BUN nr = 0, r;
                BATiter ii = bat_iterator(i);
 
                for (r = i->batInserted; r < BUNlast(i); r++) {
diff --git a/sql/storage/bat/bat_utils.h b/sql/storage/bat/bat_utils.h
--- a/sql/storage/bat/bat_utils.h
+++ b/sql/storage/bat/bat_utils.h
@@ -36,7 +36,6 @@ extern log_bid temp_copy(log_bid b, int 
 extern void bat_destroy(BAT *b);
 extern BAT *bat_new(int ht, int tt, BUN size);
 
-extern void update_table_bat(BAT *b, BAT *ub);
 extern BUN append_inserted(BAT *b, BAT *i );
 extern BUN copy_inserted(BAT *b, BAT *i );
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list