From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Subject: [Tarantool-patches] [PATCH 08/10] box/txn: move journal allocation into separate routine Date: Thu, 5 Mar 2020 15:29:41 +0300 [thread overview] Message-ID: <20200305122943.7324-9-gorcunov@gmail.com> (raw) In-Reply-To: <20200305122943.7324-1-gorcunov@gmail.com> For now we assign callbacks unconditionally but it is done to minimize changes in each patch in the series. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/box/txn.c | 55 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 16 deletions(-) diff --git a/src/box/txn.c b/src/box/txn.c index c5f24ebdb..685f476e2 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -478,41 +478,49 @@ txn_entry_complete_cb(struct journal_entry *entry, void *data) fiber_set_txn(fiber(), NULL); } -static int64_t -txn_write_to_wal(struct txn *txn) +static struct journal_entry * +txn_journal_entry_new(struct txn *txn) { + struct journal_entry *req; + struct txn_stmt *stmt; + assert(txn->n_new_rows + txn->n_applier_rows > 0); - /* Prepare a journal entry. */ - struct journal_entry *req = journal_entry_new(txn->n_new_rows + - txn->n_applier_rows, - &txn->region, - txn_entry_complete_cb, - txn); - if (req == NULL) { - txn_rollback(txn); - return -1; - } + req = journal_entry_new(txn->n_new_rows + txn->n_applier_rows, + &txn->region, txn_entry_complete_cb, txn); + if (req == NULL) + return NULL; - struct txn_stmt *stmt; struct xrow_header **remote_row = req->rows; struct xrow_header **local_row = req->rows + txn->n_applier_rows; + stailq_foreach_entry(stmt, &txn->stmts, next) { if (stmt->has_triggers) { txn_init_triggers(txn); rlist_splice(&txn->on_commit, &stmt->on_commit); } + + /* A read (e.g. select) request */ if (stmt->row == NULL) - continue; /* A read (e.g. select) request */ + continue; + if (stmt->row->replica_id == 0) *local_row++ = stmt->row; else *remote_row++ = stmt->row; + req->approx_len += xrow_approx_len(stmt->row); } + assert(remote_row == req->rows + txn->n_applier_rows); assert(local_row == remote_row + txn->n_new_rows); + return req; +} + +static int64_t +txn_write_to_wal(struct journal_entry *req) +{ /* * Send the entry to the journal. * @@ -591,6 +599,8 @@ txn_commit_nop(struct txn *txn) int txn_commit_async(struct txn *txn) { + struct journal_entry *req; + if (txn_prepare(txn) != 0) { txn_rollback(txn); return -1; @@ -599,12 +609,19 @@ txn_commit_async(struct txn *txn) if (txn_commit_nop(txn)) return 0; - return txn_write_to_wal(txn); + req = txn_journal_entry_new(txn); + if (req == NULL) { + txn_rollback(txn); + return -1; + } + + return txn_write_to_wal(req); } int txn_commit(struct txn *txn) { + struct journal_entry *req; int res = -1; txn->fiber = fiber(); @@ -619,7 +636,13 @@ txn_commit(struct txn *txn) goto out; } - if (txn_write_to_wal(txn) != 0) + req = txn_journal_entry_new(txn); + if (req == NULL) { + txn_rollback(txn); + goto out; + } + + if (txn_write_to_wal(req) != 0) return -1; /* -- 2.20.1
next prev parent reply other threads:[~2020-03-05 12:31 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-03-05 12:29 [Tarantool-patches] [PATCH 00/10] box/journal: redesign sync and async writes Cyrill Gorcunov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 01/10] box: recovery_journal_create -- set journal here Cyrill Gorcunov 2020-03-06 21:27 ` Konstantin Osipov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 02/10] box/txn: move fiber_set_txn to header Cyrill Gorcunov 2020-03-06 21:27 ` Konstantin Osipov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 03/10] box/txn: rename txn_write to txn_commit_async Cyrill Gorcunov 2020-03-06 21:28 ` Konstantin Osipov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 04/10] box/txn: move setup of txn start to txn_prepare Cyrill Gorcunov 2020-03-06 21:30 ` Konstantin Osipov 2020-03-18 12:38 ` Cyrill Gorcunov 2020-03-18 13:58 ` Konstantin Osipov 2020-03-18 14:09 ` Cyrill Gorcunov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 05/10] box/txn: add txn_commit_nop helper Cyrill Gorcunov 2020-03-06 21:30 ` Konstantin Osipov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 06/10] box/txn: unweave txn_commit from txn_commit_async Cyrill Gorcunov 2020-03-06 21:33 ` Konstantin Osipov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 07/10] box/txn: clear fiber storage right before journal write Cyrill Gorcunov 2020-03-06 21:34 ` Konstantin Osipov 2020-03-05 12:29 ` Cyrill Gorcunov [this message] 2020-03-06 21:35 ` [Tarantool-patches] [PATCH 08/10] box/txn: move journal allocation into separate routine Konstantin Osipov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 09/10] box/journal: journal_entry_new -- drop setting up callbacks Cyrill Gorcunov 2020-03-06 21:37 ` Konstantin Osipov 2020-03-06 21:41 ` Cyrill Gorcunov 2020-03-06 21:51 ` Konstantin Osipov 2020-03-06 21:57 ` Cyrill Gorcunov 2020-03-06 22:04 ` Konstantin Osipov 2020-03-05 12:29 ` [Tarantool-patches] [PATCH 10/10] box/journal: redesign sync and async writes Cyrill Gorcunov 2020-03-06 21:48 ` Konstantin Osipov
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=20200305122943.7324-9-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 08/10] box/txn: move journal allocation into separate routine' \ /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