MonetDB: Jul2015 - make sure all deletes are bat-transaction lev...

[Niels Nes]

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

make sure all deletes are bat-transaction level committed (ie always update
the bat delta management once we apply changes in a sql transaction)


diffs (57 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
@@ -2051,14 +2051,10 @@ tr_update_dbat(sql_trans *tr, sql_dbat *
        if (BUNlast(db) > db->batInserted || cleared) {
                BAT *odb = temp_descriptor(tdb->dbid);
 
-               /* For large deletes write the new deletes bat */
-               if (BATcount(db) > SNAPSHOT_MINSIZE) {
-                       temp_destroy(tdb->dbid);
-                       tdb->dbid = fdb->dbid;
-               } else {
-                       append_inserted(odb, db);
-                       temp_destroy(fdb->dbid);
-               }
+               append_inserted(odb, db);
+               BATcommit(odb);
+               temp_destroy(fdb->dbid);
+
                fdb->dbid = 0;
                tdb->cnt = fdb->cnt;
                bat_destroy(odb);
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
@@ -101,20 +101,6 @@ append_inserted(BAT *b, BAT *i )
        return nr;
 }
 
-BUN
-copy_inserted(BAT *b, BAT *i )
-{
-       BUN nr = 0;
-       BUN r;
-               BATiter ii = bat_iterator(i);
-
-       for (r = i->batInserted; r < BUNlast(i); r++) {
-               BUNins(b, BUNhead(ii,r), BUNtail(ii,r), TRUE);
-                       nr++;
-       }
-       return nr;
-}
-
 BAT *ebats[MAXATOMS] = { NULL };
 
 log_bid 
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
@@ -29,7 +29,6 @@ extern void bat_destroy(BAT *b);
 extern BAT *bat_new(int ht, int tt, BUN size, int role);
 
 extern BUN append_inserted(BAT *b, BAT *i );
-extern BUN copy_inserted(BAT *b, BAT *i );
 
 extern BAT *ebats[MAXATOMS];
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list