From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org> Subject: [Tarantool-patches] [PATCH v2 7/7] qsync: drop no longer used xrow_encode_confirm, rollback Date: Thu, 23 Jul 2020 15:29:42 +0300 [thread overview] Message-ID: <20200723122942.196011-8-gorcunov@gmail.com> (raw) In-Reply-To: <20200723122942.196011-1-gorcunov@gmail.com> Since we no longer allocate these entries via region_alloc just drop them out as unused. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/box/xrow.c | 32 -------------------------------- src/box/xrow.h | 28 ---------------------------- 2 files changed, 60 deletions(-) diff --git a/src/box/xrow.c b/src/box/xrow.c index bebad2dd0..4fac170b3 100644 --- a/src/box/xrow.c +++ b/src/box/xrow.c @@ -911,38 +911,6 @@ xrow_encode_confirm_rollback(struct xrow_header *row, return 0; } -int -xrow_encode_confirm(struct xrow_header *row, struct region *region, - uint32_t replica_id, int64_t lsn) -{ - struct request_synchro_body *body; - - body = region_alloc(region, sizeof(*body)); - if (body == NULL) { - diag_set(OutOfMemory, sizeof(*body), "region_alloc", "body"); - return -1; - } - - return xrow_encode_confirm_rollback(row, body, replica_id, lsn, - IPROTO_CONFIRM); -} - -int -xrow_encode_rollback(struct xrow_header *row, struct region *region, - uint32_t replica_id, int64_t lsn) -{ - struct request_synchro_body *body; - - body = region_alloc(region, sizeof(*body)); - if (body == NULL) { - diag_set(OutOfMemory, sizeof(*body), "region_alloc", "body"); - return -1; - } - - return xrow_encode_confirm_rollback(row, body, replica_id, lsn, - IPROTO_ROLLBACK); -} - static int xrow_decode_confirm_rollback(struct xrow_header *row, uint32_t *replica_id, int64_t *lsn) diff --git a/src/box/xrow.h b/src/box/xrow.h index 503140d1e..86a9e3542 100644 --- a/src/box/xrow.h +++ b/src/box/xrow.h @@ -230,20 +230,6 @@ xrow_encode_confirm_rollback(struct xrow_header *row, struct request_synchro_body *body, uint32_t replica_id, int64_t lsn, int type); -/** - * Encode the CONFIRM to row body and set row type to - * IPROTO_CONFIRM. - * @param row xrow header. - * @param region Region to use to encode the confirmation body. - * @param replica_id master's instance id. - * @param lsn last confirmed lsn. - * @retval -1 on error. - * @retval 0 success. - */ -int -xrow_encode_confirm(struct xrow_header *row, struct region *region, - uint32_t replica_id, int64_t lsn); - /** * Decode the CONFIRM request body. * @param row xrow header. @@ -255,20 +241,6 @@ xrow_encode_confirm(struct xrow_header *row, struct region *region, int xrow_decode_confirm(struct xrow_header *row, uint32_t *replica_id, int64_t *lsn); -/** - * Encode the ROLLBACK row body and set row type to - * IPROTO_ROLLBACK. - * @param row xrow header. - * @param region Region to use to encode the rollback body. - * @param replica_id master's instance id. - * @param lsn lsn to rollback from, including it. - * @retval -1 on error. - * @retval 0 success. - */ -int -xrow_encode_rollback(struct xrow_header *row, struct region *region, - uint32_t replica_id, int64_t lsn); - /** * Decode the ROLLBACK row body. * @param row xrow header. -- 2.26.2
next prev parent reply other threads:[~2020-07-23 12:31 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-23 12:29 [Tarantool-patches] [PATCH v2 0/5] qsync: write CONFIRM/ROLLBACK without txn engine Cyrill Gorcunov 2020-07-23 12:29 ` [Tarantool-patches] [PATCH v2 1/7] journal: drop redundant declaration Cyrill Gorcunov 2020-07-23 12:29 ` [Tarantool-patches] [PATCH v2 2/7] wal: bind asynchronous write completion to an entry Cyrill Gorcunov 2020-07-23 22:10 ` Vladislav Shpilevoy 2020-07-24 17:48 ` Cyrill Gorcunov 2020-07-23 12:29 ` [Tarantool-patches] [PATCH v2 3/7] journal: add journal_entry_create helper Cyrill Gorcunov 2020-07-23 22:10 ` Vladislav Shpilevoy 2020-07-24 17:50 ` Cyrill Gorcunov 2020-07-23 12:29 ` [Tarantool-patches] [PATCH v2 4/7] qsync: provide a binary form of CONFIRM/ROLLBACK entries Cyrill Gorcunov 2020-07-23 22:10 ` Vladislav Shpilevoy 2020-07-24 18:07 ` Cyrill Gorcunov 2020-07-23 12:29 ` [Tarantool-patches] [PATCH v2 5/7] qsync: provide a way to encode preallocated " Cyrill Gorcunov 2020-07-23 22:10 ` Vladislav Shpilevoy 2020-07-24 18:08 ` Cyrill Gorcunov 2020-07-23 12:29 ` [Tarantool-patches] [PATCH v2 6/7] qsync: implement direct write of CONFIRM/ROLLBACK into a journal Cyrill Gorcunov 2020-07-23 22:10 ` Vladislav Shpilevoy 2020-07-24 18:16 ` Cyrill Gorcunov 2020-07-23 12:29 ` Cyrill Gorcunov [this message] 2020-07-23 22:13 ` [Tarantool-patches] [PATCH v2 0/5] qsync: write CONFIRM/ROLLBACK without txn engine Vladislav Shpilevoy 2020-07-24 18:16 ` 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=20200723122942.196011-8-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 7/7] qsync: drop no longer used xrow_encode_confirm, rollback' \ /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