From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (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 91C19430409 for ; Sat, 15 Aug 2020 11:38:56 +0300 (MSK) Received: by mail-lf1-f54.google.com with SMTP id x24so5949282lfe.11 for ; Sat, 15 Aug 2020 01:38:56 -0700 (PDT) Date: Sat, 15 Aug 2020 11:38:51 +0300 From: Cyrill Gorcunov Message-ID: <20200815083851.GD2074@grain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200814211442.667099-1-gorcunov@gmail.com> Subject: [Tarantool-patches] [PATCH v7 9/8] txn: txn_add_redo -- drop synchro processing List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tml Cc: Vladislav Shpilevoy Since we no longer use txn engine for synchro packets processing this code is never executed. Part-of #5129 Signed-off-by: Cyrill Gorcunov --- Happen to miss this yesterday. I pushed into the same branch. src/box/txn.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/box/txn.c b/src/box/txn.c index cc1f496c5..b2d342355 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -82,14 +82,7 @@ txn_add_redo(struct txn *txn, struct txn_stmt *stmt, struct request *request) */ struct space *space = stmt->space; row->group_id = space != NULL ? space_group_id(space) : 0; - /* - * Sychronous replication entries are supplementary and - * aren't valid dml requests. They're encoded manually. - */ - if (likely(!iproto_type_is_synchro_request(row->type))) - row->bodycnt = xrow_encode_dml(request, &txn->region, row->body); - else - row->bodycnt = xrow_header_dup_body(row, &txn->region); + row->bodycnt = xrow_encode_dml(request, &txn->region, row->body); if (row->bodycnt < 0) return -1; stmt->row = row; -- 2.26.2