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 2D7AECC315; Thu, 21 Jan 2021 15:56:52 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2D7AECC315 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1611233812; bh=6R4uwRNibwddOgDM+PUR6YJvDZTxvSZJvlq4C+7+5wg=; 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=II2EEzzjkJ/CZshD6VQ/IC/D7azn8b4QAnSBP1yHqBn+200w5dzZqfxUgi70dooiy t/LVxhohBkl2s/3v2vz8oY3rntsrG8QYBUTJ9WIdJqLZtMP2EoGFlahlQT1Btrd9BI 5jBTlNG0Op1ug2diIVaJKxh8Y37t0L4v6bFHBhbE= 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 3D67FCC316 for ; Thu, 21 Jan 2021 15:51:15 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 3D67FCC316 Received: by smtpng1.m.smailru.net with esmtpa (envelope-from ) id 1l2ZQg-0007wD-2T; Thu, 21 Jan 2021 15:51:14 +0300 To: tarantool-patches@dev.tarantool.org, v.shpilevoy@tarantool.org Date: Thu, 21 Jan 2021 15:50:17 +0300 Message-Id: <664352f76be1541dc4fbe26929380be160914dc3.1611232655.git.sergeyb@tarantool.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: EEAE043A70213CC8 X-77F55803: 4F1203BC0FB41BD9FAB20BF8F07590368A3B0CD810054B7D9DADA0D25F7A2C51182A05F538085040BAC879A8FCD85EC7A4BCD125DD69B0BA7BE930EAC727C29D25BE0042709333D3 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7ED971EE68B26EF8CEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006372B2228CC7F94022E8638F802B75D45FF5571747095F342E8C7A0BC55FA0FE5FCEB69F05919F51CB4D370C0F583E513C3773DC5121C89CD9D389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C0D9442B0B5983000E8941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B6D082881546D93491CC7F00164DA146DA6F5DAA56C3B73B23C77107234E2CFBA567F23339F89546C55F5C1EE8F4F765FC39F82E19B0A6E84575ECD9A6C639B01BBD4B6F7A4D31EC0BC0CAF46E325F83A522CA9DD8327EE4931B544F03EFBC4D571337B709B3801B10C4224003CC836476C0CAF46E325F83A50BF2EBBBDD9D6B0F05F538519369F3743B503F486389A921A5CC5B56E945C8DA X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C2549B6A8B600A67A1DD860A88A2DC86156D86AC5F12278199C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF6EA1BA7CA28B4A74699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34E69981C39E7B068AC374947351A9166C4E22008422A4C05F5E49546B8126769FAED9C9F9C55FD4411D7E09C32AA3244C9DDCE8831C72AFF5D8DFFEE767BAF584F165894D92D62706927AC6DF5659F194 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojYT//mZRaUeird5qx2K2XUw== X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822CCD7F0E0672FA4295A35E8A2AA689EB5DD788429FD8613638ED9BB8B05EE7B3AFB559BB5D741EB96D19CD4E7312BAA970A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: [Tarantool-patches] [PATCH v8 13/14] test: fix luacheck warnings W621 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 W621 (Inconsistent indentation (SPACE followed by TAB)) Part of #5464 --- .luacheckrc | 2 -- test/sql-tap/analyze7.test.lua | 14 +++++++------- test/sql-tap/analyzeD.test.lua | 8 ++++---- test/sql-tap/analyzeF.test.lua | 2 +- test/sql-tap/index1.test.lua | 2 +- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index 69be93a67..a798ca6f8 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -53,8 +53,6 @@ files["test/sql-tap/**/*.lua"] = { ignore = { -- A line consists of nothing but whitespace. "611", - -- Inconsistent indentation (SPACE followed by TAB). - "621", -- Line is too long. "631" } diff --git a/test/sql-tap/analyze7.test.lua b/test/sql-tap/analyze7.test.lua index 203a0c3f9..8aa29e951 100755 --- a/test/sql-tap/analyze7.test.lua +++ b/test/sql-tap/analyze7.test.lua @@ -29,11 +29,11 @@ test:do_test( DROP TABLE IF EXISTS nums; CREATE TABLE nums(n INT PRIMARY KEY); INSERT into nums WITH RECURSIVE cnt(x) AS (VALUES(1) UNION ALL SELECT x+1 FROM cnt WHERE x<256) SELECT x FROM cnt; - INSERT INTO t1 SELECT n, n, n, n/100, n FROM nums; - EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=123; + INSERT INTO t1 SELECT n, n, n, n/100, n FROM nums; + EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=123; ]]) end, { - -- + -- 0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX T1A (A=?)" -- }) @@ -43,7 +43,7 @@ test:do_execsql_test( [[ EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE b=123; ]], { - -- + -- 0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX T1B (B=?)" -- }) @@ -68,7 +68,7 @@ test:do_test( test:execsql("ANALYZE;") return test:execsql("EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE a=123;") end, { - -- + -- 0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX T1A (A=?)" -- }) @@ -147,9 +147,9 @@ test:do_execsql_test( test:do_execsql_test( "analyze7-3.2.2", [[ - EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE c=2; + EXPLAIN QUERY PLAN SELECT * FROM t1 WHERE c=2; ]], { - -- + -- 0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX T1CD (C=?)" -- }) diff --git a/test/sql-tap/analyzeD.test.lua b/test/sql-tap/analyzeD.test.lua index e0426b974..c6b9fa206 100755 --- a/test/sql-tap/analyzeD.test.lua +++ b/test/sql-tap/analyzeD.test.lua @@ -54,8 +54,8 @@ test:do_test( ANALYZE; ]]) end, { - -- <1.1> - -- + -- <1.1> + -- }) -- With full ANALYZE data, sql sees that c=150 (5 rows) is better than @@ -122,7 +122,7 @@ test:do_test( end, { -- <1.7> -- - }) + }) -- Same test as 1.4, except this time the 7 rows that match the a=? condition -- do not feature larger values than all rows in the stat4 table. So sql @@ -135,7 +135,7 @@ test:do_execsql_test( -- <1.8> 0, 0, 0, "SEARCH TABLE T1 USING COVERING INDEX T1_C (C=?)" -- - }) + }) test:do_catchsql_test( "analyzeD-1.9", diff --git a/test/sql-tap/analyzeF.test.lua b/test/sql-tap/analyzeF.test.lua index 0b621a3ae..cbb088415 100755 --- a/test/sql-tap/analyzeF.test.lua +++ b/test/sql-tap/analyzeF.test.lua @@ -25,7 +25,7 @@ box.internal.sql_create_function("isqrt", "NUMBER", isqrt) test:do_execsql_test( 1.0, [[ - DROP TABLE IF EXISTS t1; + DROP TABLE IF EXISTS t1; CREATE TABLE t1(id INT PRIMARY KEY, x INTEGER, y INTEGER); WITH data(i) AS (SELECT 1 UNION ALL SELECT i+1 FROM data) INSERT INTO t1 SELECT i, isqrt(i), isqrt(i) FROM data LIMIT 500; CREATE INDEX t1y ON t1(y); diff --git a/test/sql-tap/index1.test.lua b/test/sql-tap/index1.test.lua index 1ac02d60c..e647c22fe 100755 --- a/test/sql-tap/index1.test.lua +++ b/test/sql-tap/index1.test.lua @@ -406,7 +406,7 @@ test:do_test( test:do_catchsql_test( "index-8.1", [[ - CREATE TABLE test1(a INT PRIMARY KEY); + CREATE TABLE test1(a INT PRIMARY KEY); DROP INDEX index1 ON test1 ]], { -- -- 2.25.1