MonetDB: unlock - protection for merge/replica tables

[Niels Nes]

Changeset: df734e244a18 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=df734e244a18
Modified Files:
        sql/backends/monet5/sql.c
        sql/storage/bat/bat_storage.c
Branch: unlock
Log Message:

protection for merge/replica tables


diffs (28 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -2511,8 +2511,10 @@ SQLtid(Client cntxt, MalBlkPtr mb, MalSt
                nr_parts = *getArgReference_int(stk, pci, 5);
        }
        BAT *b = store->storage_api.bind_cands(tr, t, nr_parts, part_nr);
-       *res = b->batCacheid;
-       BBPkeepref(*res);
+       if (b) {
+               *res = b->batCacheid;
+               BBPkeepref(*res);
+       }
        return msg;
 }
 
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
@@ -450,6 +450,8 @@ idx_timestamp_delta( sql_trans *tr, sql_
 static storage *
 timestamp_storage( sql_trans *tr, storage *d)
 {
+       if (!d)
+               return NULL;
        while (d->next && !VALID_4_READ(d->cs.ts, tr))
                d = d->next;
        return d;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list