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

ITS#7825 tweak prev commit

Browse Source 
dbiseqs are only checked in write txns so omit from read txns
robust
Howard Chu 11 years ago
parent 0401f2deed
commit 04851e442f
1 changed files with 7 additions and 7 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. 14
      libraries/liblmdb/mdb.c

14
libraries/liblmdb/mdb.c
Unescape View File

@ -2414,7 +2414,6 @@ mdb_txn_renew0(MDB_txn *txn)
/* Setup db info */ /* Setup db info */
txn->mt_numdbs = env->me_numdbs; txn->mt_numdbs = env->me_numdbs;
txn->mt_dbxs = env->me_dbxs; /* mostly static anyway */ txn->mt_dbxs = env->me_dbxs; /* mostly static anyway */
memcpy(txn->mt_dbiseqs, env->me_dbiseqs, env->me_maxdbs * sizeof(unsigned int));
if (txn->mt_flags & MDB_TXN_RDONLY) { if (txn->mt_flags & MDB_TXN_RDONLY) {
if (!ti) { if (!ti) {
@ -2488,6 +2487,7 @@ mdb_txn_renew0(MDB_txn *txn)
txn->mt_free_pgs[0] = 0; txn->mt_free_pgs[0] = 0;
txn->mt_spill_pgs = NULL; txn->mt_spill_pgs = NULL;
env->me_txn = txn; env->me_txn = txn;
memcpy(txn->mt_dbiseqs, env->me_dbiseqs, env->me_maxdbs * sizeof(unsigned int));
} }
/* Copy the DB info and flags */ /* Copy the DB info and flags */
@ -2563,22 +2563,22 @@ mdb_txn_begin(MDB_env *env, MDB_txn *parent, unsigned int flags, MDB_txn **ret)
} }
tsize = sizeof(MDB_ntxn); tsize = sizeof(MDB_ntxn);
} }
size = tsize + env->me_maxdbs * (sizeof(MDB_db)+sizeof(unsigned int)+1); size = tsize + env->me_maxdbs * (sizeof(MDB_db)+1);
if (!(flags & MDB_RDONLY)) if (!(flags & MDB_RDONLY))
size += env->me_maxdbs * sizeof(MDB_cursor *); size += env->me_maxdbs * (sizeof(MDB_cursor *)+sizeof(unsigned int));
if ((txn = calloc(1, size)) == NULL) { if ((txn = calloc(1, size)) == NULL) {
DPRINTF(("calloc: %s", strerror(ErrCode()))); DPRINTF(("calloc: %s", strerror(ErrCode())));
return ENOMEM; return ENOMEM;
} }
txn->mt_dbs = (MDB_db *) ((char *)txn + tsize); txn->mt_dbs = (MDB_db *) ((char *)txn + tsize);
txn->mt_dbiseqs = (unsigned int *) (txn->mt_dbs + env->me_maxdbs);
if (flags & MDB_RDONLY) { if (flags & MDB_RDONLY) {
txn->mt_flags |= MDB_TXN_RDONLY; txn->mt_flags |= MDB_TXN_RDONLY;
txn->mt_dbflags = (unsigned char *)(txn->mt_dbiseqs + env->me_maxdbs); txn->mt_dbflags = (unsigned char *)(txn->mt_dbs + env->me_maxdbs);
} else { } else {
txn->mt_cursors = (MDB_cursor **)(txn->mt_dbiseqs + env->me_maxdbs); txn->mt_cursors = (MDB_cursor **)(txn->mt_dbs + env->me_maxdbs);
txn->mt_dbflags = (unsigned char *)(txn->mt_cursors + env->me_maxdbs); txn->mt_dbiseqs = (unsigned int *)(txn->mt_cursors + env->me_maxdbs);
txn->mt_dbflags = (unsigned char *)(txn->mt_dbiseqs + env->me_maxdbs);
} }
txn->mt_env = env; txn->mt_env = env;

Write Preview
Loading…
Cancel
Save