Tarantool development patches archive
 help / color / mirror / Atom feed
From: Cyrill Gorcunov <gorcunov@gmail.com>
To: tml <tarantool-patches@dev.tarantool.org>
Subject: [Tarantool-patches] [PATCH 07/14] box/txn: rename txn_write to txn_commit_async
Date: Wed, 19 Feb 2020 21:37:06 +0300	[thread overview]
Message-ID: <20200219183713.17646-8-gorcunov@gmail.com> (raw)
In-Reply-To: <20200219183713.17646-1-gorcunov@gmail.com>

Plain txn_write is too general.

Suggested-by: Konstantin Osipov <kostja.osipov@gmail.com>
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 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 05321e97d..0ad596c1e 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);
@@ -585,7 +585,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 fe13ef5f8..f2e0fa9e7 100644
--- a/src/box/txn.h
+++ b/src/box/txn.h
@@ -302,7 +302,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

  parent reply	other threads:[~2020-02-19 18:38 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-19 18:36 [Tarantool-patches] [PATCH 00/14] rework async and sync transactions Cyrill Gorcunov
2020-02-19 18:37 ` [Tarantool-patches] [PATCH 01/14] box/txn: fix void args mess Cyrill Gorcunov
2020-02-20 14:10   ` Nikita Pettik
2020-02-20 14:16     ` Cyrill Gorcunov
2020-02-20 14:34       ` Nikita Pettik
2020-02-19 18:37 ` [Tarantool-patches] [PATCH 02/14] box/journal: use plain int for return value Cyrill Gorcunov
2020-02-20 14:11   ` Nikita Pettik
2020-02-19 18:37 ` [Tarantool-patches] [PATCH 03/14] box/journal: sanitize completion naming Cyrill Gorcunov
2020-02-20 14:12   ` Nikita Pettik
2020-02-20 14:15     ` Nikita Pettik
2020-02-19 18:37 ` [Tarantool-patches] [PATCH 04/14] box/txn: rename txn_entry_done_cb to txn_entry_complete_cb Cyrill Gorcunov
2020-02-20 14:15   ` Nikita Pettik
2020-02-19 18:37 ` [Tarantool-patches] [PATCH 05/14] box/txn: rename txn_write_to_wal to txn_write_to_wal_async Cyrill Gorcunov
2020-02-19 18:37 ` [Tarantool-patches] [PATCH 06/14] box/journal: supersede journal_write with journal_write_async Cyrill Gorcunov
2020-02-19 18:37 ` Cyrill Gorcunov [this message]
2020-02-22 20:28   ` [Tarantool-patches] [PATCH 07/14] box/txn: rename txn_write to txn_commit_async Georgy Kirichenko
2020-02-22 21:00     ` Cyrill Gorcunov
2020-02-19 18:37 ` [Tarantool-patches] [PATCH 08/14] box/txn: move setup of transaction start time to txn_prepare Cyrill Gorcunov
2020-02-19 18:37 ` [Tarantool-patches] [PATCH 09/14] box/txn: make txn nop processing a separate routine Cyrill Gorcunov
2020-02-19 18:37 ` [Tarantool-patches] [PATCH 10/14] box/txn: move journal entry allocation into " Cyrill Gorcunov
2020-02-19 18:37 ` [Tarantool-patches] [PATCH 11/14] box/txn: merge txn_write_to_wal_async to txn_commit_async Cyrill Gorcunov
2020-02-19 18:37 ` [Tarantool-patches] [PATCH 12/14] box/txn: do not use journal_write_async under the hood Cyrill Gorcunov
2020-02-19 18:37 ` [Tarantool-patches] [PATCH 13/14] box/journal: introduce journal_write Cyrill Gorcunov
2020-02-19 18:37 ` [Tarantool-patches] [PATCH 14/14] box/txn: use journal_write in txn_commit Cyrill Gorcunov
2020-02-19 19:09   ` Konstantin Osipov
2020-02-19 20:01     ` Cyrill Gorcunov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200219183713.17646-8-gorcunov@gmail.com \
    --to=gorcunov@gmail.com \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH 07/14] box/txn: rename txn_write to txn_commit_async' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox