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

ITS#7771 mdb_cursor_del0(): Fix xcursor tracking.

Browse Source
vmware
Hallvard Furuseth 11 years ago
parent 5adc46d1d2
commit ce2a0d4016
1 changed files with 11 additions and 10 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. 23
      libraries/liblmdb/mdb.c

23
libraries/liblmdb/mdb.c
Unescape View File

@ -7361,7 +7361,7 @@ mdb_cursor_del0(MDB_cursor *mc, MDB_node *leaf)
if (rc != MDB_SUCCESS) if (rc != MDB_SUCCESS)
mc->mc_txn->mt_flags |= MDB_TXN_ERROR; mc->mc_txn->mt_flags |= MDB_TXN_ERROR;
else { else {
MDB_cursor *m2; MDB_cursor *m2, *m3;
MDB_dbi dbi = mc->mc_dbi; MDB_dbi dbi = mc->mc_dbi;
mp = mc->mc_pg[mc->mc_top]; mp = mc->mc_pg[mc->mc_top];
@ -7373,18 +7373,19 @@ mdb_cursor_del0(MDB_cursor *mc, MDB_node *leaf)
/* Adjust other cursors pointing to mp */ /* Adjust other cursors pointing to mp */
for (m2 = mc->mc_txn->mt_cursors[dbi]; m2; m2=m2->mc_next) { for (m2 = mc->mc_txn->mt_cursors[dbi]; m2; m2=m2->mc_next) {
if (m2 == mc || m2->mc_snum < mc->mc_snum) m3 = (mc->mc_flags & C_SUB) ? &m2->mc_xcursor->mx_cursor : m2;
if (! (m2->mc_flags & m3->mc_flags & C_INITIALIZED))
continue; continue;
if (!(m2->mc_flags & C_INITIALIZED)) if (m3 == mc || m3->mc_snum < mc->mc_snum)
continue; continue;
if (m2->mc_pg[mc->mc_top] == mp) { if (m3->mc_pg[mc->mc_top] == mp) {
if (m2->mc_ki[mc->mc_top] >= ki) { if (m3->mc_ki[mc->mc_top] >= ki) {
m2->mc_flags |= C_DEL; m3->mc_flags |= C_DEL;
if (m2->mc_ki[mc->mc_top] > ki) if (m3->mc_ki[mc->mc_top] > ki)
m2->mc_ki[mc->mc_top]--; m3->mc_ki[mc->mc_top]--;
} }
if (m2->mc_ki[mc->mc_top] >= nkeys) if (m3->mc_ki[mc->mc_top] >= nkeys)
mdb_cursor_sibling(m2, 1); mdb_cursor_sibling(m3, 1);
} }
} }
mc->mc_flags |= C_DEL; mc->mc_flags |= C_DEL;

Write Preview
Loading…
Cancel
Save