Changeset: 04e1ea2dc5e9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/04e1ea2dc5e9
Modified Files:
sql/storage/bat/bat_storage.c
Branch: Jul2021
Log Message:
More checks
diffs (26 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
@@ -1910,8 +1910,8 @@ bind_del_data(sql_trans *tr, sql_table *
{
storage *obat = ATOMIC_PTR_GET(&t->data);
- if (isTempTable(t))
- obat = temp_tab_timestamp_storage(tr, t);
+ if (isTempTable(t) && !(obat = temp_tab_timestamp_storage(tr, t)))
+ return NULL;
if (obat->cs.ts == tr->tid)
return obat;
@@ -2908,8 +2908,10 @@ clear_table(sql_trans *tr, sql_table *t)
node *n = ol_first_node(t->columns);
sql_column *c = n->data;
BUN sz = count_col(tr, c, 0), clear_ok;
-
storage *d = tab_timestamp_storage(tr, t);
+
+ if (!d)
+ return BUN_NONE;
lock_table(tr->store, t->base.id);
sz -= count_deletes_in_range(d->segs->h, tr, 0, sz);
unlock_table(tr->store, t->base.id);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
