Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DAOS-16954 common: fix how the embedded value is deleted #15815

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

DAOS-16954 common: fix how the embedded value is deleted #15815

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57c5db1
DAOS-16954 common: fix how the embedded value is deleted
janekmi Jan 29, 2025
1da33b9
DAOS-16954 Fix the tree->embedded case + simplify the logic
janekmi Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
111 changes: 66 additions & 45 deletions src/common/btree.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/**
* (C) Copyright 2016-2024 Intel Corporation.
* (C) Copyright 2025 Hewlett Packard Enterprise Development LP
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*/
Expand Down Expand Up @@ -3216,9 +3217,47 @@ btr_node_del_rec(struct btr_context *tcx, struct btr_trace *par_tr,
sib_on_right, args);
}

/**
* Delete the last record from the tree as pointed by @trace.
*
* It handles both the embedded record and a record stored in a regular tree.
*/
static inline int
btr_root_del_rec_last(struct btr_context *tcx, struct btr_trace *trace, void *args)
{
struct btr_root *root = tcx->tc_tins.ti_root;
int rc;

rc = btr_node_destroy(tcx, trace->tr_node, args, NULL);
if (rc != 0)
return rc;

if (btr_has_tx(tcx)) {
rc = btr_root_tx_add(tcx);
if (rc != 0)
return rc;
}

root->tr_depth = 0;
root->tr_node = BTR_NODE_NULL;

if (btr_has_embedded_value(tcx)) {
root->tr_feats ^= BTR_FEAT_EMBEDDED;
tcx->tc_feats = root->tr_feats;
}

btr_context_set_depth(tcx, 0);
D_DEBUG(DB_TRACE, "Tree is empty now.\n");

return 0;
}

/**
* Deleted the record/child pointed by @trace from the root node.
*
* - If the remaining value is embedded it will be freed.
* - If only one record is left in the root and the embedded value is supported, it will become an
* embedded value.
* - If the root node is also a leaf, and the root is empty after the deletion,
* then the root node will be freed as well.
* - If the root node is a non-leaf node, then the corresponding child node
Expand All @@ -3228,64 +3267,42 @@ btr_node_del_rec(struct btr_context *tcx, struct btr_trace *par_tr,
static int
btr_root_del_rec(struct btr_context *tcx, struct btr_trace *trace, void *args)
{
struct btr_node *node;
struct btr_root *root;
int rc = 0;
int threshold = 1;

root = tcx->tc_tins.ti_root;
node = btr_off2ptr(tcx, trace->tr_node);
struct btr_node *node = NULL;
struct btr_root *root = tcx->tc_tins.ti_root;
int rc = 0;

D_DEBUG(DB_TRACE, "Delete record/child from tree root, depth=%d\n",
root->tr_depth);

if (btr_has_embedded_value(tcx) || btr_node_is_leaf(tcx, trace->tr_node)) {
if (D_LOG_ENABLED(DB_TRACE)) {
if (btr_has_embedded_value(tcx)) {
D_DEBUG(DB_TRACE, "Delete embedded record from the root\n");
} else {
D_DEBUG(DB_TRACE, "Delete leaf from the root, key_nr=%d.\n",
node->tn_keyn);
}
}
if (btr_has_embedded_value(tcx)) {
D_DEBUG(DB_TRACE, "Delete the embedded record\n");
return btr_root_del_rec_last(tcx, trace, args);
}

if (btr_supports_embedded_value(tcx))
threshold = 2;
D_ASSERT((tcx->tc_trace.ti_embedded_info & BTR_EMBEDDED_SET) == 0);
node = btr_off2ptr(tcx, trace->tr_node);

if (btr_node_is_leaf(tcx, trace->tr_node)) {
/* the root is also a leaf node */
if (node->tn_keyn > threshold) {
/* have more than one record, simply remove the record
* to be deleted.
*/
D_DEBUG(DB_TRACE, "Delete leaf from the root, key_nr=%d.\n", node->tn_keyn);

if (node->tn_keyn > 1) {
/* When removing the second to last record and embedding value is supported
* the remaining record will become an embedded one. */
if (node->tn_keyn == 2 && btr_supports_embedded_value(tcx)) {
return btr_node_del_embed(tcx, trace, root, args);
}

/* have more than one record, simply remove the record to be deleted. */
if (btr_has_tx(tcx)) {
rc = btr_node_tx_add(tcx, trace->tr_node);
if (rc != 0)
return rc;
}

rc = btr_node_del_leaf_only(tcx, trace, true, args);
} else if (node->tn_keyn == 2) {
rc = btr_node_del_embed(tcx, trace, root, args);
} else {
rc = btr_node_destroy(tcx, trace->tr_node, args, NULL);
if (rc != 0)
return rc;

if (btr_has_tx(tcx)) {
rc = btr_root_tx_add(tcx);
if (rc != 0)
return rc;
}

root->tr_depth = 0;
root->tr_node = BTR_NODE_NULL;
if (btr_has_embedded_value(tcx)) {
root->tr_feats ^= BTR_FEAT_EMBEDDED;
tcx->tc_feats = root->tr_feats;
}

btr_context_set_depth(tcx, 0);
D_DEBUG(DB_TRACE, "Tree is empty now.\n");
return btr_root_del_rec_last(tcx, trace, args);
}
} else {
/* non-leaf node */
Expand Down Expand Up @@ -3784,9 +3801,9 @@ static int
btr_node_destroy(struct btr_context *tcx, umem_off_t nd_off,
void *args, bool *empty_rc)
{
struct btr_node *nd = btr_off2ptr(tcx, nd_off);
struct btr_node *nd;
struct btr_record *rec;
bool leaf = btr_node_is_leaf(tcx, nd_off);
bool leaf;
bool empty = true;
int rc;
int i;
Expand All @@ -3804,6 +3821,10 @@ btr_node_destroy(struct btr_context *tcx, umem_off_t nd_off,
goto out;
}

/* If it is not an embedded value it is a regular node. */
nd = btr_off2ptr(tcx, nd_off);
leaf = btr_node_is_leaf(tcx, nd_off);

/* NB: don't need to call TX_ADD_RANGE(nd_off, ...) because I never
* change it so nothing to undo on transaction failure, I may destroy
* it later by calling TX_FREE which is transactional safe.
Expand Down