From 585ccdf71643219abe9c45527f8ba20206e11204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=AE=D1=80=D1=8C?= =?UTF-8?q?=D0=B5=D0=B2=20=28Leonid=20Yuriev=29?= Date: Tue, 7 Jan 2025 16:21:04 +0300 Subject: [PATCH] =?UTF-8?q?mdbx:=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20`TXN=5FEND=5FNAMES`.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api-txn.c | 2 +- src/proto.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/api-txn.c b/src/api-txn.c index b7c65b1c..4a36ea56 100644 --- a/src/api-txn.c +++ b/src/api-txn.c @@ -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); } if (unlikely(rc != MDBX_SUCCESS)) - txn_end(txn, TXN_END_FAIL_BEGINCHILD); + txn_end(txn, TXN_END_FAIL_BEGIN_NESTED); } else { /* MDBX_TXN_RDONLY */ txn->dbi_seqs = ptr_disp(txn->cursors, env->max_dbi * sizeof(txn->cursors[0])); #if MDBX_ENABLE_DBI_SPARSE diff --git a/src/proto.h b/src/proto.h index 571fead6..0c7260f9 100644 --- a/src/proto.h +++ b/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); #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 { /* txn_end operation number, for logging */ - TXN_END_COMMITTED, - TXN_END_PURE_COMMIT, - TXN_END_ABORT, - TXN_END_RESET, - TXN_END_FAIL_BEGIN, - TXN_END_FAIL_BEGINCHILD, - TXN_END_OUSTED, + TXN_END_COMMITTED /* 0 */, + TXN_END_PURE_COMMIT /* 1 */, + TXN_END_ABORT /* 2 */, + TXN_END_RESET /* 3 */, + TXN_END_FAIL_BEGIN /* 4 */, + TXN_END_FAIL_BEGIN_NESTED /* 5 */, + TXN_END_OUSTED /* 6 */, TXN_END_OPMASK = 0x07 /* mask for txn_end() operation number */, TXN_END_UPDATE = 0x10 /* update env state (DBIs) */,