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

mdbx: minor simplify/refine mdbx_env_set_geometry() internals.

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2022-02-12 18:59:41 +03:00
parent 4adc7aa58d
commit 7ade182d64
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/core.c
View File

@ -11536,14 +11536,22 @@ mdbx_env_set_geometry(MDBX_env *env, intptr_t size_lower, intptr_t size_now,
/* apply new params to opened environment */ /* apply new params to opened environment */
mdbx_ensure(env, pagesize == (intptr_t)env->me_psize); mdbx_ensure(env, pagesize == (intptr_t)env->me_psize);
MDBX_meta meta; MDBX_meta meta;
const MDBX_meta *head = nullptr; memset(&meta, 0, sizeof(meta));
const MDBX_geo *current_geo; const MDBX_geo *current_geo;
if (inside_txn) { if (!inside_txn) {
current_geo = &env->me_txn->mt_geo; mdbx_assert(env, need_unlock);
} else { const MDBX_meta *head = constmeta_prefer_last(env);
head = constmeta_prefer_last(env);
meta = *head; meta = *head;
const txnid_t txnid = safe64_txnid_next(constmeta_txnid(env, &meta));
if (unlikely(txnid > MAX_TXNID)) {
rc = MDBX_TXN_FULL;
mdbx_error("txnid overflow, raise %d", rc);
goto bailout;
}
meta_set_txnid(env, &meta, txnid);
current_geo = &meta.mm_geo; current_geo = &meta.mm_geo;
} else {
current_geo = &env->me_txn->mt_geo;
} }
MDBX_geo new_geo; MDBX_geo new_geo;
@ -11614,23 +11622,13 @@ mdbx_env_set_geometry(MDBX_env *env, intptr_t size_lower, intptr_t size_now,
false); false);
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
goto bailout; goto bailout;
mdbx_assert(env, (head == nullptr) == inside_txn);
if (head)
head = /* base address could be changed */ constmeta_prefer_last(env);
} }
if (inside_txn) { if (inside_txn) {
env->me_txn->mt_geo = new_geo; env->me_txn->mt_geo = new_geo;
env->me_txn->mt_flags |= MDBX_TXN_DIRTY; env->me_txn->mt_flags |= MDBX_TXN_DIRTY;
} else { } else {
meta.mm_geo = new_geo; meta.mm_geo = new_geo;
const txnid_t txnid = safe64_txnid_next(constmeta_txnid(env, head)); rc = mdbx_sync_locked(env, env->me_flags, &meta);
if (unlikely(txnid > MAX_TXNID)) {
rc = MDBX_TXN_FULL;
mdbx_error("txnid overflow, raise %d", rc);
} else {
meta_set_txnid(env, &meta, txnid);
rc = mdbx_sync_locked(env, env->me_flags, &meta);
}
} }
if (likely(rc == MDBX_SUCCESS)) { if (likely(rc == MDBX_SUCCESS)) {