ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2024-10-30 11:29:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: fix added limit's API.

Browse Source
This commit is contained in:
Leo Yuriev 2018-08-22 16:08:59 +03:00
parent 3727a2a099
commit c362ad9465
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mdbx.h
View File

@ -1691,8 +1691,8 @@ LIBMDBX_API int mdbx_is_dirty(const MDBX_txn *txn, const void *ptr);
LIBMDBX_API int mdbx_dbi_sequence(MDBX_txn *txn, MDBX_dbi dbi, uint64_t *result, LIBMDBX_API int mdbx_dbi_sequence(MDBX_txn *txn, MDBX_dbi dbi, uint64_t *result,
uint64_t increment); uint64_t increment);
LIBMDBX_API intptr_t mdbx_limits_pgsize_min(void); LIBMDBX_API int mdbx_limits_pgsize_min(void);
LIBMDBX_API intptr_t mdbx_limits_pgsize_max(void); LIBMDBX_API int mdbx_limits_pgsize_max(void);
LIBMDBX_API intptr_t mdbx_limits_dbsize_min(intptr_t pagesize); LIBMDBX_API intptr_t mdbx_limits_dbsize_min(intptr_t pagesize);
LIBMDBX_API intptr_t mdbx_limits_dbsize_max(intptr_t pagesize); LIBMDBX_API intptr_t mdbx_limits_dbsize_max(intptr_t pagesize);
LIBMDBX_API intptr_t mdbx_limits_keysize_max(intptr_t pagesize); LIBMDBX_API intptr_t mdbx_limits_keysize_max(intptr_t pagesize);

21
src/mdbx.c
View File

@ -12388,21 +12388,23 @@ int mdbx_dbi_sequence(MDBX_txn *txn, MDBX_dbi dbi, uint64_t *result,
__cold intptr_t mdbx_limits_keysize_max(intptr_t pagesize) { __cold intptr_t mdbx_limits_keysize_max(intptr_t pagesize) {
if (pagesize < 1) if (pagesize < 1)
pagesize = (intptr_t)mdbx_syspagesize(); pagesize = (intptr_t)mdbx_syspagesize();
else if (unlikely(pagesize < MIN_PAGESIZE || pagesize > MAX_PAGESIZE || else if (unlikely(pagesize < (intptr_t)MIN_PAGESIZE ||
pagesize > (intptr_t)MAX_PAGESIZE ||
!mdbx_is_power2((size_t)pagesize))) !mdbx_is_power2((size_t)pagesize)))
return -MDBX_EINVAL; return -MDBX_EINVAL;
return mdbx_maxkey(mdbx_nodemax(pagesize)); return mdbx_maxkey(mdbx_nodemax(pagesize));
} }
__cold intptr_t mdbx_limits_pgsize_min(void) { return MIN_PAGESIZE; } __cold int mdbx_limits_pgsize_min(void) { return MIN_PAGESIZE; }
__cold intptr_t mdbx_limits_pgsize_max(void) { return MAX_PAGESIZE; } __cold int mdbx_limits_pgsize_max(void) { return MAX_PAGESIZE; }
__cold intptr_t mdbx_limits_dbsize_min(intptr_t pagesize) { __cold intptr_t mdbx_limits_dbsize_min(intptr_t pagesize) {
if (pagesize < 1) if (pagesize < 1)
pagesize = (intptr_t)mdbx_syspagesize(); pagesize = (intptr_t)mdbx_syspagesize();
else if (unlikely(pagesize < MIN_PAGESIZE || pagesize > MAX_PAGESIZE || else if (unlikely(pagesize < (intptr_t)MIN_PAGESIZE ||
pagesize > (intptr_t)MAX_PAGESIZE ||
!mdbx_is_power2((size_t)pagesize))) !mdbx_is_power2((size_t)pagesize)))
return -MDBX_EINVAL; return -MDBX_EINVAL;
@ -12412,18 +12414,21 @@ __cold intptr_t mdbx_limits_dbsize_min(intptr_t pagesize) {
__cold intptr_t mdbx_limits_dbsize_max(intptr_t pagesize) { __cold intptr_t mdbx_limits_dbsize_max(intptr_t pagesize) {
if (pagesize < 1) if (pagesize < 1)
pagesize = (intptr_t)mdbx_syspagesize(); pagesize = (intptr_t)mdbx_syspagesize();
else if (unlikely(pagesize < MIN_PAGESIZE || pagesize > MAX_PAGESIZE || else if (unlikely(pagesize < (intptr_t)MIN_PAGESIZE ||
pagesize > (intptr_t)MAX_PAGESIZE ||
!mdbx_is_power2((size_t)pagesize))) !mdbx_is_power2((size_t)pagesize)))
return -MDBX_EINVAL; return -MDBX_EINVAL;
const intptr_t limit = MAX_PAGENO * pagesize; const uint64_t limit = MAX_PAGENO * (uint64_t)pagesize;
return ((size_t)limit < MAX_MAPSIZE) ? limit : MAX_PAGESIZE; return (limit < (intptr_t)MAX_MAPSIZE) ? (intptr_t)limit
: (intptr_t)MAX_PAGESIZE;
} }
__cold intptr_t mdbx_limits_txnsize_max(intptr_t pagesize) { __cold intptr_t mdbx_limits_txnsize_max(intptr_t pagesize) {
if (pagesize < 1) if (pagesize < 1)
pagesize = (intptr_t)mdbx_syspagesize(); pagesize = (intptr_t)mdbx_syspagesize();
else if (unlikely(pagesize < MIN_PAGESIZE || pagesize > MAX_PAGESIZE || else if (unlikely(pagesize < (intptr_t)MIN_PAGESIZE ||
pagesize > (intptr_t)MAX_PAGESIZE ||
!mdbx_is_power2((size_t)pagesize))) !mdbx_is_power2((size_t)pagesize)))
return -MDBX_EINVAL; return -MDBX_EINVAL;