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

mdbx: raise MDBX_TXN_FULL if spilled less that half of needed.

Browse Source 
Related to https://github.com/erthink/libmdbx/issues/186

Change-Id: I3c1a0e1bea6b6ad9bf41347a569e5833e82d8edc
This commit is contained in:
Leonid Yuriev 2021-04-28 11:49:18 +03:00
parent e57e42d0f8
commit 17116b9b46
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core.c
View File

@ -5098,7 +5098,8 @@ static int spill_page(MDBX_txn *txn, struct mdbx_iov_ctx *ctx, MDBX_page *dp,
* parent txn. That would alter the parent txns' data even though * parent txn. That would alter the parent txns' data even though
* the child hasn't committed yet, and we'd have no way to undo it if * the child hasn't committed yet, and we'd have no way to undo it if
* the child aborted. */ * the child aborted. */
static int mdbx_txn_spill(MDBX_txn *txn, MDBX_cursor *m0, unsigned need) { static int mdbx_txn_spill(MDBX_txn *const txn, MDBX_cursor *const m0,
const unsigned need) {
#ifndef MDBX_DEBUG_SPILLING #ifndef MDBX_DEBUG_SPILLING
if (likely(txn->tw.dirtyroom >= need)) if (likely(txn->tw.dirtyroom >= need))
return MDBX_SUCCESS; return MDBX_SUCCESS;
@ -5293,10 +5294,8 @@ static int mdbx_txn_spill(MDBX_txn *txn, MDBX_cursor *m0, unsigned need) {
while (r <= dl->length) while (r <= dl->length)
dl->items[++w] = dl->items[r++]; dl->items[++w] = dl->items[r++];
mdbx_tassert(txn, r - 1 - w == spilled); mdbx_tassert(txn, r - 1 - w == spilled);
if (unlikely(spilled == 0)) {
mdbx_tassert(txn, ctx.iov_items == 0 && rc == MDBX_SUCCESS); if (likely(spilled > 0)) {
return MDBX_SUCCESS;
}
dl->sorted = dpl_setlen(dl, w); dl->sorted = dpl_setlen(dl, w);
txn->tw.dirtyroom += spilled; txn->tw.dirtyroom += spilled;
mdbx_tassert(txn, mdbx_dirtylist_check(txn)); mdbx_tassert(txn, mdbx_dirtylist_check(txn));
@ -5312,7 +5311,11 @@ static int mdbx_txn_spill(MDBX_txn *txn, MDBX_cursor *m0, unsigned need) {
mdbx_notice("spilled %u dirty-entries, now have %u dirty-room", spilled, mdbx_notice("spilled %u dirty-entries, now have %u dirty-room", spilled,
txn->tw.dirtyroom); txn->tw.dirtyroom);
mdbx_iov_done(txn, &ctx); mdbx_iov_done(txn, &ctx);
return MDBX_SUCCESS; } else {
mdbx_tassert(txn, ctx.iov_items == 0 && rc == MDBX_SUCCESS);
}
return likely(txn->tw.dirtyroom > need / 2) ? MDBX_SUCCESS : MDBX_TXN_FULL;
} }
static int mdbx_cursor_spill(MDBX_cursor *mc, const MDBX_val *key, static int mdbx_cursor_spill(MDBX_cursor *mc, const MDBX_val *key,