Changeset: 470735d567ee for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/470735d567ee
Modified Files:
        sql/storage/bat/bat_logger.c
Branch: Jan2022
Log Message:

Fix replacement of old column with new during upgrade.


diffs (17 lines):

diff --git a/sql/storage/bat/bat_logger.c b/sql/storage/bat/bat_logger.c
--- a/sql/storage/bat/bat_logger.c
+++ b/sql/storage/bat/bat_logger.c
@@ -1849,10 +1849,12 @@ replace_bat(old_logger *old_lg, logger *
                        MT_rwlock_rdlock(&cii.b->thashlock);
                        HASHloop_int(cii, cii.b->thash, p, &colid) {
                                if (BUNfnd(lg->dcatalog, &(oid){(oid)p}) == 
BUN_NONE) {
-                                       if (BUNappend(lg->dcatalog, 
&(oid){(oid)p}, false) != GDK_SUCCEED) {
+                                       if (BUNappend(lg->dcatalog, 
&(oid){(oid)p}, false) != GDK_SUCCEED ||
+                                               BUNreplace(lg->catalog_lid, 
(oid) p, &(lng){0}, false) != GDK_SUCCEED) {
                                                
MT_rwlock_rdunlock(&cii.b->thashlock);
                                                return GDK_FAIL;
                                        }
+                                       lg->deleted++;
                                        break;
                                }
                        }
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to