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

mdbx: fix MDBX_NEXT for EOF case.

Browse Source 
Change-Id: I84c033a24d2215a4867affab5b148bf6ba5d57dc
This commit is contained in:
Leonid Yuriev 2020-11-06 14:22:06 +03:00
parent b1446b7752
commit c55f99073b
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/core.c
View File

@ -11889,7 +11889,7 @@ static int mdbx_cursor_next(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data,
goto skip; goto skip;
} }
if (mc->mc_ki[mc->mc_top] + 1u >= page_numkeys(mp)) { if (++mc->mc_ki[mc->mc_top] >= page_numkeys(mp)) {
mdbx_debug("%s", "=====> move to next sibling page"); mdbx_debug("%s", "=====> move to next sibling page");
if (unlikely((rc = mdbx_cursor_sibling(mc, SIBLING_RIGHT)) != if (unlikely((rc = mdbx_cursor_sibling(mc, SIBLING_RIGHT)) !=
MDBX_SUCCESS)) { MDBX_SUCCESS)) {
@ -11899,8 +11899,7 @@ static int mdbx_cursor_next(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data,
mp = mc->mc_pg[mc->mc_top]; mp = mc->mc_pg[mc->mc_top];
mdbx_debug("next page is %" PRIaPGNO ", key index %u", mp->mp_pgno, mdbx_debug("next page is %" PRIaPGNO ", key index %u", mp->mp_pgno,
mc->mc_ki[mc->mc_top]); mc->mc_ki[mc->mc_top]);
} else }
mc->mc_ki[mc->mc_top]++;
skip: skip:
mdbx_debug("==> cursor points to page %" PRIaPGNO mdbx_debug("==> cursor points to page %" PRIaPGNO
@ -11984,9 +11983,8 @@ static int mdbx_cursor_prev(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data,
if (mc->mc_ki[mc->mc_top] == 0) { if (mc->mc_ki[mc->mc_top] == 0) {
mdbx_debug("%s", "=====> move to prev sibling page"); mdbx_debug("%s", "=====> move to prev sibling page");
if ((rc = mdbx_cursor_sibling(mc, SIBLING_LEFT)) != MDBX_SUCCESS) { if ((rc = mdbx_cursor_sibling(mc, SIBLING_LEFT)) != MDBX_SUCCESS)
return rc; return rc;
}
mp = mc->mc_pg[mc->mc_top]; mp = mc->mc_pg[mc->mc_top];
mc->mc_ki[mc->mc_top] = (indx_t)page_numkeys(mp) - 1; mc->mc_ki[mc->mc_top] = (indx_t)page_numkeys(mp) - 1;
mdbx_debug("prev page is %" PRIaPGNO ", key index %u", mp->mp_pgno, mdbx_debug("prev page is %" PRIaPGNO ", key index %u", mp->mp_pgno,
@ -13254,18 +13252,17 @@ new_sub:;
rc = mdbx_node_add_leaf(mc, mc->mc_ki[mc->mc_top], key, rdata, nflags); rc = mdbx_node_add_leaf(mc, mc->mc_ki[mc->mc_top], key, rdata, nflags);
if (likely(rc == 0)) { if (likely(rc == 0)) {
/* Adjust other cursors pointing to mp */ /* Adjust other cursors pointing to mp */
MDBX_cursor *m2, *m3; const MDBX_dbi dbi = mc->mc_dbi;
MDBX_dbi dbi = mc->mc_dbi; const unsigned i = mc->mc_top;
unsigned i = mc->mc_top; MDBX_page *const mp = mc->mc_pg[i];
MDBX_page *mp = mc->mc_pg[i]; for (MDBX_cursor *m2 = mc->mc_txn->mt_cursors[dbi]; m2;
m2 = m2->mc_next) {
for (m2 = mc->mc_txn->mt_cursors[dbi]; m2; m2 = m2->mc_next) { MDBX_cursor *m3 =
m3 = (mc->mc_flags & C_SUB) ? &m2->mc_xcursor->mx_cursor : m2; (mc->mc_flags & C_SUB) ? &m2->mc_xcursor->mx_cursor : m2;
if (m3 == mc || m3->mc_snum < mc->mc_snum || m3->mc_pg[i] != mp) if (m3 == mc || m3->mc_snum < mc->mc_snum || m3->mc_pg[i] != mp)
continue; continue;
if (m3->mc_ki[i] >= mc->mc_ki[i] && insert_key) { if (m3->mc_ki[i] >= mc->mc_ki[i])
m3->mc_ki[i]++; m3->mc_ki[i] += insert_key;
}
if (XCURSOR_INITED(m3)) if (XCURSOR_INITED(m3))
XCURSOR_REFRESH(m3, mp, m3->mc_ki[i]); XCURSOR_REFRESH(m3, mp, m3->mc_ki[i]);
} }