Skip to content

Commit fe2b1cd

Browse files
hfuruhfuru
committed
Factor out refreshing sub-page pointers
1 parent 6b1df0e commit fe2b1cd

File tree

1 file changed

+36
-52
lines changed

1 file changed

+36
-52
lines changed

‎libraries/liblmdb/mdb.c

Lines changed: 36 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1188,6 +1188,21 @@ typedef struct MDB_xcursor {
11881188
unsigned char mx_dbflag;
11891189
} MDB_xcursor;
11901190

1191+
/** Check if there is an inited xcursor, so #XCURSOR_REFRESH() is proper */
1192+
#define XCURSOR_INITED(mc) \
1193+
((mc)->mc_xcursor && ((mc)->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED))
1194+
1195+
/** Update sub-page pointer, if any, in \b mc->mc_xcursor. Needed
1196+
* when the node which contains the sub-page may have moved. Called
1197+
* with \b mp = mc->mc_pg[mc->mc_top], \b ki = mc->mc_ki[mc->mc_top].
1198+
*/
1199+
#define XCURSOR_REFRESH(mc, mp, ki) do { \
1200+
MDB_page *xr_pg = (mp); \
1201+
MDB_node *xr_node = NODEPTR(xr_pg, ki); \
1202+
if ((xr_node->mn_flags & (F_DUPDATA|F_SUBDATA)) == F_DUPDATA) \
1203+
(mc)->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(xr_node); \
1204+
} while (0)
1205+
11911206
/** State of FreeDB old pages, stored in the MDB_env */
11921207
typedef struct MDB_pgstate {
11931208
pgno_t *mf_pghead; /**< Reclaimed freeDB pages, or NULL before use */
@@ -1618,7 +1633,7 @@ mdb_cursor_chk(MDB_cursor *mc)
16181633
}
16191634
if (mc->mc_ki[i] >= NUMKEYS(mc->mc_pg[i]))
16201635
printf("ack!\n");
1621-
if (mc->mc_xcursor && (mc->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED)) {
1636+
if (XCURSOR_INITED(mc)) {
16221637
node = NODEPTR(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top]);
16231638
if (((node->mn_flags & (F_DUPDATA|F_SUBDATA)) == F_DUPDATA) &&
16241639
mc->mc_xcursor->mx_cursor.mc_pg[0] != NODEDATA(node)) {
@@ -2433,14 +2448,8 @@ mdb_page_touch(MDB_cursor *mc)
24332448
if (m2 == mc) continue;
24342449
if (m2->mc_pg[mc->mc_top] == mp) {
24352450
m2->mc_pg[mc->mc_top] = np;
2436-
if ((mc->mc_db->md_flags & MDB_DUPSORT) &&
2437-
IS_LEAF(np) &&
2438-
(m2->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED))
2439-
{
2440-
MDB_node *leaf = NODEPTR(np, m2->mc_ki[mc->mc_top]);
2441-
if ((leaf->mn_flags & (F_DUPDATA|F_SUBDATA)) == F_DUPDATA)
2442-
m2->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(leaf);
2443-
}
2451+
if (XCURSOR_INITED(m2) && IS_LEAF(np))
2452+
XCURSOR_REFRESH(m2, np, m2->mc_ki[mc->mc_top]);
24442453
}
24452454
}
24462455
}
@@ -6726,11 +6735,8 @@ mdb_cursor_put(MDB_cursor *mc, MDB_val *key, MDB_val *data,
67266735
if (m3->mc_ki[i] >= mc->mc_ki[i] && insert_key) {
67276736
m3->mc_ki[i]++;
67286737
}
6729-
if (m3->mc_xcursor && (m3->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED)) {
6730-
MDB_node *n2 = NODEPTR(mp, m3->mc_ki[i]);
6731-
if ((n2->mn_flags & (F_SUBDATA|F_DUPDATA)) == F_DUPDATA)
6732-
m3->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(n2);
6733-
}
6738+
if (XCURSOR_INITED(m3))
6739+
XCURSOR_REFRESH(m3, mp, m3->mc_ki[i]);
67346740
}
67356741
}
67366742
}
@@ -6781,9 +6787,7 @@ mdb_cursor_put(MDB_cursor *mc, MDB_val *key, MDB_val *data,
67816787
if (m2->mc_ki[i] == mc->mc_ki[i]) {
67826788
mdb_xcursor_init2(m2, mx, new_dupdata);
67836789
} else if (!insert_key && m2->mc_ki[i] < nkeys) {
6784-
MDB_node *n2 = NODEPTR(mp, m2->mc_ki[i]);
6785-
if ((n2->mn_flags & (F_SUBDATA|F_DUPDATA)) == F_DUPDATA)
6786-
m2->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(n2);
6790+
XCURSOR_REFRESH(m2, mp, m2->mc_ki[i]);
67876791
}
67886792
}
67896793
}
@@ -6888,13 +6892,12 @@ mdb_cursor_del(MDB_cursor *mc, unsigned int flags)
68886892
if (m2 == mc || m2->mc_snum < mc->mc_snum) continue;
68896893
if (!(m2->mc_flags & C_INITIALIZED)) continue;
68906894
if (m2->mc_pg[mc->mc_top] == mp) {
6891-
if (m2->mc_ki[mc->mc_top] == mc->mc_ki[mc->mc_top]) {
6892-
m2->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(leaf);
6893-
} else {
6894-
MDB_node *n2 = NODEPTR(mp, m2->mc_ki[mc->mc_top]);
6895-
if (!(n2->mn_flags & F_SUBDATA))
6896-
m2->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(n2);
6895+
MDB_node *n2 = leaf;
6896+
if (m2->mc_ki[mc->mc_top] != mc->mc_ki[mc->mc_top]) {
6897+
n2 = NODEPTR(mp, m2->mc_ki[mc->mc_top]);
6898+
if (n2->mn_flags & F_SUBDATA) continue;
68976899
}
6900+
m2->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(n2);
68986901
}
68996902
}
69006903
}
@@ -7731,12 +7734,8 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst, int fromleft)
77317734
m3->mc_ki[csrc->mc_top] = cdst->mc_ki[cdst->mc_top];
77327735
m3->mc_ki[csrc->mc_top-1]++;
77337736
}
7734-
if (m3->mc_xcursor && (m3->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED) &&
7735-
IS_LEAF(mps)) {
7736-
MDB_node *node = NODEPTR(m3->mc_pg[csrc->mc_top], m3->mc_ki[csrc->mc_top]);
7737-
if ((node->mn_flags & (F_DUPDATA|F_SUBDATA)) == F_DUPDATA)
7738-
m3->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(node);
7739-
}
7737+
if (XCURSOR_INITED(m3) && IS_LEAF(mps))
7738+
XCURSOR_REFRESH(m3, m3->mc_pg[csrc->mc_top], m3->mc_ki[csrc->mc_top]);
77407739
}
77417740
} else
77427741
/* Adding on the right, bump others down */
@@ -7757,12 +7756,8 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst, int fromleft)
77577756
} else {
77587757
m3->mc_ki[csrc->mc_top]--;
77597758
}
7760-
if (m3->mc_xcursor && (m3->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED) &&
7761-
IS_LEAF(mps)) {
7762-
MDB_node *node = NODEPTR(m3->mc_pg[csrc->mc_top], m3->mc_ki[csrc->mc_top]);
7763-
if ((node->mn_flags & (F_DUPDATA|F_SUBDATA)) == F_DUPDATA)
7764-
m3->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(node);
7765-
}
7759+
if (XCURSOR_INITED(m3) && IS_LEAF(mps))
7760+
XCURSOR_REFRESH(m3, m3->mc_pg[csrc->mc_top], m3->mc_ki[csrc->mc_top]);
77667761
}
77677762
}
77687763
}
@@ -7963,12 +7958,8 @@ mdb_page_merge(MDB_cursor *csrc, MDB_cursor *cdst)
79637958
m3->mc_ki[top-1] > csrc->mc_ki[top-1]) {
79647959
m3->mc_ki[top-1]--;
79657960
}
7966-
if (m3->mc_xcursor && (m3->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED) &&
7967-
IS_LEAF(psrc)) {
7968-
MDB_node *node = NODEPTR(m3->mc_pg[top], m3->mc_ki[top]);
7969-
if ((node->mn_flags & (F_DUPDATA|F_SUBDATA)) == F_DUPDATA)
7970-
m3->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(node);
7971-
}
7961+
if (XCURSOR_INITED(m3) && IS_LEAF(psrc))
7962+
XCURSOR_REFRESH(m3, m3->mc_pg[top], m3->mc_ki[top]);
79727963
}
79737964
}
79747965
{
@@ -8230,11 +8221,8 @@ mdb_cursor_del0(MDB_cursor *mc)
82308221
} else if (m3->mc_ki[mc->mc_top] > ki) {
82318222
m3->mc_ki[mc->mc_top]--;
82328223
}
8233-
if (m3->mc_xcursor && (m3->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED)) {
8234-
MDB_node *node = NODEPTR(m3->mc_pg[mc->mc_top], m3->mc_ki[mc->mc_top]);
8235-
if ((node->mn_flags & (F_DUPDATA|F_SUBDATA)) == F_DUPDATA)
8236-
m3->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(node);
8237-
}
8224+
if (XCURSOR_INITED(m3))
8225+
XCURSOR_REFRESH(m3, m3->mc_pg[mc->mc_top], m3->mc_ki[mc->mc_top]);
82388226
}
82398227
}
82408228
}
@@ -8764,12 +8752,8 @@ mdb_page_split(MDB_cursor *mc, MDB_val *newkey, MDB_val *newdata, pgno_t newpgno
87648752
m3->mc_ki[ptop] >= mc->mc_ki[ptop]) {
87658753
m3->mc_ki[ptop]++;
87668754
}
8767-
if (m3->mc_xcursor && (m3->mc_xcursor->mx_cursor.mc_flags & C_INITIALIZED) &&
8768-
IS_LEAF(mp)) {
8769-
MDB_node *node = NODEPTR(m3->mc_pg[mc->mc_top], m3->mc_ki[mc->mc_top]);
8770-
if ((node->mn_flags & (F_DUPDATA|F_SUBDATA)) == F_DUPDATA)
8771-
m3->mc_xcursor->mx_cursor.mc_pg[0] = NODEDATA(node);
8772-
}
8755+
if (XCURSOR_INITED(m3) && IS_LEAF(mp))
8756+
XCURSOR_REFRESH(m3, m3->mc_pg[mc->mc_top], m3->mc_ki[mc->mc_top]);
87738757
}
87748758
}
87758759
DPRINTF(("mp left: %d, rp left: %d", SIZELEFT(mp), SIZELEFT(rp)));

0 commit comments

Comments
 (0)