From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Subject: [Tarantool-patches] [PATCH v7 8/8] applier: drop process_synchro_row Date: Sat, 15 Aug 2020 00:14:42 +0300 [thread overview] Message-ID: <20200814211442.667099-9-gorcunov@gmail.com> (raw) In-Reply-To: <20200814211442.667099-1-gorcunov@gmail.com> Handling of synchro requests now are passed via separate apply_synchro_row helper so we no longer need process_synchro_row and can drop it. Closes #5129 Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/box/applier.cc | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/src/box/applier.cc b/src/box/applier.cc index a1ce7a23f..7652e1acd 100644 --- a/src/box/applier.cc +++ b/src/box/applier.cc @@ -270,45 +270,17 @@ process_nop(struct request *request) return txn_commit_stmt(txn, request); } -/* - * CONFIRM/ROLLBACK rows aren't dml requests and require special - * handling: instead of performing some operations on spaces, - * processing these requests requires txn_limbo to either confirm - * or rollback some of its entries. - */ static int -process_synchro_row(struct request *request) +apply_row(struct xrow_header *row) { - assert(iproto_type_is_synchro_request(request->header->type)); - struct txn *txn = in_txn(); + struct request request; - struct synchro_request syn_req; - if (xrow_decode_synchro(request->header, &syn_req) != 0) - return -1; - assert(txn->n_applier_rows == 0); /* - * This is not really a transaction. It just uses txn API - * to put the data into WAL. And obviously it should not - * go to the limbo and block on the very same sync - * transaction which it tries to confirm now. + * Synchro requests must never use txn engine, + * instead they are handled separately. */ - txn_set_flag(txn, TXN_FORCE_ASYNC); + assert(!iproto_type_is_synchro_request(row->type)); - if (txn_begin_stmt(txn, NULL) != 0) - return -1; - if (txn_commit_stmt(txn, request) != 0) - return -1; - return txn_limbo_process(&txn_limbo, &syn_req); -} - -static int -apply_row(struct xrow_header *row) -{ - struct request request; - if (iproto_type_is_synchro_request(row->type)) { - request.header = row; - return process_synchro_row(&request); - } if (xrow_decode_dml(row, &request, dml_request_key_map(row->type)) != 0) return -1; if (request.type == IPROTO_NOP) -- 2.26.2
next prev parent reply other threads:[~2020-08-14 21:16 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-14 21:14 [Tarantool-patches] [PATCH v7 0/8] qsync: write CONFIRM/ROLLBACK without txn engine Cyrill Gorcunov 2020-08-14 21:14 ` [Tarantool-patches] [PATCH v7 1/8] journal: bind asynchronous write completion to an entry Cyrill Gorcunov 2020-08-14 21:14 ` [Tarantool-patches] [PATCH v7 2/8] journal: add journal_entry_create helper Cyrill Gorcunov 2020-08-14 21:14 ` [Tarantool-patches] [PATCH v7 3/8] qsync: provide a binary form of syncro entries Cyrill Gorcunov 2020-08-14 21:14 ` [Tarantool-patches] [PATCH v7 4/8] qsync: direct write of CONFIRM/ROLLBACK into a journal Cyrill Gorcunov 2020-08-15 15:04 ` Vladislav Shpilevoy 2020-08-15 16:26 ` Cyrill Gorcunov 2020-08-14 21:14 ` [Tarantool-patches] [PATCH v7 5/8] applier: factor out latch locking Cyrill Gorcunov 2020-08-15 15:04 ` Vladislav Shpilevoy 2020-08-15 16:27 ` Cyrill Gorcunov 2020-08-14 21:14 ` [Tarantool-patches] [PATCH v7 6/8] applier: add shorthands to queue access Cyrill Gorcunov 2020-08-14 21:14 ` [Tarantool-patches] [PATCH v7 7/8] applier: process synchro requests without txn engine Cyrill Gorcunov 2020-08-15 15:06 ` Vladislav Shpilevoy 2020-08-17 12:42 ` Cyrill Gorcunov 2020-08-17 20:49 ` Vladislav Shpilevoy 2020-08-18 8:08 ` Cyrill Gorcunov 2020-08-14 21:14 ` Cyrill Gorcunov [this message] 2020-08-15 8:38 ` [Tarantool-patches] [PATCH v7 9/8] txn: txn_add_redo -- drop synchro processing Cyrill Gorcunov 2020-08-15 15:06 ` Vladislav Shpilevoy 2020-08-17 8:03 ` 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=20200814211442.667099-9-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v7 8/8] applier: drop process_synchro_row' \ /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