From 106da7ccc057eb7d0f384bee74c27a0ec3dd8239 Mon Sep 17 00:00:00 2001 From: Andrew Gooding Date: Mon, 22 Aug 2022 09:26:08 -0700 Subject: [PATCH] AER-6567 - correct flash-index logic to avoid submitting to sindex rlist on non-durable delete from client, fixing improvement done in hotfix AER-6562. --- as/src/transaction/delete.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/as/src/transaction/delete.c b/as/src/transaction/delete.c index 69204bfa..9a9cbc7a 100644 --- a/as/src/transaction/delete.c +++ b/as/src/transaction/delete.c @@ -562,7 +562,7 @@ drop_master(as_transaction* tr, as_index_ref* r_ref, rw_request* rw) bool check_key = as_transaction_has_key(tr); - if (ns->storage_data_in_memory || filter_exp != NULL || check_key) { + if (filter_exp != NULL || check_key) { as_storage_rd rd; as_storage_record_open(ns, r, &rd); @@ -590,10 +590,10 @@ drop_master(as_transaction* tr, as_index_ref* r_ref, rw_request* rw) } as_storage_record_close(&rd); + } - if (ns->storage_data_in_memory || ns->xmem_type == CF_XMEM_TYPE_FLASH) { - remove_from_sindex(ns, r_ref); - } + if (ns->storage_data_in_memory || ns->xmem_type == CF_XMEM_TYPE_FLASH) { + remove_from_sindex(ns, r_ref); } as_set_index_delete(ns, tree, as_index_get_set_id(r), r_ref->r_h);