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

mdbx: use current txn geo for untouched parameters when env_set_geometry() called within a write transaction.

Browse Source
This commit is contained in:
Леонид Юрьев (Leonid Yuriev) 2022-08-13 16:52:43 +03:00
parent 9f0e2ecc67
commit 8467cc6d03
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/core.c
View File

@ -11671,38 +11671,40 @@ mdbx_env_set_geometry(MDBX_env *env, intptr_t size_lower, intptr_t size_now,
if (unlikely(env->me_flags & MDBX_RDONLY)) if (unlikely(env->me_flags & MDBX_RDONLY))
return MDBX_EACCESS; return MDBX_EACCESS;
if (!inside_txn) { const MDBX_geo *geo = nullptr;
if (inside_txn)
geo = &env->me_txn->mt_geo;
else {
int err = mdbx_txn_lock(env, false); int err = mdbx_txn_lock(env, false);
if (unlikely(err != MDBX_SUCCESS)) if (unlikely(err != MDBX_SUCCESS))
return err; return err;
need_unlock = true; need_unlock = true;
}
const MDBX_meta *head = constmeta_prefer_last(env); const MDBX_meta *head = constmeta_prefer_last(env);
if (!inside_txn) { geo = &head->mm_geo;
env->me_txn0->mt_txnid = constmeta_txnid(env, head); env->me_txn0->mt_txnid = constmeta_txnid(env, head);
mdbx_find_oldest(env->me_txn0); mdbx_find_oldest(env->me_txn0);
} }
/* get untouched params from DB */ /* get untouched params from current write-txn or DB */
if (pagesize <= 0 || pagesize >= INT_MAX) if (pagesize <= 0 || pagesize >= INT_MAX)
pagesize = env->me_psize; pagesize = env->me_psize;
if (size_lower < 0) if (size_lower < 0)
size_lower = pgno2bytes(env, head->mm_geo.lower); size_lower = pgno2bytes(env, geo->lower);
if (size_now < 0) if (size_now < 0)
size_now = pgno2bytes(env, head->mm_geo.now); size_now = pgno2bytes(env, geo->now);
if (size_upper < 0) if (size_upper < 0)
size_upper = pgno2bytes(env, head->mm_geo.upper); size_upper = pgno2bytes(env, geo->upper);
if (growth_step < 0) if (growth_step < 0)
growth_step = pgno2bytes(env, pv2pages(head->mm_geo.grow_pv)); growth_step = pgno2bytes(env, pv2pages(geo->grow_pv));
if (shrink_threshold < 0) if (shrink_threshold < 0)
shrink_threshold = pgno2bytes(env, pv2pages(head->mm_geo.shrink_pv)); shrink_threshold = pgno2bytes(env, pv2pages(geo->shrink_pv));
if (pagesize != (intptr_t)env->me_psize) { if (pagesize != (intptr_t)env->me_psize) {
rc = MDBX_EINVAL; rc = MDBX_EINVAL;
goto bailout; goto bailout;
} }
const size_t usedbytes = const size_t usedbytes = pgno2bytes(env, mdbx_find_largest(env, geo->next));
pgno2bytes(env, mdbx_find_largest(env, head->mm_geo.next));
if ((size_t)size_upper < usedbytes) { if ((size_t)size_upper < usedbytes) {
rc = MDBX_MAP_FULL; rc = MDBX_MAP_FULL;
goto bailout; goto bailout;