From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id BEAEA445320 for ; Mon, 27 Jul 2020 17:07:41 +0300 (MSK) Received: by mail-lj1-f194.google.com with SMTP id q4so17406480lji.2 for ; Mon, 27 Jul 2020 07:07:41 -0700 (PDT) From: Cyrill Gorcunov Date: Mon, 27 Jul 2020 17:06:48 +0300 Message-Id: <20200727140650.447750-5-gorcunov@gmail.com> In-Reply-To: <20200727140650.447750-1-gorcunov@gmail.com> References: <20200727140650.447750-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v3 4/6] qsync: provide a binary form of syncro entries List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tml Cc: Vladislav Shpilevoy These msgpack entries will be needed to write them down to a journal without involving txn engine. Same time we would like to be able to allocate them on stack, for this sake the binary form is predefined. Part-of #5129 Signed-off-by: Cyrill Gorcunov --- src/box/xrow.c | 62 +++++++++++++++++++++++++++----------------------- src/box/xrow.h | 25 ++++++++++++++++++++ 2 files changed, 59 insertions(+), 28 deletions(-) diff --git a/src/box/xrow.c b/src/box/xrow.c index 0c797a9d5..3609dae0f 100644 --- a/src/box/xrow.c +++ b/src/box/xrow.c @@ -893,51 +893,57 @@ xrow_encode_dml(const struct request *request, struct region *region, return iovcnt; } -static int -xrow_encode_confirm_rollback(struct xrow_header *row, struct region *region, - uint32_t replica_id, int64_t lsn, int type) +void +xrow_encode_synchro(struct xrow_header *row, + struct synchro_body_bin *body, + uint32_t replica_id, int64_t lsn, + int type) { - size_t len = mp_sizeof_map(2) + mp_sizeof_uint(IPROTO_REPLICA_ID) + - mp_sizeof_uint(replica_id) + mp_sizeof_uint(IPROTO_LSN) + - mp_sizeof_uint(lsn); - char *buf = (char *)region_alloc(region, len); - if (buf == NULL) { - diag_set(OutOfMemory, len, "region_alloc", "buf"); - return -1; - } - char *pos = buf; - - pos = mp_encode_map(pos, 2); - pos = mp_encode_uint(pos, IPROTO_REPLICA_ID); - pos = mp_encode_uint(pos, replica_id); - pos = mp_encode_uint(pos, IPROTO_LSN); - pos = mp_encode_uint(pos, lsn); + /* + * A map with two elements. We don't compress + * numbers to have this structure constant in size, + * which will allow us to preallocate it on stack. + */ + body->m_body = 0x80 | 2; + body->k_replica_id = IPROTO_REPLICA_ID; + body->m_replica_id = 0xce; + body->v_replica_id = mp_bswap_u32(replica_id); + body->k_lsn = IPROTO_LSN; + body->m_lsn = 0xcf; + body->v_lsn = mp_bswap_u64(lsn); memset(row, 0, sizeof(*row)); - row->body[0].iov_base = buf; - row->body[0].iov_len = len; - row->bodycnt = 1; - row->type = type; - - return 0; + row->body[0].iov_base = (void *)body; + row->body[0].iov_len = sizeof(*body); + row->bodycnt = 1; } int xrow_encode_confirm(struct xrow_header *row, struct region *region, uint32_t replica_id, int64_t lsn) { - return xrow_encode_confirm_rollback(row, region, replica_id, lsn, - IPROTO_CONFIRM); + 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) { - return xrow_encode_confirm_rollback(row, region, replica_id, lsn, - IPROTO_ROLLBACK); + 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 diff --git a/src/box/xrow.h b/src/box/xrow.h index e21ede5a3..522bab259 100644 --- a/src/box/xrow.h +++ b/src/box/xrow.h @@ -215,6 +215,31 @@ int xrow_encode_dml(const struct request *request, struct region *region, struct iovec *iov); +/** Synchro request xrow's body in MsgPack format. */ +struct PACKED synchro_body_bin { + uint8_t m_body; + uint8_t k_replica_id; + uint8_t m_replica_id; + uint32_t v_replica_id; + uint8_t k_lsn; + uint8_t m_lsn; + uint64_t v_lsn; +}; + +/** + * Encode synchro request body into the xrow. + * @param xrow Destination xrow. + * @param body Destination body. + * @param replica_id Master's instance id. + * @param lsn Last confirmed lsn. + * @param type Request type. + */ +void +xrow_encode_synchro(struct xrow_header *row, + struct synchro_body_bin *body, + uint32_t replica_id, int64_t lsn, + int type); + /** * Encode the CONFIRM to row body and set row type to * IPROTO_CONFIRM. -- 2.26.2