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

ITS#7266 fix rebalance for LEAF2 pages

Browse Source
vmware
Howard Chu 13 years ago
parent a540597dd6
commit eeec509150
1 changed files with 24 additions and 9 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. 33
      libraries/libmdb/mdb.c

33
libraries/libmdb/mdb.c
Unescape View File

@ -5214,9 +5214,14 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst)
MDB_node *s2; MDB_node *s2;
/* must find the lowest key below src */ /* must find the lowest key below src */
mdb_page_search_root(csrc, NULL, 0); mdb_page_search_root(csrc, NULL, 0);
s2 = NODEPTR(csrc->mc_pg[csrc->mc_top], 0); if (IS_LEAF2(csrc->mc_pg[csrc->mc_top])) {
key.mv_size = NODEKSZ(s2); key.mv_size = csrc->mc_db->md_pad;
key.mv_data = NODEKEY(s2); key.mv_data = LEAF2KEY(csrc->mc_pg[csrc->mc_top], 0, key.mv_size);
} else {
s2 = NODEPTR(csrc->mc_pg[csrc->mc_top], 0);
key.mv_size = NODEKSZ(s2);
key.mv_data = NODEKEY(s2);
}
csrc->mc_snum = snum--; csrc->mc_snum = snum--;
csrc->mc_top = snum; csrc->mc_top = snum;
} else { } else {
@ -5232,9 +5237,14 @@ mdb_node_move(MDB_cursor *csrc, MDB_cursor *cdst)
MDB_val bkey; MDB_val bkey;
/* must find the lowest key below dst */ /* must find the lowest key below dst */
mdb_page_search_root(cdst, NULL, 0); mdb_page_search_root(cdst, NULL, 0);
s2 = NODEPTR(cdst->mc_pg[cdst->mc_top], 0); if (IS_LEAF2(cdst->mc_pg[cdst->mc_top])) {
bkey.mv_size = NODEKSZ(s2); bkey.mv_size = cdst->mc_db->md_pad;
bkey.mv_data = NODEKEY(s2); bkey.mv_data = LEAF2KEY(cdst->mc_pg[cdst->mc_top], 0, bkey.mv_size);
} else {
s2 = NODEPTR(cdst->mc_pg[cdst->mc_top], 0);
bkey.mv_size = NODEKSZ(s2);
bkey.mv_data = NODEKEY(s2);
}
cdst->mc_snum = snum--; cdst->mc_snum = snum--;
cdst->mc_top = snum; cdst->mc_top = snum;
rc = mdb_update_key(cdst->mc_pg[cdst->mc_top], 0, &bkey); rc = mdb_update_key(cdst->mc_pg[cdst->mc_top], 0, &bkey);
@ -5377,9 +5387,14 @@ mdb_page_merge(MDB_cursor *csrc, MDB_cursor *cdst)
MDB_node *s2; MDB_node *s2;
/* must find the lowest key below src */ /* must find the lowest key below src */
mdb_page_search_root(csrc, NULL, 0); mdb_page_search_root(csrc, NULL, 0);
s2 = NODEPTR(csrc->mc_pg[csrc->mc_top], 0); if (IS_LEAF2(csrc->mc_pg[csrc->mc_top])) {
key.mv_size = NODEKSZ(s2); key.mv_size = csrc->mc_db->md_pad;
key.mv_data = NODEKEY(s2); key.mv_data = LEAF2KEY(csrc->mc_pg[csrc->mc_top], 0, key.mv_size);
} else {
s2 = NODEPTR(csrc->mc_pg[csrc->mc_top], 0);
key.mv_size = NODEKSZ(s2);
key.mv_data = NODEKEY(s2);
}
csrc->mc_snum = snum--; csrc->mc_snum = snum--;
csrc->mc_top = snum; csrc->mc_top = snum;
} else { } else {

Write Preview
Loading…
Cancel
Save