MonetDB: Jan2022 - pass storage not first segment, segment else ...

[Niels Nes]

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

pass storage not first segment, segment else be changed without the protection 
of the lock


diffs (24 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
@@ -4485,9 +4485,10 @@ has_deletes_in_range( segment *s, sql_tr
 }
 
 static BAT *
-segments2cands(segment *s, sql_trans *tr, sql_table *t, size_t start, size_t 
end)
+segments2cands(storage *S, sql_trans *tr, sql_table *t, size_t start, size_t 
end)
 {
        lock_table(tr->store, t->base.id);
+       segment *s = S->segs->h;
        /* step one no deletes -> dense range */
        uint32_t cur = 0;
        size_t dnr = has_deletes_in_range(s, tr, start, end), nr = end - start, 
pos = 0;
@@ -4588,7 +4589,7 @@ bind_cands(sql_trans *tr, sql_table *t, 
        if (part_nr == (nr_of_parts-1))
                end = nr;
        assert(end <= nr);
-       return segments2cands(s->segs->h, tr, t, start, end);
+       return segments2cands(s, tr, t, start, end);
 }
 
 static void
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list