MonetDB: Oct2020 - merged with jun2020

[Niels Nes]

Changeset: 0dfe4bf93c22 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/0dfe4bf93c22
Modified Files:
        sql/storage/bat/bat_storage.c
Branch: Oct2020
Log Message:

merged with jun2020


diffs (35 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
@@ -2373,6 +2373,7 @@ tr_handle_snapshot( sql_trans *tr, sql_d
                bat->bid = bat->ibid;
                bat->cnt = bat->ibase = BATcount(ins);
                bat->ibid = e_bat(ins->ttype);
+               bat->cleared = 0;
                BATmsync(ins);
        }
        bat_destroy(ins);
@@ -2409,7 +2410,7 @@ tr_update_delta( sql_trans *tr, sql_delt
                if(!cur)
                        return LOG_ERR;
        }
-       if (!savepoint && !obat->bid && tr != gtrans) {
+       if (!savepoint && (!obat->bid || !cbat->bid) && tr != gtrans) {
                if (obat->next)
                        destroy_bat(obat->next);
                destroy_delta(obat);
@@ -2421,6 +2422,14 @@ tr_update_delta( sql_trans *tr, sql_delt
                cbat->cleared = 0;
                cbat->name = NULL;
                cbat->cached = NULL;
+               if (!obat->bid) {
+                       cur = temp_descriptor(obat->ibid);
+                       obat->bid = obat->ibid;
+                       obat->cnt = obat->ibase = BATcount(cur);
+                       obat->ibid = e_bat(cur->ttype);
+                       bat_destroy(cur);
+                       obat->cleared = 0;
+               }
                return ok;
        }
        ins = temp_descriptor(cbat->ibid);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list