From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 1523642EF5C for ; Fri, 3 Jul 2020 09:33:25 +0300 (MSK) Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1jrFGG-0003jC-L4 for tarantool-patches@dev.tarantool.org; Fri, 03 Jul 2020 09:33:24 +0300 From: Aleksandr Lyapunov Date: Fri, 3 Jul 2020 09:33:08 +0300 Message-Id: <1593757997-4145-7-git-send-email-alyapunov@tarantool.org> In-Reply-To: <1593757997-4145-1-git-send-email-alyapunov@tarantool.org> References: <1593757997-4145-1-git-send-email-alyapunov@tarantool.org> Subject: [Tarantool-patches] [PATCH 06/15] tx: add TX status List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org --- src/box/txn.c | 5 +++++ src/box/txn.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/src/box/txn.c b/src/box/txn.c index 71e732c..cf60d54 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -222,6 +222,7 @@ txn_begin(void) txn->flags = 0; txn->in_sub_stmt = 0; txn->id = ++tsn; + txn->status = TXN_INPROGRESS; txn->signature = -1; txn->engine = NULL; txn->engine_tx = NULL; @@ -425,6 +426,7 @@ txn_complete(struct txn *txn) * IPROTO_NOP statements only. */ if (txn->signature < 0) { + txn->status = TXN_ABORTED; /* Undo the transaction. */ struct txn_stmt *stmt; stailq_reverse(&txn->stmts); @@ -435,6 +437,7 @@ txn_complete(struct txn *txn) if (txn_has_flag(txn, TXN_HAS_TRIGGERS)) txn_run_rollback_triggers(txn, &txn->on_rollback); } else { + txn->status = TXN_COMMITTED; /* Commit the transaction. */ if (txn->engine != NULL) engine_commit(txn->engine, txn); @@ -555,6 +558,7 @@ txn_prepare(struct txn *txn) trigger_clear(&txn->fiber_on_yield); txn->start_tm = ev_monotonic_now(loop()); + txn->status = TXN_PREPARED; return 0; } @@ -683,6 +687,7 @@ void txn_rollback(struct txn *txn) { assert(txn == in_txn()); + txn->status = TXN_ABORTED; trigger_clear(&txn->fiber_on_stop); if (!txn_has_flag(txn, TXN_CAN_YIELD)) trigger_clear(&txn->fiber_on_yield); diff --git a/src/box/txn.h b/src/box/txn.h index 5b264f0..1394bfb 100644 --- a/src/box/txn.h +++ b/src/box/txn.h @@ -77,6 +77,38 @@ enum { }; /** + * Status of a transaction. + */ +enum txn_status { + /** + * Initial state of TX. The only state of a TX that allowed to do + * read or write actions. + */ + TXN_INPROGRESS, + /** + * The TX have passed conflict checks and is ready to be committed. + */ + TXN_PREPARED, + /** + * The TX was aborted by other TX due to conflict. + */ + TXN_CONFLICTED, + /** + * The TX was read_only, has a conflict and was sent to read view. + * Read-only and does not participate in conflict resolution ever more. + */ + TXN_IN_READ_VIEW, + /** + * The TX was committed. + */ + TXN_COMMITTED, + /** + * The TX was aborted. + */ + TXN_ABORTED, +}; + +/** * A single statement of a multi-statement * transaction: undo and redo info. */ @@ -173,6 +205,8 @@ struct txn { * Valid IDs start from 1. */ int64_t id; + /** Status of the TX */ + enum txn_status status; /** List of statements in a transaction. */ struct stailq stmts; /** Number of new rows without an assigned LSN. */ -- 2.7.4