mirror of
https://github.com/isar/libmdbx.git
synced 2025-01-19 21:58:20 +08:00
mdbx: изменение TXN_END_NAMES
.
This commit is contained in:
parent
81e2623a54
commit
585ccdf716
@ -350,7 +350,7 @@ int mdbx_txn_begin_ex(MDBX_env *env, MDBX_txn *parent, MDBX_txn_flags_t flags, M
|
|||||||
tASSERT(txn, audit_ex(txn, 0, false) == 0);
|
tASSERT(txn, audit_ex(txn, 0, false) == 0);
|
||||||
}
|
}
|
||||||
if (unlikely(rc != MDBX_SUCCESS))
|
if (unlikely(rc != MDBX_SUCCESS))
|
||||||
txn_end(txn, TXN_END_FAIL_BEGINCHILD);
|
txn_end(txn, TXN_END_FAIL_BEGIN_NESTED);
|
||||||
} else { /* MDBX_TXN_RDONLY */
|
} else { /* MDBX_TXN_RDONLY */
|
||||||
txn->dbi_seqs = ptr_disp(txn->cursors, env->max_dbi * sizeof(txn->cursors[0]));
|
txn->dbi_seqs = ptr_disp(txn->cursors, env->max_dbi * sizeof(txn->cursors[0]));
|
||||||
#if MDBX_ENABLE_DBI_SPARSE
|
#if MDBX_ENABLE_DBI_SPARSE
|
||||||
|
16
src/proto.h
16
src/proto.h
@ -50,16 +50,16 @@ MDBX_INTERNAL void txn_done_cursors(MDBX_txn *txn);
|
|||||||
MDBX_INTERNAL int txn_shadow_cursors(const MDBX_txn *parent, const size_t dbi);
|
MDBX_INTERNAL int txn_shadow_cursors(const MDBX_txn *parent, const size_t dbi);
|
||||||
|
|
||||||
#define TXN_END_NAMES \
|
#define TXN_END_NAMES \
|
||||||
{"committed", "empty-commit", "abort", "reset", "fail-begin", "fail-beginchild", "ousted", nullptr}
|
{"committed", "pure-commit", "abort", "reset", "fail-begin", "fail-begin-nested", "ousted", nullptr}
|
||||||
enum {
|
enum {
|
||||||
/* txn_end operation number, for logging */
|
/* txn_end operation number, for logging */
|
||||||
TXN_END_COMMITTED,
|
TXN_END_COMMITTED /* 0 */,
|
||||||
TXN_END_PURE_COMMIT,
|
TXN_END_PURE_COMMIT /* 1 */,
|
||||||
TXN_END_ABORT,
|
TXN_END_ABORT /* 2 */,
|
||||||
TXN_END_RESET,
|
TXN_END_RESET /* 3 */,
|
||||||
TXN_END_FAIL_BEGIN,
|
TXN_END_FAIL_BEGIN /* 4 */,
|
||||||
TXN_END_FAIL_BEGINCHILD,
|
TXN_END_FAIL_BEGIN_NESTED /* 5 */,
|
||||||
TXN_END_OUSTED,
|
TXN_END_OUSTED /* 6 */,
|
||||||
|
|
||||||
TXN_END_OPMASK = 0x07 /* mask for txn_end() operation number */,
|
TXN_END_OPMASK = 0x07 /* mask for txn_end() operation number */,
|
||||||
TXN_END_UPDATE = 0x10 /* update env state (DBIs) */,
|
TXN_END_UPDATE = 0x10 /* update env state (DBIs) */,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user