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 94D956EC5A; Thu, 2 Sep 2021 16:22:09 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 94D956EC5A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1630588929; bh=VrPpsdqNLEtVlpnq4nf4Vl1/wUibGVM90oTu00bNxv0=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=PtcDm53Z5c7Ddp3crOfOspo/rTxChbqzO+qu/JlUFeclEF332EgwGGzi05Ep8tho8 ZffDww9Qj7XE5aAEV+4UmknAwvzucx9aNyLvG5K6zroC9UkYBynxBvpN1gNQlDrAO2 ih83AUNtMpfihX/JAo+6WEx3naRHNcNoa/AEPSrc= Received: from smtp61.i.mail.ru (smtp61.i.mail.ru [217.69.128.41]) (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 5AA1C6F3F8 for ; Thu, 2 Sep 2021 16:21:38 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 5AA1C6F3F8 Received: by smtp61.i.mail.ru with esmtpa (envelope-from ) id 1mLmev-0000Ed-Fc; Thu, 02 Sep 2021 16:21:37 +0300 To: v.shpilevoy@tarantool.org, gorcunov@gmail.com Date: Thu, 2 Sep 2021 16:21:33 +0300 Message-Id: <7ea3a5970d1106a4d557e845f69c3cde2b6b6486.1630588778.git.sergepetrenko@tarantool.org> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-4EC0790: 10 X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9D96C1EA41D18F4D509A18445EEC42850342F4D29854BE689182A05F538085040FB47F9EC8C3694493E39EE705DEC756CCD26276BD5ED596446C7B86D96F90DE6 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE78E61D63CA3BB9856C2099A533E45F2D0395957E7521B51C2CFCAF695D4D8E9FCEA1F7E6F0F101C6778DA827A17800CE745C0EDBD94D46193EA1F7E6F0F101C6723150C8DA25C47586E58E00D9D99D84E1BDDB23E98D2D38BBCA57AF85F7723F2AC46DD122CDD50CF06DBF455BC8607E4CC7F00164DA146DAFE8445B8C89999728AA50765F7900637DCE3DBD6F8E38AFD389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC87BD21ED50D08CA4DF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947CBBEA9FB9FD75E40EBA3038C0950A5D36C8A9BA7A39EFB766EC990983EF5C0329BA3038C0950A5D36D5E8D9A59859A8B6444B8EEEA9E3947276E601842F6C81A1F004C906525384307823802FF610243DF43C7A68FF6260569E8FC8737B5C2249EC8D19AE6D49635B68655334FD4449CB9ECD01F8117BC8BEAAAE862A0553A39223F8577A6DFFEA7C747589E6AAA3516243847C11F186F3C59DAA53EE0834AAEE X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C416511BB2D3FAED2F8194C013F8F079F1F7817FCFCE723229C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EFCCE3E035A672CDEE699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34181D1E89D5A0B42FD7C3421382EED985DCDE66E7BF8F622163CA649A099C6D989A9EF3A0C8B3CB221D7E09C32AA3244C1D04CB09A261594091046F46F09D8535A8CE788DE6831205927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojK/h3ZnmlPjFDJLvMyHuEqg== X-Mailru-Sender: 583F1D7ACE8F49BD31DE23046B3A846070C4D0DB130F54158428DCEBE1AF5CDDAF1D9581B9B2D6096BB2E709EA627F343C7DDD459B58856F0E45BC603594F5A135B915D4279FF0579437F6177E88F7363CDA0F3B3F5B9367 X-Mras: Ok Subject: [Tarantool-patches] [PATCH v2 1/2] box: remove unused variable in process_register() 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 Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" replica_version_id is unused in box_process_register, so no point in filling it with anything coming from a remote instance. Besides, version id isn't sent in register at all. Follow-up #6034 --- src/box/box.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/box/box.cc b/src/box/box.cc index 0b12b1328..2c8113cbb 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -2616,9 +2616,7 @@ box_process_register(struct ev_io *io, struct xrow_header *header) struct tt_uuid instance_uuid = uuid_nil; struct vclock replica_vclock; - uint32_t replica_version_id; - xrow_decode_register_xc(header, &instance_uuid, &replica_vclock, - &replica_version_id); + xrow_decode_register_xc(header, &instance_uuid, &replica_vclock, NULL); if (!is_box_configured) tnt_raise(ClientError, ER_LOADING); -- 2.30.1 (Apple Git-130)