From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id C50A2469719 for ; Fri, 20 Mar 2020 11:20:45 +0300 (MSK) Received: by mail-lj1-f170.google.com with SMTP id z10so4592103ljn.0 for ; Fri, 20 Mar 2020 01:20:45 -0700 (PDT) From: Cyrill Gorcunov Date: Fri, 20 Mar 2020 11:19:49 +0300 Message-Id: <20200320081956.30650-5-gorcunov@gmail.com> In-Reply-To: <20200320081956.30650-1-gorcunov@gmail.com> References: <20200320081956.30650-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v15 04/11] box/txn: rename txn_write to txn_commit_async List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tml To reflect the fact tha we're don't waiting for transaction to complete but rely on completion callback. Acked-by: Konstantin Osipov Signed-off-by: Cyrill Gorcunov --- src/box/applier.cc | 2 +- src/box/txn.c | 4 ++-- src/box/txn.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/box/applier.cc b/src/box/applier.cc index ff40e03c6..8666a3a98 100644 --- a/src/box/applier.cc +++ b/src/box/applier.cc @@ -805,7 +805,7 @@ applier_apply_tx(struct stailq *rows) trigger_create(on_commit, applier_txn_commit_cb, NULL, NULL); txn_on_commit(txn, on_commit); - if (txn_write(txn) < 0) + if (txn_commit_async(txn) < 0) goto fail; /* Transaction was sent to journal so promote vclock. */ diff --git a/src/box/txn.c b/src/box/txn.c index 6799f6c4b..9f61303ab 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -558,7 +558,7 @@ txn_prepare(struct txn *txn) } int -txn_write(struct txn *txn) +txn_commit_async(struct txn *txn) { if (txn_prepare(txn) != 0) { txn_rollback(txn); @@ -586,7 +586,7 @@ txn_commit(struct txn *txn) { txn->fiber = fiber(); - if (txn_write(txn) != 0) + if (txn_commit_async(txn) != 0) return -1; /* * In case of non-yielding journal the transaction could already diff --git a/src/box/txn.h b/src/box/txn.h index 7a7e52954..b950e2e18 100644 --- a/src/box/txn.h +++ b/src/box/txn.h @@ -300,7 +300,7 @@ txn_rollback(struct txn *txn); * freed. */ int -txn_write(struct txn *txn); +txn_commit_async(struct txn *txn); /** * Most txns don't have triggers, and txn objects -- 2.20.1