MonetDB: Jan2022 - Remove implicitely depricated alter flag.

[Aris Koning]

Changeset: 90b8d49731bd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/90b8d49731bd
Modified Files:
        sql/storage/bat/bat_storage.c
        sql/storage/bat/bat_storage.h
Branch: Jan2022
Log Message:

Remove implicitely depricated alter flag.


diffs (51 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
@@ -3056,7 +3056,6 @@ create_col(sql_trans *tr, sql_column *c)
                                if(bat->cs.uvbid == BID_NIL)
                                        ok = LOG_ERR;
                        }
-                       bat->cs.alter = 1;
                } else {
                        BAT *b = bat_new(type, c->t->sz, PERSISTENT);
                        if (!b) {
@@ -3108,9 +3107,8 @@ commit_create_col_( sql_trans *tr, sql_c
                delta->cs.ts = commit_ts;
 
                assert(delta->next == NULL);
-               if (!delta->cs.alter && !delta->cs.merged)
+               if (!delta->cs.merged)
                        ok = merge_delta(delta);
-               delta->cs.alter = 0;
                if (!tr->parent)
                        c->base.new = 0;
        }
@@ -3171,8 +3169,6 @@ create_idx(sql_trans *tr, sql_idx *ni)
                }
 
                bat->cs.ucnt = 0;
-               if (!isNew(c))
-                       bat->cs.alter = 1;
 
                if (!new) {
                        bat->cs.uibid = e_bat(TYPE_oid);
@@ -3214,7 +3210,7 @@ commit_create_idx_( sql_trans *tr, sql_i
                delta->cs.ts = commit_ts;
 
                assert(delta->next == NULL);
-               if (!delta->cs.alter && !delta->cs.merged)
+               if (!delta->cs.merged)
                        ok = merge_delta(delta);
                if (!tr->parent)
                        i->base.new = 0;
diff --git a/sql/storage/bat/bat_storage.h b/sql/storage/bat/bat_storage.h
--- a/sql/storage/bat/bat_storage.h
+++ b/sql/storage/bat/bat_storage.h
@@ -20,7 +20,6 @@ typedef struct column_storage {
        int uvbid;              /* bat with values of updates */
        storage_type st; /* ST_DEFAULT, ST_DICT, ST_FOR */
        bool cleared;
-       bool alter;             /* set when the delta is created for an alter 
statement */
        bool merged;    /* only merge changes once */
        size_t ucnt;    /* number of updates */
        ulng ts;                /* version timestamp */
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org