ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-04-27 19:22:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: minor refine mdbx_page_flush().

Browse Source 
More for https://github.com/erthink/libmdbx/issues/132.

Change-Id: I703e1359d859b8901fcbdf57211f7805cd6d5ff1
This commit is contained in:
Leonid Yuriev 2020-12-04 14:04:02 +03:00
parent 262e4981db
commit 12ee5e6cac
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/core.c
View File

@ -3209,7 +3209,7 @@ static int __must_check_result mdbx_page_search(MDBX_cursor *mc,
static int __must_check_result mdbx_page_merge(MDBX_cursor *csrc, static int __must_check_result mdbx_page_merge(MDBX_cursor *csrc,
MDBX_cursor *cdst); MDBX_cursor *cdst);
static int __must_check_result mdbx_page_flush(MDBX_txn *txn, static int __must_check_result mdbx_page_flush(MDBX_txn *txn,
const unsigned keep); const size_t keep);
#define MDBX_SPLIT_REPLACE MDBX_APPENDDUP /* newkey is not new */ #define MDBX_SPLIT_REPLACE MDBX_APPENDDUP /* newkey is not new */
static int __must_check_result mdbx_page_split(MDBX_cursor *mc, static int __must_check_result mdbx_page_split(MDBX_cursor *mc,
@ -7992,18 +7992,16 @@ static int mdbx_flush_iov(MDBX_txn *const txn, struct iovec *iov,
* [in] txn the transaction that's being committed * [in] txn the transaction that's being committed
* [in] keep number of initial pages in dirtylist to keep dirty. * [in] keep number of initial pages in dirtylist to keep dirty.
* Returns 0 on success, non-zero on failure. */ * Returns 0 on success, non-zero on failure. */
__hot static int mdbx_page_flush(MDBX_txn *txn, const unsigned keep) { __hot static int mdbx_page_flush(MDBX_txn *txn, const size_t keep) {
struct iovec iov[MDBX_COMMIT_PAGES]; struct iovec iov[MDBX_COMMIT_PAGES];
MDBX_dpl *const dl = (keep || txn->tw.loose_count > 1) MDBX_dpl *const dl = mdbx_dpl_sort(txn->tw.dirtylist);
? mdbx_dpl_sort(txn->tw.dirtylist)
: txn->tw.dirtylist;
MDBX_env *const env = txn->mt_env; MDBX_env *const env = txn->mt_env;
pgno_t flush_begin = MAX_PAGENO; pgno_t flush_begin = MAX_PAGENO;
pgno_t flush_end = MIN_PAGENO; pgno_t flush_end = MIN_PAGENO;
unsigned iov_items = 0; unsigned iov_items = 0;
size_t iov_bytes = 0; size_t iov_bytes = 0;
size_t iov_off = 0; size_t iov_off = 0;
unsigned r, w; size_t r, w;
for (r = w = keep; ++r <= dl->length;) { for (r = w = keep; ++r <= dl->length;) {
MDBX_page *dp = dl->items[r].ptr; MDBX_page *dp = dl->items[r].ptr;
mdbx_tassert(txn, mdbx_tassert(txn,
@ -8078,8 +8076,8 @@ __hot static int mdbx_page_flush(MDBX_txn *txn, const unsigned keep) {
(void)flush_begin; (void)flush_begin;
(void)flush_end; (void)flush_end;
txn->tw.dirtyroom += r - 1 - w; txn->tw.dirtyroom += (unsigned)(r - 1 - w);
dl->length = w; dl->length = (unsigned)w;
mdbx_tassert(txn, txn->mt_parent || mdbx_tassert(txn, txn->mt_parent ||
txn->tw.dirtyroom + txn->tw.dirtylist->length == txn->tw.dirtyroom + txn->tw.dirtylist->length ==
txn->mt_env->me_options.dp_limit); txn->mt_env->me_options.dp_limit);