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

Tweak NODUPDATA flag check

Browse Source 
Should allow for the possibility of future flag combos.
vmware
Howard Chu 11 years ago
parent 5a5d33ff33
commit 6ecee1cbf9
1 changed files with 2 additions and 2 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. 4
      libraries/liblmdb/mdb.c

4
libraries/liblmdb/mdb.c
Unescape View File

@ -5655,7 +5655,7 @@ more:
#endif #endif
/* if data matches, skip it */ /* if data matches, skip it */
if (!mc->mc_dbx->md_dcmp(data, &dkey)) { if (!mc->mc_dbx->md_dcmp(data, &dkey)) {
if (flags == MDB_NODUPDATA) if (flags & MDB_NODUPDATA)
rc = MDB_KEYEXIST; rc = MDB_KEYEXIST;
else if (flags & MDB_MULTIPLE) else if (flags & MDB_MULTIPLE)
goto next_mult; goto next_mult;
@ -5987,7 +5987,7 @@ mdb_cursor_del(MDB_cursor *mc, unsigned int flags)
leaf = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]); leaf = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]);
if (!IS_LEAF2(mc->mc_pg[mc->mc_top]) && F_ISSET(leaf->mn_flags, F_DUPDATA)) { if (!IS_LEAF2(mc->mc_pg[mc->mc_top]) && F_ISSET(leaf->mn_flags, F_DUPDATA)) {
if (flags != MDB_NODUPDATA) { if (!(flags & MDB_NODUPDATA)) {
if (!F_ISSET(leaf->mn_flags, F_SUBDATA)) { if (!F_ISSET(leaf->mn_flags, F_SUBDATA)) {
mc->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(leaf); mc->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(leaf);
} }

Write Preview
Loading…
Cancel
Save