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

lmdb: me_maxkey_limit always computed and checked against MDB_MAXKEYSIZE at opening env.

Browse Source 
Change-Id: Ice0a425900a8c7b37d5b6cfcd1434edc8d400a74
This commit is contained in:
Leo Yuriev 2015-09-02 18:04:46 +03:00
parent f7d8812e6c
commit 07ee471b1c
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mdb.c
View File

@ -402,7 +402,7 @@ typedef MDB_ID txnid_t;
#if MDB_MAXKEYSIZE #if MDB_MAXKEYSIZE
# define ENV_MAXKEY(env) (MDB_MAXKEYSIZE) # define ENV_MAXKEY(env) (MDB_MAXKEYSIZE)
#else #else
# define ENV_MAXKEY(env) ((env)->me_maxkey) # define ENV_MAXKEY(env) ((env)->me_maxkey_limit)
#endif /* MDB_MAXKEYSIZE */ #endif /* MDB_MAXKEYSIZE */
/** @brief The maximum size of a data item. /** @brief The maximum size of a data item.
@ -1077,9 +1077,7 @@ struct MDB_env {
int me_maxfree_1pg; int me_maxfree_1pg;
/** Max size of a node on a page */ /** Max size of a node on a page */
unsigned me_nodemax; unsigned me_nodemax;
#if !(MDB_MAXKEYSIZE) unsigned me_maxkey_limit; /**< max size of a key */
unsigned me_maxkey; /**< max size of a key */
#endif
int me_live_reader; /**< have liveness lock in reader table */ int me_live_reader; /**< have liveness lock in reader table */
void *me_userctx; /**< User-settable context */ void *me_userctx; /**< User-settable context */
#if MDB_DEBUG #if MDB_DEBUG
@ -4387,11 +4385,12 @@ mdb_env_open2(MDB_env *env, MDB_meta *meta)
env->me_maxfree_1pg = (env->me_psize - PAGEHDRSZ) / sizeof(pgno_t) - 1; env->me_maxfree_1pg = (env->me_psize - PAGEHDRSZ) / sizeof(pgno_t) - 1;
env->me_nodemax = (((env->me_psize - PAGEHDRSZ) / MDB_MINKEYS) & -2) env->me_nodemax = (((env->me_psize - PAGEHDRSZ) / MDB_MINKEYS) & -2)
- sizeof(indx_t); - sizeof(indx_t);
#if !(MDB_MAXKEYSIZE) env->me_maxkey_limit = env->me_nodemax - (NODESIZE + sizeof(MDB_db));
env->me_maxkey = env->me_nodemax - (NODESIZE + sizeof(MDB_db));
#endif
env->me_maxpg = env->me_mapsize / env->me_psize; env->me_maxpg = env->me_mapsize / env->me_psize;
if (MDB_MAXKEYSIZE > env->me_maxkey_limit)
return MDB_BAD_VALSIZE;
return MDB_SUCCESS; return MDB_SUCCESS;
} }