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 616316EC6E; Mon, 30 Aug 2021 13:34:23 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 616316EC6E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1630319663; 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=BTEcwH1AJDEe11dsxvHJc3LwQNmSHjd4Z/zdWvBbf6BTpKm7HEyu4wh4CON9d6Kda Ar7eRCDrXgcUDzeZAtLbQ0rATWg+I7S3cinsdygiuSm5cQo7ge6hfMUWNskDKr4YCD twIx760VfIAPDHc5tCzHUvYyFfrz209ciasCkQpg= Received: from smtp29.i.mail.ru (smtp29.i.mail.ru [94.100.177.89]) (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 15F2E6EC6E for ; Mon, 30 Aug 2021 13:33:52 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 15F2E6EC6E Received: by smtp29.i.mail.ru with esmtpa (envelope-from ) id 1mKebv-00057R-BU; Mon, 30 Aug 2021 13:33:51 +0300 To: v.shpilevoy@tarantool.org, gorcunov@gmail.com Date: Mon, 30 Aug 2021 13:33:47 +0300 Message-Id: <4fea96b4641de6cee608c23bd220fc1ae846fde3.1630319507.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: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92087353F0EC44DD9736CF3E71F18CE0C3E1D5927724F4AAA182A05F53808504095DA43B8198B246902912EF5CD4205059F29ED93CFA5B0E267C0926F2A1F9198 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE78FED028BAF25EB9BEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F790063726CA83C7ABDB938E8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8B2DCB98114EA12043CEC1A6F9A43D6F9117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC60CDF180582EB8FBA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F4460429728776938767073520B1593CA6EC85F86DC26CFBAC0749D213D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B67ECBC18655D52CDF089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C4DDEBE0CC47FE2693FEC907078FF8211CBF089805C739E659C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EFCDE59DDCCE53AF2B699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34AF61ACC197BF517A048D8B7558FA4FC99F60AAC76B7BF5F5D30E297EE6A65AC481A68CC360912C8E1D7E09C32AA3244C9F740D962FDD3032BA12AE9DAABB1A60408A6A02710B7304927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbL9S8ysBdXgXAi3N5ptsWyOAq2pEIdoo X-Mailru-Sender: 3B9A0136629DC9125D61937A2360A446CFA7D17BA238F1282C535C5C65B9CE3DDC3054A0AA95F91E424AE0EB1F3D1D21E2978F233C3FAE6EE63DB1732555E4A8EE80603BA4A5B0BC112434F685709FCF0DA7A0AF5A3A8387 X-Mras: Ok Subject: [Tarantool-patches] [PATCH 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)