From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) (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 00B3C469719 for ; Thu, 27 Feb 2020 17:16:53 +0300 (MSK) Received: by mail-lf1-f66.google.com with SMTP id z5so2175104lfd.12 for ; Thu, 27 Feb 2020 06:16:53 -0800 (PST) From: Cyrill Gorcunov Date: Thu, 27 Feb 2020 17:16:26 +0300 Message-Id: <20200227141628.13782-2-gorcunov@gmail.com> In-Reply-To: <20200227141628.13782-1-gorcunov@gmail.com> References: <20200227141628.13782-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 1/3] 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 This points out that commitment is done in async way where wal engine will call txn_complete explicitly. 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 ae3d281a5..10859a835 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 a4ca48224..cac97d1eb 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -564,7 +564,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); @@ -592,7 +592,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 ae2c3a58f..215e9c0bc 100644 --- a/src/box/txn.h +++ b/src/box/txn.h @@ -293,7 +293,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