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

mdbx: fix handling MDBX_GET_BOTH_RANGE.

Browse Source 
Partially revert 77e84ccca8d634db087fc710b1c4aea69ee5a6a6 and 7522246ccdb3c1b0928aa3e0f593133db0fadae5.

Resolves https://github.com/erthink/libmdbx/issues/130

Change-Id: Ib9f49a3e6a108a0d914ccde7ccb4dc0ef6056ff7
This commit is contained in:
Leonid Yuriev 2020-10-31 20:43:33 +03:00
parent 61f0ee891f
commit 5ad167410c
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core.c
View File

@ -11712,13 +11712,19 @@ int mdbx_get_equal_or_great(MDBX_txn *txn, MDBX_dbi dbi, MDBX_val *key,
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
return rc; return rc;
MDBX_val save_data = *data;
int exact = 0; int exact = 0;
rc = mdbx_cursor_set( rc = mdbx_cursor_set(&cx.outer, key, data, MDBX_SET_RANGE, &exact);
&cx.outer, key, data,
cx.outer.mc_xcursor ? MDBX_GET_BOTH_RANGE : MDBX_SET_RANGE, &exact);
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
return rc; return rc;
if (exact && (txn->mt_dbs[dbi].md_flags & MDBX_DUPSORT) != 0) {
*data = save_data;
exact = 0;
rc = mdbx_cursor_set(&cx.outer, key, data, MDBX_GET_BOTH_RANGE, &exact);
if (unlikely(rc != MDBX_SUCCESS))
return rc;
}
return exact ? MDBX_SUCCESS : MDBX_RESULT_TRUE; return exact ? MDBX_SUCCESS : MDBX_RESULT_TRUE;
} }
@ -12154,7 +12160,7 @@ static int mdbx_cursor_set(MDBX_cursor *mc, MDBX_val *key, MDBX_val *data,
set2: set2:
node = mdbx_node_search(mc, &aligned_key, exactp); node = mdbx_node_search(mc, &aligned_key, exactp);
if (!*exactp && !(op == MDBX_SET_RANGE || op == MDBX_GET_BOTH_RANGE)) { if (!*exactp && op != MDBX_SET_RANGE) {
/* MDBX_SET specified and not an exact match. */ /* MDBX_SET specified and not an exact match. */
return MDBX_NOTFOUND; return MDBX_NOTFOUND;
} }
@ -12190,10 +12196,8 @@ set1:
if (op == MDBX_SET || op == MDBX_SET_KEY || op == MDBX_SET_RANGE) { if (op == MDBX_SET || op == MDBX_SET_KEY || op == MDBX_SET_RANGE) {
rc = mdbx_cursor_first(&mc->mc_xcursor->mx_cursor, data, NULL); rc = mdbx_cursor_first(&mc->mc_xcursor->mx_cursor, data, NULL);
} else { } else {
int dummy = 0;
rc = mdbx_cursor_set(&mc->mc_xcursor->mx_cursor, data, NULL, rc = mdbx_cursor_set(&mc->mc_xcursor->mx_cursor, data, NULL,
MDBX_SET_RANGE, MDBX_SET_RANGE, NULL);
(op == MDBX_GET_BOTH_RANGE) ? exactp : &dummy);
} }
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
return rc; return rc;