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 9CDA5CC30F; Thu, 21 Jan 2021 15:53:16 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 9CDA5CC30F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1611233596; bh=DFa0z9sDKOD+3S9iqzb+9thhGGzAiTHYncE7flqA7vA=; 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=E0R8TFhN9SF2S9iNvuGSNH3tYKEStt2a1QfnVxCYF/wxr77Fc/t9phPE7FSHh94h4 6s1w3Md3j6FfrpspTTCRoudo2uc/tmlYm0N3a/gfzPGmykmDMoJwkKCyj7589XwSzG 5EDlYIKAzAPJ3xRqthcKw84VJl2eFmyBZO8Zn8Qw= Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (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 8E531CC30F for ; Thu, 21 Jan 2021 15:50:43 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 8E531CC30F Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1l2ZQA-0007wD-B6; Thu, 21 Jan 2021 15:50:42 +0300 To: tarantool-patches@dev.tarantool.org, v.shpilevoy@tarantool.org Date: Thu, 21 Jan 2021 15:50:03 +0300 Message-Id: <316462e217117629e781d7aff533741763005b2c.1611232655.git.sergeyb@tarantool.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9FAB20BF8F07590368A3B0CD810054B7D9DADA0D25F7A2C51182A05F538085040F52201900D899BC00186510FAE72D8B8D62D4A1E608CAF6A7395B2308A6719FA X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE73D5736A43F78B50EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006373F8F072802CB4B3E8638F802B75D45FF5571747095F342E8C7A0BC55FA0FE5FCEB69F05919F51CB4FE87CBFB29B231C2A7A1E8B15ABEB3D4389733CBF5DBD5E913377AFFFEAFD269A417C69337E82CC2CC7F00164DA146DAFE8445B8C89999729449624AB7ADAF37F6B57BC7E64490611E7FA7ABCAF51C92A417C69337E82CC2CC7F00164DA146DA6F5DAA56C3B73B23C77107234E2CFBA567F23339F89546C55F5C1EE8F4F765FC6F009C1859321A3875ECD9A6C639B01BBD4B6F7A4D31EC0BC0CAF46E325F83A522CA9DD8327EE4931B544F03EFBC4D57C2546860BDEA057BC4224003CC836476C0CAF46E325F83A50BF2EBBBDD9D6B0F05F538519369F3743B503F486389A921A5CC5B56E945C8DA X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8183A4AFAF3EA6BDC44C234C8B12C006B7AEB69F05919F51CB4FE87CBFB29B231C209F6D9147FA6D15FB1881A6453793CE9C32612AADDFBE061C61BE10805914D3804EBA3D8E7E5B87ABF8C51168CD8EBDBC908CD1B87A134A2DC48ACC2A39D04F89CDFB48F4795C241BDAD6C7F3747799A X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34EC58E35A639A24714F798BCA314E1737DF0840AB9FB071BD6DA589A5DBB4B90813792A0F8D2B14931D7E09C32AA3244C44B374238CA6371F76A0B2A4C891F463CE0B41342B755BCD927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojYT//mZRaUejzPg4p+JE/Yw== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822A49680FB2BF36D6B11FC069A67B262CCDD788429FD8613638ED9BB8B05EE7B3AFB559BB5D741EB96D19CD4E7312BAA970A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v8 06/14] test: fix laucheck warnings W213 in test/sql-tap 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: Sergey Bronnikov via Tarantool-patches Reply-To: sergeyb@tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" From: Sergey Bronnikov W213 (Unused loop variable) Part of #5464 --- .luacheckrc | 2 -- test/sql-tap/analyze9.test.lua | 2 +- test/sql-tap/between.test.lua | 2 +- test/sql-tap/e_expr.test.lua | 6 +++--- test/sql-tap/gh-2723-concurrency.test.lua | 8 ++++---- test/sql-tap/gh-3083-ephemeral-unref-tuples.test.lua | 2 +- test/sql-tap/gh-3332-tuple-format-leak.test.lua | 2 +- test/sql-tap/gh2127-indentifier-max-length.test.lua | 10 +++++----- test/sql-tap/lua/sqltester.lua | 2 +- test/sql-tap/misc5.test.lua | 2 +- test/sql-tap/select1.test.lua | 2 +- test/sql-tap/selectB.test.lua | 4 ++-- test/sql-tap/trigger2.test.lua | 4 ++-- 13 files changed, 23 insertions(+), 25 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index c986b1cc2..2e33cc05e 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -51,8 +51,6 @@ exclude_files = { files["test/sql-tap/**/*.lua"] = { ignore = { - -- Unused loop variable. - "213", -- Local variable is set but never accessed. "231", -- "Value assigned to a local variable is unused." diff --git a/test/sql-tap/analyze9.test.lua b/test/sql-tap/analyze9.test.lua index 775b02587..794bda379 100755 --- a/test/sql-tap/analyze9.test.lua +++ b/test/sql-tap/analyze9.test.lua @@ -242,7 +242,7 @@ test:do_execsql_test( local function insert_filler_rows_n(iStart, nCopy, nVal) for i = 0, nVal-1 do local iVal = iStart+i - for j = 0, nCopy-1 do + for _ = 0, nCopy-1 do box.execute(string.format("INSERT INTO t1 VALUES (null, %s, %s, '%s')", iVal, iVal, iVal)) end end diff --git a/test/sql-tap/between.test.lua b/test/sql-tap/between.test.lua index 550976b86..755833736 100755 --- a/test/sql-tap/between.test.lua +++ b/test/sql-tap/between.test.lua @@ -61,7 +61,7 @@ local function queryplan(sql) table.insert(data,x) local eqp = box.execute("EXPLAIN QUERY PLAN "..sql.."").rows -- puts eqp=$eqp - for i, val in ipairs(eqp) do + for _, val in ipairs(eqp) do --local a = val[1] --local b = val[2] --local c = val[3] diff --git a/test/sql-tap/e_expr.test.lua b/test/sql-tap/e_expr.test.lua index 9947bbcd4..5f8b206d3 100755 --- a/test/sql-tap/e_expr.test.lua +++ b/test/sql-tap/e_expr.test.lua @@ -2120,7 +2120,7 @@ test:do_execsql_test( local likeargs = {} local function likefunc(...) local args = {...} - for i, v in ipairs(args) do + for _, v in ipairs(args) do table.insert(likeargs, v) end return 1 @@ -2353,7 +2353,7 @@ end local regexpargs = {} local function regexpfunc(...) local args = {...} - for i, v in ipairs(args) do + for _, v in ipairs(args) do table.insert(regexpargs, v) end return 1 @@ -2412,7 +2412,7 @@ test:do_test( local matchargs = { } local function matchfunc(...) local args = {...} - for i, v in ipairs(args) do + for _, v in ipairs(args) do table.insert(matchargs, v) end return 1 diff --git a/test/sql-tap/gh-2723-concurrency.test.lua b/test/sql-tap/gh-2723-concurrency.test.lua index aa9be0130..d48760ac4 100755 --- a/test/sql-tap/gh-2723-concurrency.test.lua +++ b/test/sql-tap/gh-2723-concurrency.test.lua @@ -20,7 +20,7 @@ for id = 1, N do end ) end -for id = 1, N do +for _ = 1, N do ch:get() end @@ -46,7 +46,7 @@ for id = 1, N do end ) end -for id = 1, N do +for _ = 1, N do ch:get() end test:do_test( @@ -64,7 +64,7 @@ box.execute("create index i1 on t1(b);") for id = 1, N*N do box.execute(string.format("insert into t1 values(%s, %s, 3)", id, id)) end -for id = 1, N do +for _ = 1, N do fiber.create( function () box.execute("delete from t1") @@ -72,7 +72,7 @@ for id = 1, N do end ) end -for id = 1, N do +for _ = 1, N do ch:get() end test:do_test( diff --git a/test/sql-tap/gh-3083-ephemeral-unref-tuples.test.lua b/test/sql-tap/gh-3083-ephemeral-unref-tuples.test.lua index 0b7c3ca32..57302811b 100755 --- a/test/sql-tap/gh-3083-ephemeral-unref-tuples.test.lua +++ b/test/sql-tap/gh-3083-ephemeral-unref-tuples.test.lua @@ -12,7 +12,7 @@ test:do_test( box.execute("insert into test(id, k) values(" .. i .. "," .. i .. ")") end - for i = 1, 10000 do + for i = 1, 10000 do -- luacheck: ignore unused i box.execute("SELECT id, k FROM test WHERE k IN (5849, 4986, 4997, 5020, 5044, 4990, 5013, 4983)") end end, { diff --git a/test/sql-tap/gh-3332-tuple-format-leak.test.lua b/test/sql-tap/gh-3332-tuple-format-leak.test.lua index 5e286ed0d..48c6268cf 100755 --- a/test/sql-tap/gh-3332-tuple-format-leak.test.lua +++ b/test/sql-tap/gh-3332-tuple-format-leak.test.lua @@ -21,7 +21,7 @@ test:do_test( test:do_test( "format-leak", function() - for i = 1, 100000 do + for i = 1, 100000 do -- luacheck: ignore unused i box.execute("SELECT id FROM t1 WHERE flags=3 ORDER BY id LIMIT 2"); end end, { diff --git a/test/sql-tap/gh2127-indentifier-max-length.test.lua b/test/sql-tap/gh2127-indentifier-max-length.test.lua index 112689327..bab70b714 100755 --- a/test/sql-tap/gh2127-indentifier-max-length.test.lua +++ b/test/sql-tap/gh2127-indentifier-max-length.test.lua @@ -7,7 +7,7 @@ local tt = {} local table_word = "АААААААААА" -- Create 30kb table name -for i=1,300 do +for i=1,300 do -- luacheck: ignore unused i table.insert(tt, table_word) end @@ -27,7 +27,7 @@ local vt = {} local view_word = "BBBBBBBBBB" -- Create 30kb view name -for i=1, 300 do +for i=1, 300 do -- luacheck: ignore unused i table.insert(vt, view_word) end @@ -45,7 +45,7 @@ local it = {} local index_word = "ЕЕЕЕЕЕЕЕЕЕ" -- Create 30kb index name -for i=1, 300 do +for i=1, 300 do -- luacheck: ignore unused i table.insert(it, index_word) end @@ -55,7 +55,7 @@ local field_table = {} local field_word = 'ДДДДДДДДД' -- Create 30kb field name -for i=1, 300 do +for i=1, 300 do -- luacheck: ignore unused i table.insert(field_table, field_word) end @@ -75,7 +75,7 @@ test:do_execsql_test( local trig_table = {} local trigger_word = "ССССССССС" -for i=1, 300 do +for i=1, 300 do -- luacheck: ignore unused i table.insert(trig_table, trigger_word) end diff --git a/test/sql-tap/lua/sqltester.lua b/test/sql-tap/lua/sqltester.lua index af1c2476e..fbecb47ea 100644 --- a/test/sql-tap/lua/sqltester.lua +++ b/test/sql-tap/lua/sqltester.lua @@ -272,7 +272,7 @@ test.catchsql2 = catchsql2 -- that different SQL statements generate exactly the same VDBE code. local function explain_no_trace(self, sql) local tr = execsql(self, "EXPLAIN "..sql) - for i=1,8 do + for i=1,8 do -- luacheck: ignore unused i table.remove(tr,1) end return tr diff --git a/test/sql-tap/misc5.test.lua b/test/sql-tap/misc5.test.lua index 4bc18aa87..62678bbbd 100755 --- a/test/sql-tap/misc5.test.lua +++ b/test/sql-tap/misc5.test.lua @@ -292,7 +292,7 @@ test:do_test( local sql, tail sql = "INSERT INTO t1 VALUES(" tail = "" - for i = 0, 199, 1 do + for i = 0, 199, 1 do -- luacheck: ignore unused i sql = sql .. "(1+" tail = tail .. ")" end diff --git a/test/sql-tap/select1.test.lua b/test/sql-tap/select1.test.lua index 99bcce93b..d1301e5ad 100755 --- a/test/sql-tap/select1.test.lua +++ b/test/sql-tap/select1.test.lua @@ -1974,7 +1974,7 @@ test:do_test( START TRANSACTION; INSERT INTO abc VALUES(1, 1, 1); ]] - for i = 0,9,1 do + for i = 0,9,1 do -- luacheck: ignore unused i test:execsql [[ INSERT INTO abc SELECT a+(select max(a) FROM abc), b+(select max(a) FROM abc), c+(select max(a) FROM abc) FROM abc; ]] diff --git a/test/sql-tap/selectB.test.lua b/test/sql-tap/selectB.test.lua index b56403ce5..6c7bc805a 100755 --- a/test/sql-tap/selectB.test.lua +++ b/test/sql-tap/selectB.test.lua @@ -26,11 +26,11 @@ local function test_transform(testname, sql1, sql2, results) local vdbe1 = { } local vdbe2 = { } local data = box.execute("explain "..sql1) - for i, line in ipairs(data) do + for _, line in ipairs(data) do table.insert(vdbe1, line[2]) end data = box.execute("explain "..sql2) - for i, line in ipairs(data) do + for _, line in ipairs(data) do table.insert(vdbe2, line[2]) end test:do_test( diff --git a/test/sql-tap/trigger2.test.lua b/test/sql-tap/trigger2.test.lua index 680cd07b8..4a4454597 100755 --- a/test/sql-tap/trigger2.test.lua +++ b/test/sql-tap/trigger2.test.lua @@ -127,12 +127,12 @@ for _, tbl_defn in ipairs(tbl_definitions) do local raw_result = test:execsql [[ SELECT * FROM rlog ORDER BY idx; ]] - for k,v in pairs(raw_result) do table.insert(r, v) end + for _,v in pairs(raw_result) do table.insert(r, v) end raw_result = test:execsql [[ SELECT * FROM clog ORDER BY idx; ]] - for k,v in pairs(raw_result) do table.insert(r, v) end + for _,v in pairs(raw_result) do table.insert(r, v) end return r end, { -- 2.25.1