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

mdbx: fix minor assertions.

Browse Source 
Change-Id: Ib3e2dcb2cb419f41717351b2ac2264ffed906014
This commit is contained in:
Leonid Yuriev
2021-01-20 23:42:52 +03:00
parent bed14e60c2
commit afe93137fc
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core.c
View File

@@ -4660,7 +4660,6 @@ static bool meta_weak_acceptable(const MDBX_env *env, const MDBX_meta *meta,
static __inline txnid_t meta_txnid(const MDBX_env *env, const MDBX_meta *meta, static __inline txnid_t meta_txnid(const MDBX_env *env, const MDBX_meta *meta,
const bool allow_volatile) { const bool allow_volatile) {
mdbx_assert(env, meta >= METAPAGE(env, 0) || meta < METAPAGE_END(env));
txnid_t a = unaligned_peek_u64(4, &meta->mm_txnid_a); txnid_t a = unaligned_peek_u64(4, &meta->mm_txnid_a);
txnid_t b = unaligned_peek_u64(4, &meta->mm_txnid_b); txnid_t b = unaligned_peek_u64(4, &meta->mm_txnid_b);
if (allow_volatile) if (allow_volatile)
@@ -4681,7 +4680,7 @@ static __inline txnid_t mdbx_meta_txnid_fluid(const MDBX_env *env,
static __inline void mdbx_meta_update_begin(const MDBX_env *env, static __inline void mdbx_meta_update_begin(const MDBX_env *env,
MDBX_meta *meta, txnid_t txnid) { MDBX_meta *meta, txnid_t txnid) {
mdbx_assert(env, meta >= METAPAGE(env, 0) || meta < METAPAGE_END(env)); mdbx_assert(env, meta >= METAPAGE(env, 0) && meta < METAPAGE_END(env));
mdbx_assert(env, unaligned_peek_u64(4, meta->mm_txnid_a) < txnid && mdbx_assert(env, unaligned_peek_u64(4, meta->mm_txnid_a) < txnid &&
unaligned_peek_u64(4, meta->mm_txnid_b) < txnid); unaligned_peek_u64(4, meta->mm_txnid_b) < txnid);
(void)env; (void)env;
@@ -4691,7 +4690,7 @@ static __inline void mdbx_meta_update_begin(const MDBX_env *env,
static __inline void mdbx_meta_update_end(const MDBX_env *env, MDBX_meta *meta, static __inline void mdbx_meta_update_end(const MDBX_env *env, MDBX_meta *meta,
txnid_t txnid) { txnid_t txnid) {
mdbx_assert(env, meta >= METAPAGE(env, 0) || meta < METAPAGE_END(env)); mdbx_assert(env, meta >= METAPAGE(env, 0) && meta < METAPAGE_END(env));
mdbx_assert(env, unaligned_peek_u64(4, meta->mm_txnid_a) == txnid); mdbx_assert(env, unaligned_peek_u64(4, meta->mm_txnid_a) == txnid);
mdbx_assert(env, unaligned_peek_u64(4, meta->mm_txnid_b) < txnid); mdbx_assert(env, unaligned_peek_u64(4, meta->mm_txnid_b) < txnid);
(void)env; (void)env;