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

mdbx: refine mdbx_cursor_count() API.

Browse Source
This commit is contained in:
Leo Yuriev 2017-05-25 16:21:29 +03:00
parent 3a166e1970
commit 96de36baef
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mdbx.h
View File

@ -1415,7 +1415,7 @@ LIBMDBX_API int mdbx_cursor_del(MDBX_cursor *cursor, unsigned flags);
* possible errors are: * possible errors are:
* - MDBX_EINVAL - cursor is not initialized, or an invalid parameter * - MDBX_EINVAL - cursor is not initialized, or an invalid parameter
* was specified. */ * was specified. */
LIBMDBX_API int mdbx_cursor_count(MDBX_cursor *cursor, uint64_t *countp); LIBMDBX_API int mdbx_cursor_count(MDBX_cursor *cursor, size_t *countp);
/* Compare two data items according to a particular database. /* Compare two data items according to a particular database.
* *

6
src/mdbx.c
View File

@ -6725,7 +6725,7 @@ int mdbx_cursor_renew(MDBX_txn *txn, MDBX_cursor *mc) {
} }
/* Return the count of duplicate data items for the current key */ /* Return the count of duplicate data items for the current key */
int mdbx_cursor_count(MDBX_cursor *mc, uint64_t *countp) { int mdbx_cursor_count(MDBX_cursor *mc, size_t *countp) {
if (unlikely(mc == NULL || countp == NULL)) if (unlikely(mc == NULL || countp == NULL))
return MDBX_EINVAL; return MDBX_EINVAL;
@ -6755,7 +6755,9 @@ int mdbx_cursor_count(MDBX_cursor *mc, uint64_t *countp) {
if (F_ISSET(leaf->mn_flags, F_DUPDATA)) { if (F_ISSET(leaf->mn_flags, F_DUPDATA)) {
mdbx_cassert(mc, mc->mc_xcursor && (mc->mc_xcursor->mx_cursor.mc_flags & mdbx_cassert(mc, mc->mc_xcursor && (mc->mc_xcursor->mx_cursor.mc_flags &
C_INITIALIZED)); C_INITIALIZED));
*countp = mc->mc_xcursor->mx_db.md_entries; *countp = unlikely(mc->mc_xcursor->mx_db.md_entries > INT_MAX)
? INT_MAX
: mc->mc_xcursor->mx_db.md_entries;
} }
} }
return MDBX_SUCCESS; return MDBX_SUCCESS;