From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 10FA96F87A; Fri, 16 Apr 2021 19:18:06 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 10FA96F87A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618589886; bh=OfqobBMlBe/WUP3MO0c68RJXIRO7eiSvCwQrNNxQ7Es=; h=To:Cc:References:Date:In-Reply-To:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=RQEvfJIJR3X2ePmdHsyijqa/sEYlF1CjfTfXH3524CfGx+bf7yQrG3lupT+rgFSKg aY0nKus7wIdOsc9ZRB6CRl8mMFN5gid4AtEuhTp4TcDxTzXgUbJYxibh9F8nX+QvsL F/lhO3dOPfL6MxH/y7h8XKGjIUMww4Gjn2f9phLs= Received: from smtp49.i.mail.ru (smtp49.i.mail.ru [94.100.177.109]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 275616F87A for ; Fri, 16 Apr 2021 19:18:05 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 275616F87A Received: by smtp49.i.mail.ru with esmtpa (envelope-from ) id 1lXRAS-0000j8-FA; Fri, 16 Apr 2021 19:18:04 +0300 To: Vladislav Shpilevoy , gorcunov@gmail.com Cc: tarantool-patches@dev.tarantool.org References: <78fd722e0cd1e6edcdd8e081c7e40a5d0bcf7ec7.1618409665.git.sergepetrenko@tarantool.org> <704d7361-d27e-9fb5-0957-487af57b4628@tarantool.org> Message-ID: <84962a93-60ad-8ab8-d30d-9c135bbb7110@tarantool.org> Date: Fri, 16 Apr 2021 19:18:03 +0300 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 In-Reply-To: <704d7361-d27e-9fb5-0957-487af57b4628@tarantool.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-GB X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E7480BE79914FF86F9151AC38CC435EA4A654182A05F5380850409453CCE4B8A589EDB1C421789B8AD0A0E4CB235E141C863D9F62F9EF7B5C37B1 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7051A6EFB787CE9C4EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006376AEB812070489DF38638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B2F72919EE5FA51EBA4DD150A41C134C00267281413F282BCCD2E47CDBA5A96583C09775C1D3CA48CF17B107DEF921CE79117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE71AE4D56B06699BBC9FA2833FD35BB23DF004C90652538430302FCEF25BFAB3454AD6D5ED66289B5278DA827A17800CE756DE261717A465CDD32BA5DBAC0009BE395957E7521B51C20BC6067A898B09E4090A508E0FED6299176DF2183F8FC7C00CBC1925EB6DB8D6CD04E86FAF290E2D7E9C4E3C761E06A71DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C3CE9959E2676FD87735872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A2AD77751E876CB595E8F7B195E1C97831B99C9F202F35F8CA2D680659EFB54793 X-C1DE0DAB: 0D63561A33F958A576AA6A84DC55EF1142EDAEF49A036D0C84B5E49BC1647C7DD59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D348B409C2D257583DFB62273C2361456A0909EF3867350EFB8295BCB63E167CC71A214FE2ABD76CCC31D7E09C32AA3244CDB2D4E40381F8BF918CB5AE86E0462C6A90944CA99CF22E3FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj3S6P1v0GIqTqX98LVDFIyA== X-Mailru-Sender: 583F1D7ACE8F49BDD2846D59FC20E9F8620E9774A9C9B290F56442A07098B7A06CD6F75EA07660E8424AE0EB1F3D1D21E2978F233C3FAE6EE63DB1732555E4A8EE80603BA4A5B0BC112434F685709FCF0DA7A0AF5A3A8387 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v3 02/10] xrow: introduce a PROMOTE entry X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Serge Petrenko via Tarantool-patches Reply-To: Serge Petrenko Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 16.04.2021 02:19, Vladislav Shpilevoy пишет: > I appreciate the work you did here! > > See 2 comments below. > >> diff --git a/src/box/xrow.c b/src/box/xrow.c >> index cc8e43ed4..5d515ce92 100644 >> --- a/src/box/xrow.c >> +++ b/src/box/xrow.c >> @@ -884,28 +884,63 @@ xrow_encode_dml(const struct request *request, struct region *region, >> return iovcnt; >> } >> >> -void >> -xrow_encode_synchro(struct xrow_header *row, >> - struct synchro_body_bin *body, >> - const struct synchro_request *req) >> +static void >> +xrow_encode_synchro_body(struct synchro_body_bin *body, >> + const struct synchro_request *req) >> { >> /* >> - * A map with two elements. We don't compress >> + * A map with two or three elements. We don't compress >> * numbers to have this structure constant in size, >> * which allows us to preallocate it on stack. >> */ >> - body->m_body = 0x80 | 2; >> + body->m_body = 0x80 | (req->type == IPROTO_PROMOTE ? 3 : 2); >> body->k_replica_id = IPROTO_REPLICA_ID; >> body->m_replica_id = 0xce; >> body->v_replica_id = mp_bswap_u32(req->replica_id); >> body->k_lsn = IPROTO_LSN; >> body->m_lsn = 0xcf; >> body->v_lsn = mp_bswap_u64(req->lsn); >> +} >> + >> +void >> +xrow_encode_synchro(struct xrow_header *row, >> + struct synchro_body_bin *body, >> + const struct synchro_request *req) >> +{ >> + assert(req->type == IPROTO_CONFIRM || req->type == IPROTO_ROLLBACK); >> + >> + xrow_encode_synchro_body(body, req); >> >> memset(row, 0, sizeof(*row)); >> + row->type = req->type; >> + row->body[0].iov_base = body; >> + row->body[0].iov_len = sizeof(*body); >> + row->bodycnt = 1; >> +} >> + >> +static inline void >> +xrow_encode_promote_body(struct promote_body_bin *body, >> + const struct synchro_request *req) > 1. I would propose to inline it. It is used in a single place, > and now it looks like if we would have more than 1 place where > we would need the promote body. > > But more interestingly, it looks you could keep it a single > function xrow_encode_synchro. Although we wouldn't be able to > have a PACKED struct with predefined fields. Not a big deal > anyway. > > The reasoning is similar to xrow_encode_dml(). It also uses > a single struct request for all kinds of DML, and conditionally > encodes the non-zero fields. I think your case is the same. It > would simplify some code, and remove branching from other > places. For example, from txn_limbo_write_synchro(), where you > branch between PROMOTE and non-PROMOTE when decide what to encode. > We even had the same issue when tried to encode CONFIRM and > ROLLBACK via separate functions. Ok, let's encode the entries together. Incremental diff is below. > >> +{ >> + xrow_encode_synchro_body(&body->base, req); >> + >> + body->k_term = IPROTO_TERM; >> + body->m_term = 0xcf; >> + body->v_term = mp_bswap_u64(req->term); >> +} >> + >> >> +void >> +xrow_encode_promote(struct xrow_header *row, struct promote_body_bin *body, >> + const struct synchro_request *req) >> +{ >> + assert(req->type == IPROTO_PROMOTE); >> + >> + xrow_encode_promote_body(body, req); >> + >> + memset(row, 0, sizeof(*row)); >> row->type = req->type; >> - row->body[0].iov_base = (void *)body; >> + row->body[0].iov_base = body; > 2. Unnecessary change. But I don't mind, up to you. This was accidental, but let's keep the change. I'm either removing the unnecessary cast from xrow_encode_synchro() or adding it to xrow_encode_promote(). I'd better remove it rather than add another place where it's used. > >> row->body[0].iov_len = sizeof(*body); >> row->bodycnt = 1; >> } ======================================================= diff --git a/src/box/txn_limbo.c b/src/box/txn_limbo.c index addcb0f97..c96e497c6 100644 --- a/src/box/txn_limbo.c +++ b/src/box/txn_limbo.c @@ -331,7 +331,7 @@ txn_limbo_write_synchro(struct txn_limbo *limbo, uint16_t type, int64_t lsn)       * This is a synchronous commit so we can       * allocate everything on a stack.       */ -    struct synchro_body_bin body; +    char body[XROW_SYNCHRO_BODY_LEN_MAX];      struct xrow_header row;      char buf[sizeof(struct journal_entry) +           sizeof(struct xrow_header *)]; @@ -339,7 +339,7 @@ txn_limbo_write_synchro(struct txn_limbo *limbo, uint16_t type, int64_t lsn)      struct journal_entry *entry = (struct journal_entry *)buf;      entry->rows[0] = &row; -    xrow_encode_synchro(&row, &body, &req); +    xrow_encode_synchro(&row, body, &req);      journal_entry_create(entry, 1, xrow_approx_len(&row),                   txn_limbo_write_cb, fiber()); diff --git a/src/box/xrow.c b/src/box/xrow.c index 5b689a86a..2e364cea5 100644 --- a/src/box/xrow.c +++ b/src/box/xrow.c @@ -884,56 +884,34 @@ xrow_encode_dml(const struct request *request, struct region *region,      return iovcnt;  } -static void -xrow_encode_synchro_body(struct synchro_body_bin *body, -                 const struct synchro_request *req) -{ -    /* -     * A map with two or three elements. We don't compress -     * numbers to have this structure constant in size, -     * which allows us to preallocate it on stack. -     */ -    body->m_body = 0x80 | (req->type == IPROTO_PROMOTE ? 3 : 2); -    body->k_replica_id = IPROTO_REPLICA_ID; -    body->m_replica_id = 0xce; -    body->v_replica_id = mp_bswap_u32(req->replica_id); -    body->k_lsn = IPROTO_LSN; -    body->m_lsn = 0xcf; -    body->v_lsn = mp_bswap_u64(req->lsn); -} -  void -xrow_encode_synchro(struct xrow_header *row, -            struct synchro_body_bin *body, +xrow_encode_synchro(struct xrow_header *row, char *body,              const struct synchro_request *req)  { -    assert(req->type == IPROTO_CONFIRM || req->type == IPROTO_ROLLBACK); +    assert(iproto_type_is_synchro_request(req->type)); -    xrow_encode_synchro_body(body, req); +    char *pos = body; -    memset(row, 0, sizeof(*row)); -    row->type = req->type; -    row->body[0].iov_base = body; -    row->body[0].iov_len = sizeof(*body); -    row->bodycnt = 1; -} +    pos = mp_encode_map(pos, +                iproto_type_is_promote_request(req->type) ? 3 : 2); -void -xrow_encode_promote(struct xrow_header *row, struct promote_body_bin *body, -            const struct synchro_request *req) -{ -    assert(req->type == IPROTO_PROMOTE); +    pos = mp_encode_uint(pos, IPROTO_REPLICA_ID); +    pos = mp_encode_uint(pos, req->replica_id); -    xrow_encode_synchro_body(&body->base, req); +    pos = mp_encode_uint(pos, IPROTO_LSN); +    pos = mp_encode_uint(pos, req->lsn); + +    if (iproto_type_is_promote_request(req->type)) { +        pos = mp_encode_uint(pos, IPROTO_TERM); +        pos = mp_encode_uint(pos, req->term); +    } -    body->k_term = IPROTO_TERM; -    body->m_term = 0xcf; -    body->v_term = mp_bswap_u64(req->term); +    assert(pos - body < XROW_SYNCHRO_BODY_LEN_MAX);      memset(row, 0, sizeof(*row));      row->type = req->type;      row->body[0].iov_base = body; -    row->body[0].iov_len = sizeof(*body); +    row->body[0].iov_len = pos - body;      row->bodycnt = 1;  } diff --git a/src/box/xrow.h b/src/box/xrow.h index 80a5cd909..b3c664be2 100644 --- a/src/box/xrow.h +++ b/src/box/xrow.h @@ -49,6 +49,7 @@ enum {      XROW_IOVMAX = XROW_HEADER_IOVMAX + XROW_BODY_IOVMAX,      XROW_HEADER_LEN_MAX = 52,      XROW_BODY_LEN_MAX = 256, +    XROW_SYNCHRO_BODY_LEN_MAX = 32,      IPROTO_HEADER_LEN = 28,      /** 7 = sizeof(iproto_body_bin). */      IPROTO_SELECT_HEADER_LEN = IPROTO_HEADER_LEN + 7, @@ -260,25 +261,6 @@ struct synchro_request {      uint64_t term;  }; -/** 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; -}; - -/** PROMOTE request's xrow body in MsgPack format. */ -struct PACKED promote_body_bin { -    struct synchro_body_bin base; -    uint8_t k_term; -    uint8_t m_term; -    uint64_t v_term; -}; -  /**   * Encode synchronous replication request.   * @param row xrow header. @@ -286,18 +268,7 @@ struct PACKED promote_body_bin {   * @param req Request parameters.   */  void -xrow_encode_synchro(struct xrow_header *row, -            struct synchro_body_bin *body, -            const struct synchro_request *req); - -/** - * Encode a promote request. - * @param row xrow header. - * @param body A place to encode promote body. - * @param req Request parameters. - */ -void -xrow_encode_promote(struct xrow_header *row, struct promote_body_bin *body, +xrow_encode_synchro(struct xrow_header *row, char *body,              const struct synchro_request *req);  /** -- Serge Petrenko