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

lmdb: ITS#8157 mdb_txn_renew0(): init after error checks.

Browse Source 
Change-Id: I9ea344b98cb8c99a25ba7087abefbfe62b3417a0
This commit is contained in:
Hallvard Furuseth 2015-05-28 15:53:19 +03:00 committed by Leo Yuriev
parent bb7b923fdd
commit 55ae3dfa8b
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -8,6 +8,7 @@ LMDB 0.9.15 Release Engineering
Fix mdb_load with large values (ITS#8066) Fix mdb_load with large values (ITS#8066)
Fix to retry writes on EINTR (ITS#8106) Fix to retry writes on EINTR (ITS#8106)
Fix mdb_cursor_del on empty DB (ITS#8109) Fix mdb_cursor_del on empty DB (ITS#8109)
Fix mdb_txn_renew after error (ITS#8157)
Fix and Rework comparison for MDB_INTEGERKEY/MDB_INTEGERDUP (ITS#8117) Fix and Rework comparison for MDB_INTEGERKEY/MDB_INTEGERDUP (ITS#8117)
Added workaround for fdatasync bug in ext3fs Added workaround for fdatasync bug in ext3fs
Build Build

17
mdb.c
View File

@ -2705,16 +2705,11 @@ mdb_txn_renew0(MDB_txn *txn)
{ {
MDB_env *env = txn->mt_env; MDB_env *env = txn->mt_env;
MDB_meta *meta; MDB_meta *meta;
unsigned i, nr; unsigned i, nr, flags = txn->mt_flags;
uint16_t x; uint16_t x;
int rc, new_notls = 0; int rc, new_notls = 0;
txn->mt_flags &= MDB_TXN_BEGIN_FLAGS; if ((flags &= MDB_TXN_RDONLY) != 0) {
if (txn->mt_flags & MDB_TXN_RDONLY) {
txn->mt_flags = MDB_TXN_RDONLY;
/* Setup db info */
txn->mt_numdbs = env->me_numdbs;
txn->mt_dbxs = env->me_dbxs; /* mostly static anyway */
MDB_reader *r = (env->me_flags & MDB_NOTLS) MDB_reader *r = (env->me_flags & MDB_NOTLS)
? txn->mt_u.reader : pthread_getspecific(env->me_txkey); ? txn->mt_u.reader : pthread_getspecific(env->me_txkey);
@ -2781,6 +2776,7 @@ mdb_txn_renew0(MDB_txn *txn)
txn->mt_txnid = r->mr_txnid; txn->mt_txnid = r->mr_txnid;
txn->mt_u.reader = r; txn->mt_u.reader = r;
txn->mt_dbxs = env->me_dbxs; /* mostly static anyway */
} else { } else {
/* Not yet touching txn == env->me_txn0, it may be active */ /* Not yet touching txn == env->me_txn0, it may be active */
rc = mdb_mutex_lock(env, MDB_MUTEX(env, w)); rc = mdb_mutex_lock(env, MDB_MUTEX(env, w));
@ -2790,8 +2786,6 @@ mdb_txn_renew0(MDB_txn *txn)
meta = mdb_meta_head_w(env); meta = mdb_meta_head_w(env);
txn->mt_txnid = meta->mm_txnid; txn->mt_txnid = meta->mm_txnid;
/* Setup db info */
txn->mt_numdbs = env->me_numdbs;
txn->mt_txnid++; txn->mt_txnid++;
#if MDB_DEBUG #if MDB_DEBUG
if (unlikely(txn->mt_txnid == mdb_debug_edge)) { if (unlikely(txn->mt_txnid == mdb_debug_edge)) {
@ -2802,7 +2796,6 @@ mdb_txn_renew0(MDB_txn *txn)
"on/off edge (txn %zu)", txn->mt_txnid); "on/off edge (txn %zu)", txn->mt_txnid);
} }
#endif #endif
txn->mt_flags = 0;
txn->mt_child = NULL; txn->mt_child = NULL;
txn->mt_loose_pgs = NULL; txn->mt_loose_pgs = NULL;
txn->mt_loose_count = 0; txn->mt_loose_count = 0;
@ -2820,6 +2813,10 @@ mdb_txn_renew0(MDB_txn *txn)
txn->mt_next_pgno = meta->mm_last_pg+1; txn->mt_next_pgno = meta->mm_last_pg+1;
} }
txn->mt_flags = flags;
/* Setup db info */
txn->mt_numdbs = env->me_numdbs;
for (i=2; i<txn->mt_numdbs; i++) { for (i=2; i<txn->mt_numdbs; i++) {
x = env->me_dbflags[i]; x = env->me_dbflags[i];
txn->mt_dbs[i].md_flags = x & PERSISTENT_FLAGS; txn->mt_dbs[i].md_flags = x & PERSISTENT_FLAGS;