Tarantool development patches archive
 help / color / mirror / Atom feed
From: Cyrill Gorcunov <gorcunov@gmail.com>
To: tml <tarantool-patches@dev.tarantool.org>
Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Subject: [Tarantool-patches] [PATCH v3 6/6] qsync: drop no longer used encoding helpers
Date: Mon, 27 Jul 2020 17:06:50 +0300	[thread overview]
Message-ID: <20200727140650.447750-7-gorcunov@gmail.com> (raw)
In-Reply-To: <20200727140650.447750-1-gorcunov@gmail.com>

Part-of #5129

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 src/box/xrow.c | 26 --------------------------
 src/box/xrow.h | 28 ----------------------------
 2 files changed, 54 deletions(-)

diff --git a/src/box/xrow.c b/src/box/xrow.c
index 3609dae0f..21d949ba5 100644
--- a/src/box/xrow.c
+++ b/src/box/xrow.c
@@ -920,32 +920,6 @@ xrow_encode_synchro(struct xrow_header *row,
 	row->bodycnt = 1;
 }
 
-int
-xrow_encode_confirm(struct xrow_header *row, struct region *region,
-		    uint32_t replica_id, int64_t lsn)
-{
-	struct synchro_body_bin *body = region_alloc(region, sizeof(*body));
-	if (body == NULL) {
-		diag_set(OutOfMemory, sizeof(*body), "region_alloc", "body");
-		return -1;
-	}
-	xrow_encode_synchro(row, body, replica_id, lsn, IPROTO_CONFIRM);
-	return 0;
-}
-
-int
-xrow_encode_rollback(struct xrow_header *row, struct region *region,
-		     uint32_t replica_id, int64_t lsn)
-{
-	struct synchro_body_bin *body = region_alloc(region, sizeof(*body));
-	if (body == NULL) {
-		diag_set(OutOfMemory, sizeof(*body), "region_alloc", "body");
-		return -1;
-	}
-	xrow_encode_synchro(row, body, replica_id, lsn, IPROTO_ROLLBACK);
-	return 0;
-}
-
 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 522bab259..2ecbe3ce0 100644
--- a/src/box/xrow.h
+++ b/src/box/xrow.h
@@ -240,20 +240,6 @@ xrow_encode_synchro(struct xrow_header *row,
 		    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.
@@ -265,20 +251,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

  parent reply	other threads:[~2020-07-27 14:08 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-27 14:06 [Tarantool-patches] [PATCH v3 0/6] qsync: write CONFIRM/ROLLBACK without txn engine Cyrill Gorcunov
2020-07-27 14:06 ` [Tarantool-patches] [PATCH v3 1/6] journal: drop redundant declaration Cyrill Gorcunov
2020-07-27 14:06 ` [Tarantool-patches] [PATCH v3 2/6] journal: bind asynchronous write completion to an entry Cyrill Gorcunov
2020-07-27 20:40   ` Vladislav Shpilevoy
2020-07-27 21:37     ` Cyrill Gorcunov
2020-07-27 14:06 ` [Tarantool-patches] [PATCH v3 3/6] journal: add journal_entry_create helper Cyrill Gorcunov
2020-07-27 14:06 ` [Tarantool-patches] [PATCH v3 4/6] qsync: provide a binary form of syncro entries Cyrill Gorcunov
2020-07-27 14:06 ` [Tarantool-patches] [PATCH v3 5/6] qsync: implement direct write of CONFIRM/ROLLBACK into a journal Cyrill Gorcunov
2020-07-27 20:41   ` Vladislav Shpilevoy
2020-07-27 21:39     ` Cyrill Gorcunov
2020-07-27 14:06 ` Cyrill Gorcunov [this message]
2020-07-27 14:12 ` [Tarantool-patches] [PATCH v3 0/6] qsync: write CONFIRM/ROLLBACK without txn engine 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=20200727140650.447750-7-gorcunov@gmail.com \
    --to=gorcunov@gmail.com \
    --cc=tarantool-patches@dev.tarantool.org \
    --cc=v.shpilevoy@tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v3 6/6] qsync: drop no longer used encoding helpers' \
    /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