NextGraph
/
lmdb
mirror of https://github.com/nextgraph-org/lmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ITS#7570 fix MDB_GET_MULTIPLE and MDB_NEXT_MULTIPLE

Browse Source
vmware
Claude Brisson 12 years ago committed by Howard Chu
parent fbe6a6051b
commit 372b3ddb85
1 changed files with 11 additions and 4 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 15
      libraries/liblmdb/mdb.c

15
libraries/liblmdb/mdb.c
Unescape View File

@ -4377,6 +4377,8 @@ mdb_cursor_next(MDB_cursor *mc, MDB_val *key, MDB_val *data, MDB_cursor_op op)
rc = mdb_cursor_first(&mc->mc_xcursor->mx_cursor, data, NULL); rc = mdb_cursor_first(&mc->mc_xcursor->mx_cursor, data, NULL);
if (rc != MDB_SUCCESS) if (rc != MDB_SUCCESS)
return rc; return rc;
} else if (mc->mc_db->md_flags & MDB_DUPSORT) {
mc->mc_xcursor->mx_cursor.mc_flags &= ~C_INITIALIZED;
} }
} }
@ -4790,8 +4792,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)) goto fetch;
if (mc->mc_xcursor->mx_cursor.mc_flags & C_EOF)
break; break;
goto fetchm; goto fetchm;
case MDB_NEXT_MULTIPLE: case MDB_NEXT_MULTIPLE:
@ -4803,7 +4806,7 @@ mdb_cursor_get(MDB_cursor *mc, MDB_val *key, MDB_val *data,
if (!(mc->mc_flags & C_INITIALIZED)) if (!(mc->mc_flags & C_INITIALIZED))
rc = mdb_cursor_first(mc, key, data); rc = mdb_cursor_first(mc, key, data);
else else
rc = mdb_cursor_next(mc, key, data, MDB_NEXT_DUP); rc = mdb_cursor_next(mc, key, data, MDB_NEXT_NODUP);
if (rc == MDB_SUCCESS) { if (rc == MDB_SUCCESS) {
if (mc->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED) { if (mc->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED) {
MDB_cursor *mx; MDB_cursor *mx;
@ -4814,7 +4817,11 @@ fetchm:
data->mv_data = METADATA(mx->mc_pg[mx->mc_top]); data->mv_data = METADATA(mx->mc_pg[mx->mc_top]);
mx->mc_ki[mx->mc_top] = NUMKEYS(mx->mc_pg[mx->mc_top])-1; mx->mc_ki[mx->mc_top] = NUMKEYS(mx->mc_pg[mx->mc_top])-1;
} else { } else {
rc = MDB_NOTFOUND; MDB_node *leaf;
fetch:
leaf = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]);
data->mv_size = NODEDSZ(leaf);
data->mv_data = NODEDATA(leaf);
} }
} }
break; break;

Write Preview
Loading…
Cancel
Save