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

mdbx: backport - ITS#8622 fix xcursor after cursor_del.

Browse Source 
Re-fix 6b1df0e4c7fadd21d1233d7157229b2d89ccaa04 from ITS#8406

Change-Id: Ied16e11c06fc3ce626ee4885d153aff98e5f8802
This commit is contained in:
Howard Chu 2017-03-23 20:37:24 +00:00 committed by Leo Yuriev
parent b950b010bf
commit 36bc576036
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mdb.c
View File

@ -8767,14 +8767,17 @@ mdb_cursor_del0(MDB_cursor *mc)
} }
if (mc->mc_db->md_flags & MDB_DUPSORT) { if (mc->mc_db->md_flags & MDB_DUPSORT) {
MDB_node *node = NODEPTR(m3->mc_pg[m3->mc_top], m3->mc_ki[m3->mc_top]); MDB_node *node = NODEPTR(m3->mc_pg[m3->mc_top], m3->mc_ki[m3->mc_top]);
/* If this node is a fake page, it needs to be reinited /* If this node has dupdata, it may need to be reinited
* because its data has moved. But just reset mc_pg[0] * because its data has moved.
* if the xcursor is already live. * If the xcursor was not initd it must be reinited.
* Else if node points to a subDB, nothing is needed.
* Else (xcursor was initd, not a subDB) needs mc_pg[0] reset.
*/ */
if ((node->mn_flags & (F_DUPDATA|F_SUBDATA)) == F_DUPDATA) { if (node->mn_flags & F_DUPDATA) {
if (m3->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED) if (m3->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED) {
m3->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(node); if (!(node->mn_flags & F_SUBDATA))
else m3->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(node);
} else
mdb_xcursor_init1(m3, node); mdb_xcursor_init1(m3, node);
} }
} }