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

Simplify/cleanup mdb_cursor_init, C_ALLOCD.

Browse Source 
No real change.
mdb_cursor_init() checks if it needs mx, so pass it unconditionally.
Set C_ALLOCD for shadow cursors, for clarity. (It was always set as
it should anyway from the origin cursor, which would have C_ALLOCD.)
vmware
Hallvard Furuseth 12 years ago
parent f355de0298
commit 0b9a208530
1 changed files with 5 additions and 11 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. 16
      libraries/liblmdb/mdb.c

16
libraries/liblmdb/mdb.c
Unescape View File

@ -1206,9 +1206,8 @@ static void mdb_audit(MDB_txn *txn)
count = 0; count = 0;
for (i = 0; i<txn->mt_numdbs; i++) { for (i = 0; i<txn->mt_numdbs; i++) {
MDB_xcursor mx, *mxp; MDB_xcursor mx;
mxp = (txn->mt_dbs[i].md_flags & MDB_DUPSORT) ? &mx : NULL; mdb_cursor_init(&mc, txn, i, &mx);
mdb_cursor_init(&mc, txn, i, mxp);
if (txn->mt_dbs[i].md_root == P_INVALID) if (txn->mt_dbs[i].md_root == P_INVALID)
continue; continue;
count += txn->mt_dbs[i].md_branch_pages + count += txn->mt_dbs[i].md_branch_pages +
@ -1707,7 +1706,7 @@ mdb_cursor_shadow(MDB_txn *src, MDB_txn *dst)
mc->mc_dbflag = &dst->mt_dbflags[i]; mc->mc_dbflag = &dst->mt_dbflags[i];
mc->mc_snum = m2->mc_snum; mc->mc_snum = m2->mc_snum;
mc->mc_top = m2->mc_top; mc->mc_top = m2->mc_top;
mc->mc_flags = m2->mc_flags | C_SHADOW; mc->mc_flags = m2->mc_flags | (C_SHADOW|C_ALLOCD);
for (j=0; j<mc->mc_snum; j++) { for (j=0; j<mc->mc_snum; j++) {
mc->mc_pg[j] = m2->mc_pg[j]; mc->mc_pg[j] = m2->mc_pg[j];
mc->mc_ki[j] = m2->mc_ki[j]; mc->mc_ki[j] = m2->mc_ki[j];
@ -4933,8 +4932,7 @@ mdb_cursor_touch(MDB_cursor *mc)
if (mc->mc_dbi > MAIN_DBI && !(*mc->mc_dbflag & DB_DIRTY)) { if (mc->mc_dbi > MAIN_DBI && !(*mc->mc_dbflag & DB_DIRTY)) {
MDB_cursor mc2; MDB_cursor mc2;
MDB_xcursor mcx; MDB_xcursor mcx;
mdb_cursor_init(&mc2, mc->mc_txn, MAIN_DBI, mdb_cursor_init(&mc2, mc->mc_txn, MAIN_DBI, &mcx);
mc->mc_txn->mt_dbs[MAIN_DBI].md_flags & MDB_DUPSORT ? &mcx : NULL);
rc = mdb_page_search(&mc2, &mc->mc_dbx->md_name, MDB_PS_MODIFY); rc = mdb_page_search(&mc2, &mc->mc_dbx->md_name, MDB_PS_MODIFY);
if (rc) if (rc)
return rc; return rc;
@ -5838,7 +5836,6 @@ int
mdb_cursor_open(MDB_txn *txn, MDB_dbi dbi, MDB_cursor **ret) mdb_cursor_open(MDB_txn *txn, MDB_dbi dbi, MDB_cursor **ret)
{ {
MDB_cursor *mc; MDB_cursor *mc;
MDB_xcursor *mx = NULL;
size_t size = sizeof(MDB_cursor); size_t size = sizeof(MDB_cursor);
if (txn == NULL || ret == NULL || dbi >= txn->mt_numdbs || !(txn->mt_dbflags[dbi] & DB_VALID)) if (txn == NULL || ret == NULL || dbi >= txn->mt_numdbs || !(txn->mt_dbflags[dbi] & DB_VALID))
@ -5852,10 +5849,7 @@ mdb_cursor_open(MDB_txn *txn, MDB_dbi dbi, MDB_cursor **ret)
size += sizeof(MDB_xcursor); size += sizeof(MDB_xcursor);
if ((mc = malloc(size)) != NULL) { if ((mc = malloc(size)) != NULL) {
if (txn->mt_dbs[dbi].md_flags & MDB_DUPSORT) { mdb_cursor_init(mc, txn, dbi, (MDB_xcursor *)(mc + 1));
mx = (MDB_xcursor *)(mc + 1);
}
mdb_cursor_init(mc, txn, dbi, mx);
if (txn->mt_cursors) { if (txn->mt_cursors) {
mc->mc_next = txn->mt_cursors[dbi]; mc->mc_next = txn->mt_cursors[dbi];
txn->mt_cursors[dbi] = mc; txn->mt_cursors[dbi] = mc;

Write Preview
Loading…
Cancel
Save