From: Cyrill Gorcunov <gorcunov@gmail.com> To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Cc: tml <tarantool-patches@dev.tarantool.org> Subject: Re: [Tarantool-patches] [PATCH v8 0/9] qsync: write CONFIRM/ROLLBACK without txn engine Date: Tue, 18 Aug 2020 00:54:00 +0300 [thread overview] Message-ID: <20200817215400.GK2074@grain> (raw) In-Reply-To: <78aa1ff6-34c1-767c-7f50-21c93236d8e7@tarantool.org> On Mon, Aug 17, 2020 at 11:24:40PM +0200, Vladislav Shpilevoy wrote: > process_synchro_row() is still present on the branch. Sigh. Overlooked, thanks! I've force-pushed the branch, just in case here is a commit on top. We can simply drop this helper it harmless. --- diff --git a/src/box/applier.cc b/src/box/applier.cc index 83f6da461..5d7c35ca6 100644 --- a/src/box/applier.cc +++ b/src/box/applier.cc @@ -270,45 +270,11 @@ 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) -{ - assert(iproto_type_is_synchro_request(request->header->type)); - struct txn *txn = in_txn(); - - 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. - */ - txn_set_flag(txn, TXN_FORCE_ASYNC); - - 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); - } + assert(!iproto_type_is_synchro_request(row->type)); if (xrow_decode_dml(row, &request, dml_request_key_map(row->type)) != 0) return -1; if (request.type == IPROTO_NOP)
prev parent reply other threads:[~2020-08-17 21:54 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-17 13:39 Cyrill Gorcunov 2020-08-17 13:39 ` [Tarantool-patches] [PATCH v8 1/9] xrow: introduce struct synchro_request Cyrill Gorcunov 2020-08-17 13:39 ` [Tarantool-patches] [PATCH v8 2/9] journal: bind asynchronous write completion to an entry Cyrill Gorcunov 2020-08-17 13:39 ` [Tarantool-patches] [PATCH v8 3/9] journal: add journal_entry_create helper Cyrill Gorcunov 2020-08-17 13:39 ` [Tarantool-patches] [PATCH v8 4/9] qsync: provide a binary form of syncro entries Cyrill Gorcunov 2020-08-17 13:39 ` [Tarantool-patches] [PATCH v8 5/9] qsync: direct write of CONFIRM/ROLLBACK into a journal Cyrill Gorcunov 2020-08-17 20:49 ` Vladislav Shpilevoy 2020-08-17 22:16 ` Cyrill Gorcunov 2020-08-17 22:23 ` Cyrill Gorcunov 2020-08-17 13:39 ` [Tarantool-patches] [PATCH v8 6/9] applier: add shorthands to queue access Cyrill Gorcunov 2020-08-17 20:49 ` Vladislav Shpilevoy 2020-08-17 22:14 ` Cyrill Gorcunov 2020-08-18 19:18 ` Vladislav Shpilevoy 2020-08-19 20:37 ` Vladislav Shpilevoy 2020-08-19 20:49 ` Cyrill Gorcunov 2020-08-17 13:39 ` [Tarantool-patches] [PATCH v8 7/9] applier: process synchro requests without txn engine Cyrill Gorcunov 2020-08-17 13:39 ` [Tarantool-patches] [PATCH v8 8/9] txn: txn_add_redo -- drop synchro processing Cyrill Gorcunov 2020-08-17 13:39 ` [Tarantool-patches] [PATCH v8 9/9] xrow: drop xrow_header_dup_body Cyrill Gorcunov 2020-08-17 21:24 ` [Tarantool-patches] [PATCH v8 0/9] qsync: write CONFIRM/ROLLBACK without txn engine Vladislav Shpilevoy 2020-08-17 21:54 ` Cyrill Gorcunov [this message]
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=20200817215400.GK2074@grain \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v8 0/9] qsync: write CONFIRM/ROLLBACK without txn engine' \ /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