MonetDB: Jul2021 - merged

[Niels Nes]

Changeset: 6494b9584e71 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6494b9584e71
Modified Files:
        sql/storage/bat/bat_storage.c
Branch: Jul2021
Log Message:

merged


diffs (84 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
@@ -2827,6 +2827,8 @@ tr_log_cs( sql_trans *tr, sql_table *t, 
        sqlstore *store = tr->store;
        gdk_return ok = GDK_SUCCEED;
 
+       (void) t;
+       (void) segs;
        if (GDKinmemory(0))
                return LOG_OK;
 
@@ -2838,31 +2840,16 @@ tr_log_cs( sql_trans *tr, sql_table *t, 
        if (cs->cleared) {
                assert(cs->ucnt == 0);
                BAT *ins = temp_descriptor(cs->bid);
-               if (isEbat(ins)) {
-                       assert(0);
-                       temp_destroy(cs->bid);
-                       cs->bid = temp_copy(ins->batCacheid, false);
-                       bat_destroy(ins);
-                       ins = temp_descriptor(cs->bid);
-               }
+               if (!ins)
+                       return LOG_ERR;
+               assert(!isEbat(ins));
                bat_set_access(ins, BAT_READ);
                ok = log_bat_persists(store->logger, ins, id);
                bat_destroy(ins);
                return ok == GDK_SUCCEED ? LOG_OK : LOG_ERR;
        }
 
-       if (isTempTable(t)) {
-               assert(0);
-       for (; segs; segs=segs->next) {
-               if (segs->ts == tr->tid) {
-                       BAT *ins = temp_descriptor(cs->bid);
-                       assert(ins);
-                       assert(BATcount(ins) >= segs->end);
-                       ok = log_bat(store->logger, ins, id, segs->start, 
segs->end-segs->start);
-                       bat_destroy(ins);
-               }
-       }
-       }
+       assert(!isTempTable(t));
 
        if (ok == GDK_SUCCEED && cs->ucnt && cs->uibid) {
                BAT *ui = temp_descriptor(cs->uibid);
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,20 +91,6 @@ temp_copy(log_bid b, int temp)
        return r;
 }
 
-BUN
-append_inserted(BAT *b, BAT *i )
-{
-       BUN nr = 0, r;
-       BATiter ii = bat_iterator(i);
-
-       for (r = i->batInserted; r < BUNlast(i); r++) {
-               if (BUNappend(b, BUNtail(ii,r), true) != GDK_SUCCEED)
-                       return BUN_NONE;
-               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
@@ -28,8 +28,6 @@ extern void bat_destroy(BAT *b);
 extern BAT *bat_new(int tt, BUN size, role_t role);
 extern void bat_clear(BAT *b);
 
-extern BUN append_inserted(BAT *b, BAT *i );
-
 extern BAT *ebats[MAXATOMS];
 
 #define isEbat(b)      (ebats[b->ttype] && ebats[b->ttype] == b)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list