ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-02 00:14:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: рефакторинг node_shrink() для ясности исходного кода (backport).

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2024-02-28 02:21:59 +03:00
parent fb6be62046
commit e2f2fd8652
1 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/core.c
View File

@ -3334,7 +3334,7 @@ static int __must_check_result node_add_leaf2(MDBX_cursor *mc, size_t indx,
const MDBX_val *key); const MDBX_val *key);
static void node_del(MDBX_cursor *mc, size_t ksize); static void node_del(MDBX_cursor *mc, size_t ksize);
static void node_shrink(MDBX_page *mp, size_t indx); static MDBX_node *node_shrink(MDBX_page *mp, size_t indx, MDBX_node *node);
static int __must_check_result node_move(MDBX_cursor *csrc, MDBX_cursor *cdst, static int __must_check_result node_move(MDBX_cursor *csrc, MDBX_cursor *cdst,
bool fromleft); bool fromleft);
static int __must_check_result node_read(MDBX_cursor *mc, const MDBX_node *leaf, static int __must_check_result node_read(MDBX_cursor *mc, const MDBX_node *leaf,
@ -18112,7 +18112,7 @@ static __hot int cursor_del(MDBX_cursor *mc, MDBX_put_flags_t flags) {
if (!(node_flags(node) & F_SUBDATA)) if (!(node_flags(node) & F_SUBDATA))
mc->mc_xcursor->mx_cursor.mc_pg[0] = node_data(node); mc->mc_xcursor->mx_cursor.mc_pg[0] = node_data(node);
rc = cursor_del(&mc->mc_xcursor->mx_cursor, 0); rc = cursor_del(&mc->mc_xcursor->mx_cursor, 0);
if (unlikely(rc)) if (unlikely(rc != MDBX_SUCCESS))
return rc; return rc;
/* If sub-DB still has entries, we're done */ /* If sub-DB still has entries, we're done */
if (mc->mc_xcursor->mx_db.md_entries) { if (mc->mc_xcursor->mx_db.md_entries) {
@ -18121,11 +18121,10 @@ static __hot int cursor_del(MDBX_cursor *mc, MDBX_put_flags_t flags) {
mc->mc_xcursor->mx_db.md_mod_txnid = mc->mc_txn->mt_txnid; mc->mc_xcursor->mx_db.md_mod_txnid = mc->mc_txn->mt_txnid;
memcpy(node_data(node), &mc->mc_xcursor->mx_db, sizeof(MDBX_db)); memcpy(node_data(node), &mc->mc_xcursor->mx_db, sizeof(MDBX_db));
} else { } else {
/* shrink fake page */ /* shrink sub-page */
node_shrink(mp, mc->mc_ki[mc->mc_top]); node = node_shrink(mp, mc->mc_ki[mc->mc_top], node);
node = page_node(mp, mc->mc_ki[mc->mc_top]);
mc->mc_xcursor->mx_cursor.mc_pg[0] = node_data(node); mc->mc_xcursor->mx_cursor.mc_pg[0] = node_data(node);
/* fix other sub-DB cursors pointed at fake pages on this page */ /* fix other sub-DB cursors pointed at sub-pages on this page */
for (MDBX_cursor *m2 = mc->mc_txn->mt_cursors[mc->mc_dbi]; m2; for (MDBX_cursor *m2 = mc->mc_txn->mt_cursors[mc->mc_dbi]; m2;
m2 = m2->mc_next) { m2 = m2->mc_next) {
if (m2 == mc || m2->mc_snum < mc->mc_snum) if (m2 == mc || m2->mc_snum < mc->mc_snum)
@ -18580,35 +18579,28 @@ __hot static void node_del(MDBX_cursor *mc, size_t ksize) {
/* Compact the main page after deleting a node on a subpage. /* Compact the main page after deleting a node on a subpage.
* [in] mp The main page to operate on. * [in] mp The main page to operate on.
* [in] indx The index of the subpage on the main page. */ * [in] indx The index of the subpage on the main page. */
static void node_shrink(MDBX_page *mp, size_t indx) { static MDBX_node *node_shrink(MDBX_page *mp, size_t indx, MDBX_node *node) {
MDBX_node *node; assert(node = page_node(mp, indx));
MDBX_page *sp, *xp; MDBX_page *sp = (MDBX_page *)node_data(node);
size_t nsize, delta, len, ptr; assert(IS_SUBP(sp) && page_numkeys(sp) > 0);
intptr_t i; const size_t delta =
EVEN_FLOOR(page_room(sp) /* avoid the node uneven-sized */);
node = page_node(mp, indx); if (unlikely(delta) == 0)
sp = (MDBX_page *)node_data(node); return node;
delta = page_room(sp);
assert(delta > 0);
/* Prepare to shift upward, set len = length(subpage part to shift) */ /* Prepare to shift upward, set len = length(subpage part to shift) */
if (IS_LEAF2(sp)) { size_t nsize = node_ds(node) - delta, len = nsize;
delta &= /* do not make the node uneven-sized */ ~(size_t)1; assert(nsize % 1 == 0);
if (unlikely(delta) == 0) if (!IS_LEAF2(sp)) {
return; len = PAGEHDRSZ;
nsize = node_ds(node) - delta; MDBX_page *xp = ptr_disp(sp, delta); /* destination subpage */
assert(nsize % 1 == 0); for (intptr_t i = page_numkeys(sp); --i >= 0;) {
len = nsize;
} else {
xp = ptr_disp(sp, delta); /* destination subpage */
for (i = page_numkeys(sp); --i >= 0;) {
assert(sp->mp_ptrs[i] >= delta); assert(sp->mp_ptrs[i] >= delta);
xp->mp_ptrs[i] = (indx_t)(sp->mp_ptrs[i] - delta); xp->mp_ptrs[i] = (indx_t)(sp->mp_ptrs[i] - delta);
} }
nsize = node_ds(node) - delta;
len = PAGEHDRSZ;
} }
sp->mp_upper = sp->mp_lower; assert(sp->mp_upper >= sp->mp_lower + delta);
sp->mp_upper -= (indx_t)delta;
sp->mp_pgno = mp->mp_pgno; sp->mp_pgno = mp->mp_pgno;
node_set_ds(node, nsize); node_set_ds(node, nsize);
@ -18616,15 +18608,17 @@ static void node_shrink(MDBX_page *mp, size_t indx) {
void *const base = ptr_disp(mp, mp->mp_upper + PAGEHDRSZ); void *const base = ptr_disp(mp, mp->mp_upper + PAGEHDRSZ);
memmove(ptr_disp(base, delta), base, ptr_dist(sp, base) + len); memmove(ptr_disp(base, delta), base, ptr_dist(sp, base) + len);
ptr = mp->mp_ptrs[indx]; const size_t pivot = mp->mp_ptrs[indx];
for (i = page_numkeys(mp); --i >= 0;) { for (intptr_t i = page_numkeys(mp); --i >= 0;) {
if (mp->mp_ptrs[i] <= ptr) { if (mp->mp_ptrs[i] <= pivot) {
assert((size_t)UINT16_MAX - mp->mp_ptrs[i] >= delta); assert((size_t)UINT16_MAX - mp->mp_ptrs[i] >= delta);
mp->mp_ptrs[i] += (indx_t)delta; mp->mp_ptrs[i] += (indx_t)delta;
} }
} }
assert((size_t)UINT16_MAX - mp->mp_upper >= delta); assert((size_t)UINT16_MAX - mp->mp_upper >= delta);
mp->mp_upper += (indx_t)delta; mp->mp_upper += (indx_t)delta;
return ptr_disp(node, delta);
} }
/* Initial setup of a sorted-dups cursor. /* Initial setup of a sorted-dups cursor.