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 4F95C6EC40; Fri, 2 Jul 2021 01:10:41 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 4F95C6EC40 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1625177441; bh=MIZp8fQSQo6wfBwdvQrafDJ6wA4X/mWRn8rzKgi66xI=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=J+Yf0B1X+7o7x4Zgm2HH3jXzj4YD84hbH5VbA+yB46DSKZxWQUJi/jECojE7DK1h4 BweMqA0j6pfv3AXx2zQDeW008K89yh+LQXfF7LRHk0NJ+VvlEHsMrs8FynvM7l4Zg2 ZgAHNKK+KwIxtyIW0UJNKPjDm/I2vhCjMel6FEYg= Received: from smtpng3.i.mail.ru (smtpng3.i.mail.ru [94.100.177.149]) (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 1DBBB6EC41 for ; Fri, 2 Jul 2021 01:09:40 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 1DBBB6EC41 Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1lz4sN-00061t-4F; Fri, 02 Jul 2021 01:09:39 +0300 To: tarantool-patches@dev.tarantool.org, olegrok@tarantool.org, yaroslav.dynnikov@tarantool.org Date: Fri, 2 Jul 2021 00:09:32 +0200 Message-Id: X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD954DFF1DC42D673FB8EEAA58EF109ED2DCA3B880632F394B8182A05F5380850406F8A06922936F359DAEF55FDEB30E6A0AFBC943AD2EF420BF5C88A3AC3E3ECB8 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7A8325FA649D0A450EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006373C9FC9F3BACECB908638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8D2D84E6AD43C9306AF077F961D31D725117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC3A703B70628EAD7BA471835C12D1D9774AD6D5ED66289B52BA9C0B312567BB23117882F44604297287769387670735201E561CDFBCA1751FCB629EEF1311BF91D2E47CDBA5A96583BA9C0B312567BB231DD303D21008E29813377AFFFEAFD269A417C69337E82CC2E827F84554CEF50127C277FBC8AE2E8BA83251EDC214901ED5E8D9A59859A8B6A1DCCEB63E2F10FB089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C4C7A0BC55FA0FE5FC552C9033C69F3619E21F8676624EF1F495652F0F2B2EF0F1B1881A6453793CE9C32612AADDFBE061C61BE10805914D3804EBA3D8E7E5B87ABF8C51168CD8EBDB3D2201D7125A9A9FDC48ACC2A39D04F89CDFB48F4795C241BDAD6C7F3747799A X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D348F9E8EBB462314877EE1BD53C77DABA8636EE71B585009BA3C51120AB2786B1B34E8E69EC68D3B711D7E09C32AA3244CBFBEADE87BB4A9BDB849B38D6393474B35DA7DC5AF9B58C0FACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbL9S8ysBdXjw2yJDrod5MF0CmYZGjcWa X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822AB7C404B4885A24D0C3054A81E957D403841015FED1DE5223CC9A89AB576DD93FB559BB5D741EB963CF37A108A312F5C27E8A8C3839CE0E267EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH vshard 2/6] test: sort some table prints 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: Vladislav Shpilevoy via Tarantool-patches Reply-To: Vladislav Shpilevoy Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Router.test.lua and upgrade.test.lua printed some Lua tables which were not sorted. Next patches are going to alter them slightly and if the tables are not sorted, some old keys would change place and increase the diff. The patch makes these outputs sorted so any amendment won't touch the existing lines. --- test/router/router.result | 28 +++++++++++++++++----------- test/router/router.test.lua | 2 ++ test/upgrade/upgrade.result | 14 +++++++------- vshard/storage/init.lua | 3 ++- 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/test/router/router.result b/test/router/router.result index f9ee37c..98dd5b5 100644 --- a/test/router/router.result +++ b/test/router/router.result @@ -1158,21 +1158,24 @@ end; _ = test_run:cmd("setopt delimiter ''"); --- ... +table.sort(error_messages) +--- +... error_messages --- -- - Use replicaset:callro(...) instead of replicaset.callro(...) - - Use replicaset:connect_master(...) instead of replicaset.connect_master(...) +- - Use replicaset:call(...) instead of replicaset.call(...) + - Use replicaset:callbre(...) instead of replicaset.callbre(...) + - Use replicaset:callbro(...) instead of replicaset.callbro(...) - Use replicaset:callre(...) instead of replicaset.callre(...) - - Use replicaset:down_replica_priority(...) instead of replicaset.down_replica_priority(...) + - Use replicaset:callro(...) instead of replicaset.callro(...) + - Use replicaset:callrw(...) instead of replicaset.callrw(...) - Use replicaset:connect(...) instead of replicaset.connect(...) - - Use replicaset:wait_connected(...) instead of replicaset.wait_connected(...) - - Use replicaset:up_replica_priority(...) instead of replicaset.up_replica_priority(...) - - Use replicaset:callbro(...) instead of replicaset.callbro(...) - Use replicaset:connect_all(...) instead of replicaset.connect_all(...) + - Use replicaset:connect_master(...) instead of replicaset.connect_master(...) - Use replicaset:connect_replica(...) instead of replicaset.connect_replica(...) - - Use replicaset:call(...) instead of replicaset.call(...) - - Use replicaset:callrw(...) instead of replicaset.callrw(...) - - Use replicaset:callbre(...) instead of replicaset.callbre(...) + - Use replicaset:down_replica_priority(...) instead of replicaset.down_replica_priority(...) + - Use replicaset:up_replica_priority(...) instead of replicaset.up_replica_priority(...) + - Use replicaset:wait_connected(...) instead of replicaset.wait_connected(...) ... _, replica = next(replicaset.replicas) --- @@ -1192,11 +1195,14 @@ end; _ = test_run:cmd("setopt delimiter ''"); --- ... +table.sort(error_messages) +--- +... error_messages --- -- - Use replica:safe_uri(...) instead of replica.safe_uri(...) - - Use replica:detach_conn(...) instead of replica.detach_conn(...) +- - Use replica:detach_conn(...) instead of replica.detach_conn(...) - Use replica:is_connected(...) instead of replica.is_connected(...) + - Use replica:safe_uri(...) instead of replica.safe_uri(...) ... -- -- gh-117: Preserve route_map on router.cfg. diff --git a/test/router/router.test.lua b/test/router/router.test.lua index aa3eb3b..0017111 100644 --- a/test/router/router.test.lua +++ b/test/router/router.test.lua @@ -413,6 +413,7 @@ for _, func in pairs(getmetatable(replicaset).__index) do table.insert(error_messages, msg:match("Use .*")) end; _ = test_run:cmd("setopt delimiter ''"); +table.sort(error_messages) error_messages _, replica = next(replicaset.replicas) @@ -424,6 +425,7 @@ for _, func in pairs(getmetatable(replica).__index) do table.insert(error_messages, msg:match("Use .*")) end; _ = test_run:cmd("setopt delimiter ''"); +table.sort(error_messages) error_messages -- diff --git a/test/upgrade/upgrade.result b/test/upgrade/upgrade.result index 833da3f..8280e5b 100644 --- a/test/upgrade/upgrade.result +++ b/test/upgrade/upgrade.result @@ -161,13 +161,13 @@ vshard.storage._call ~= nil | ... vshard.storage._call('test_api', 1, 2, 3) | --- - | - bucket_recv: true - | storage_ref: true - | rebalancer_apply_routes: true - | storage_map: true - | rebalancer_request_state: true - | test_api: true - | storage_unref: true + | - - bucket_recv + | - rebalancer_apply_routes + | - rebalancer_request_state + | - storage_map + | - storage_ref + | - storage_unref + | - test_api | - 1 | - 2 | - 3 diff --git a/vshard/storage/init.lua b/vshard/storage/init.lua index 14ec42b..e13a24e 100644 --- a/vshard/storage/init.lua +++ b/vshard/storage/init.lua @@ -2566,8 +2566,9 @@ service_call_api = setmetatable({ }, {__serialize = function(api) local res = {} for k, _ in pairs(api) do - res[k] = true + table.insert(res, k) end + table.sort(res) return res end}) -- 2.24.3 (Apple Git-128)