MonetDB: default - Administer change of bat for sys.objects.nr.

[Sjoerd Mullender]

Changeset: 24c03c16a919 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=24c03c16a919
Modified Files:
        sql/storage/bat/bat_logger.c
Branch: default
Log Message:

Administer change of bat for sys.objects.nr.


diffs (29 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
@@ -1890,14 +1890,24 @@ bl_postversion(void *Store, old_logger *
                        return GDK_FAIL;
                }
                b = COLcopy(objs_nr, objs_nr->ttype, true, PERSISTENT);
+               rc = BUNappend(old_lg->del, &objs_nr->batCacheid, false);
                bat_destroy(objs_nr);
-               if (b == NULL) {
+               if (b == NULL || rc != GDK_SUCCEED) {
                        bat_destroy(objs_id);
                        bat_destroy(objs_sub);
                        bat_destroy(cands);
+                       bat_destroy(b);
                        return GDK_FAIL;
                }
                objs_nr = b;
+               if (BUNappend(old_lg->add, &objs_nr->batCacheid, false) != 
GDK_SUCCEED) {
+                       bat_destroy(objs_id);
+                       bat_destroy(objs_sub);
+                       bat_destroy(objs_nr);
+                       bat_destroy(cands);
+                       return GDK_FAIL;
+               }
+               BBPretain(objs_nr->batCacheid);
                b = BATproject2(cands, objs_id, NULL);
                bat_destroy(objs_id);
                if (b == NULL) {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list