MonetDB: Jul2021 - don't use sql_delta outside bat_storage

[Niels Nes]

Changeset: 6ca087f9ba30 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/6ca087f9ba30
Modified Files:
        sql/storage/bat/bat_table.c
Branch: Jul2021
Log Message:

don't use sql_delta outside bat_storage


diffs (22 lines):

diff --git a/sql/storage/bat/bat_table.c b/sql/storage/bat/bat_table.c
--- a/sql/storage/bat/bat_table.c
+++ b/sql/storage/bat/bat_table.c
@@ -32,13 +32,12 @@ full_column(sql_trans *tr, sql_column *c
         *      b := b.copy()
                b := b.replace(u);
        */
-       BAT *b, *ui, *uv;
-       sql_delta *bat = col_timestamp_delta(tr, c);
+       sqlstore *store = tr->store;
+       BAT *b = store->storage_api.bind_col(tr, c, RDONLY);
+       BAT *ui = store->storage_api.bind_col(tr, c, RD_UPD_ID);
 
-       b = temp_descriptor(bat->cs.bid);
-       if (b && bat->cs.uibid && bat->cs.ucnt) {
-               ui = temp_descriptor(bat->cs.uibid);
-               uv = temp_descriptor(bat->cs.uvbid);
+       if (BATcount(ui)) {
+               BAT *uv = store->storage_api.bind_col(tr, c, RD_UPD_VAL);
                if (ui && BATcount(ui)) {
                        BAT *r = COLcopy(b, b->ttype, true, TRANSIENT);
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list