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

mdbx: fix cursor EOF tricks.

Browse Source 
LY: Don't touch cursor's C_EOF flag in functions
    that don't moves the cursor.

HYC: Further fix f8ce8a82717ddefdc912fa47c07f1bdee2a3336b
     Fully revert the change to GET_MULTIPLE

Change-Id: Ia8e6dc0af04e5c7b2fd1a2fc9632ccfecc01819a
This commit is contained in:
Leo Yuriev 2017-01-18 17:15:51 +03:00
parent c4142c9a35
commit 14b466bd2d
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mdb.c
View File

@ -6537,16 +6537,9 @@ mdb_cursor_get(MDB_cursor *mc, MDB_val *key, MDB_val *data,
break; break;
} }
rc = MDB_SUCCESS; rc = MDB_SUCCESS;
if (!(mc->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED)) if (!(mc->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED) ||
(mc->mc_xcursor->mx_cursor.mc_flags & C_EOF))
break; break;
if (mc->mc_xcursor->mx_cursor.mc_flags & C_EOF) {
MDB_cursor *mx = &mc->mc_xcursor->mx_cursor;
if (mx->mc_ki[mx->mc_top] >= NUMKEYS(mx->mc_pg[mx->mc_top])-1) {
rc = MDB_NOTFOUND;
break;
}
mx->mc_flags ^= C_EOF;
}
goto fetchm; goto fetchm;
case MDB_NEXT_MULTIPLE: case MDB_NEXT_MULTIPLE:
if (unlikely(data == NULL)) { if (unlikely(data == NULL)) {
@ -7896,12 +7889,9 @@ mdb_cursor_count(MDB_cursor *mc, size_t *countp)
} }
MDB_page *mp = mc->mc_pg[mc->mc_top]; MDB_page *mp = mc->mc_pg[mc->mc_top];
if (mc->mc_flags & C_EOF) { if ((mc->mc_flags & C_EOF) && mc->mc_ki[mc->mc_top] >= NUMKEYS(mp)) {
if (mc->mc_ki[mc->mc_top] >= NUMKEYS(mp)) { *countp = 0;
*countp = 0; return MDB_NOTFOUND;
return MDB_NOTFOUND;
}
mc->mc_flags ^= C_EOF;
} }
if (mc->mc_xcursor == NULL || IS_LEAF2(mp)) { if (mc->mc_xcursor == NULL || IS_LEAF2(mp)) {
@ -7922,13 +7912,11 @@ mdb_cursor_count(MDB_cursor *mc, size_t *countp)
if (!mc->mc_snum) if (!mc->mc_snum)
return MDB_NOTFOUND; return MDB_NOTFOUND;
if (mc->mc_flags & C_EOF) { MDB_page *mp = mc->mc_pg[mc->mc_top];
if (mc->mc_ki[mc->mc_top] >= NUMKEYS(mc->mc_pg[mc->mc_top])) if ((mc->mc_flags & C_EOF) && mc->mc_ki[mc->mc_top] >= NUMKEYS(mp))
return MDB_NOTFOUND; return MDB_NOTFOUND;
mc->mc_flags ^= C_EOF;
}
MDB_node *leaf = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]); MDB_node *leaf = NODEPTR(mp, mc->mc_ki[mc->mc_top]);
if (!F_ISSET(leaf->mn_flags, F_DUPDATA)) { if (!F_ISSET(leaf->mn_flags, F_DUPDATA)) {
*countp = 1; *countp = 1;
} else { } else {