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 9B31E6EC5C; Fri, 29 Jan 2021 19:23:46 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 9B31E6EC5C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1611937426; bh=83ufcf2gQ2VGGSVlVjod+Fz8k3QkvZBOFDOr97GwdHw=; h=To:References:Date:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=gi6mqzzj5PF/udGRdd6pVFqpwavXi3squDX+r8fmuCrnenDPLerIFDwruOh/QHN8T 6JZHJDsnuzyBGIbdcbFeU19kykx29qYTaerMFhwmnv59GZlv0Rv4yZYAdDDhZRt/VS mPRW1deSmzma3VsreV1Gih9c7hPDw/DI/aVqBJR0= Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [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 2E9166EC5C for ; Fri, 29 Jan 2021 19:23:45 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 2E9166EC5C Received: by smtpng3.m.smailru.net with esmtpa (envelope-from ) id 1l5WYi-0001XW-Aw; Fri, 29 Jan 2021 19:23:44 +0300 To: Vladislav Shpilevoy , tarantool-patches@dev.tarantool.org References: <848043b44bc85501c8e72a86dea81a44f075ca54.1611232655.git.sergeyb@tarantool.org> <4c8c3998-4851-2c6f-a51d-9f22f5cb11b7@tarantool.org> Message-ID: <098bae4f-124d-586e-21f1-7bbf253889a3@tarantool.org> Date: Fri, 29 Jan 2021 19:23:44 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <4c8c3998-4851-2c6f-a51d-9f22f5cb11b7@tarantool.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD953AC099BC0052A9CAEF2BF42A2A772939F9DC26A9E76AF69182A05F5380850406726E231DA4CD96D3172448D1D119C1E63CC8A5339860EF5CE65AC90E2462D3A X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE76ABD3380F320B62CEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F79006378D08D652E28591A78638F802B75D45FF5571747095F342E8C7A0BC55FA0FE5FC5E544B2C40DA4DC121ADF15AC438AF439C514F20BE7A6484389733CBF5DBD5E913377AFFFEAFD269176DF2183F8FC7C0D9442B0B5983000E8941B15DA834481FCF19DD082D7633A0EF3E4896CB9E6436389733CBF5DBD5E9D5E8D9A59859A8B6957A4DEDD2346B42CC7F00164DA146DA6F5DAA56C3B73B23C77107234E2CFBA567F23339F89546C55F5C1EE8F4F765FCBE2AD7090A62E00C75ECD9A6C639B01BBD4B6F7A4D31EC0BC0CAF46E325F83A522CA9DD8327EE493B89ED3C7A62817810B02670E5FEECA50C4224003CC836476C0CAF46E325F83A50BF2EBBBDD9D6B0F05F538519369F3743B503F486389A921A5CC5B56E945C8DA X-C1DE0DAB: 0D63561A33F958A58BCE5B0123404539513B1031B0C8F5665A18604E42925BA4D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA75F04B387B5D7535DE410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34EE19B6E2433CA0936DC19785A8EFFC280C386D71414B80D7BA73D83158891A8C53D38FF1981535DD1D7E09C32AA3244CC3745246F5B78B94117759D7FC66BCF8E8FBBEFAE1C4874CFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj0axADxPFAF/StiLH8zsefg== X-Mailru-Sender: 689FA8AB762F73936BC43F508A0638225291915360E253AB3A2E10689C2A8EEFDD788429FD8613638ED9BB8B05EE7B3AFB559BB5D741EB96D19CD4E7312BAA970A04DAD6CC59E33667EA787935ED9F1B X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v8 12/14] test: fix luacheck warnings W612, W613, W614 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: Sergey Bronnikov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Thanks for review! On 24.01.2021 20:36, Vladislav Shpilevoy wrote: > Thanks for the patch! > > See 3 comments below. > > On 21.01.2021 13:50, sergeyb@tarantool.org wrote: >> From: Sergey Bronnikov >> >> W612 (A line contains trailing whitespace) >> W613 (Trailing whitespace in a string) >> W614 (Trailing whitespace in a comment) >> >> Note: changes were made automatically in vim with regexp "%s/\s\+$//e". >> >> Part of #5464 >> --- >> diff --git a/test/sql-tap/analyzeD.test.lua b/test/sql-tap/analyzeD.test.lua >> index 12722a3d4..e0426b974 100755 >> --- a/test/sql-tap/analyzeD.test.lua >> +++ b/test/sql-tap/analyzeD.test.lua >> @@ -54,7 +54,7 @@ test:do_test( >> ANALYZE; >> ]]) >> end, { >> - -- <1.1> >> + -- <1.1> > 1. Git highligts this line with red. I assume here is an inconsistency > between tabs and spaces. But it does not matter as these comments can > be dropped. They are useless artifacts of TCL -> Lua translation. Removed --- a/test/sql-tap/analyzeD.test.lua +++ b/test/sql-tap/analyzeD.test.lua @@ -54,8 +54,6 @@ test:do_test(                         ANALYZE;                 ]])         end, { -               -- <1.1> -               --      })  -- With full ANALYZE data, sql sees that c=150 (5 rows) is better than >> -- >> }) >> diff --git a/test/sql-tap/join.test.lua b/test/sql-tap/join.test.lua >> index 1fc968307..4175608fd 100755 >> --- a/test/sql-tap/join.test.lua >> +++ b/test/sql-tap/join.test.lua >> @@ -564,6 +564,7 @@ test:do_catchsql_test( >> -- >> }) >> >> +-- luacheck: ignore > 2. Why? You couldn't delete some whitespaces here? > Or what is the issue? --- a/test/sql-tap/join.test.lua +++ b/test/sql-tap/join.test.lua @@ -564,11 +564,10 @@ test:do_catchsql_test(          --      }) --- luacheck: ignore  test:do_catchsql_test(      "join-3.5",      [[ -        SELECT * FROM t1 USING(a) +        SELECT * FROM t1 USING(a)      ]], {          --          1, "Syntax error at line 1 at or near position 40: a JOIN clause is required before ON and USING" > >> test:do_catchsql_test( >> "join-3.5", >> [[ >> diff --git a/test/sql-tap/tkt3935.test.lua b/test/sql-tap/tkt3935.test.lua >> index 7138e9e6a..f3bbe0b9f 100755 >> --- a/test/sql-tap/tkt3935.test.lua >> +++ b/test/sql-tap/tkt3935.test.lua >> @@ -27,30 +27,31 @@ test:do_execsql_test( >> CREATE TABLE t2(c INT primary key, d INT); >> ]], { >> -- >> - >> + >> -- >> }) >> >> test:do_execsql_test( >> "tkt3935.2", >> [[ >> - SELECT j1.b FROM ( SELECT * FROM t1 INNER JOIN t2 ON a=c ) AS j1 >> + SELECT j1.b FROM ( SELECT * FROM t1 INNER JOIN t2 ON a=c ) AS j1 >> ]], { >> -- >> - >> + >> -- >> }) >> >> test:do_execsql_test( >> "tkt3935.3", >> [[ >> - SELECT j1.b FROM (t1 INNER JOIN t2 ON a=c) AS j1 >> + SELECT j1.b FROM (t1 INNER JOIN t2 ON a=c) AS j1 >> ]], { >> -- >> - >> + >> -- >> }) >> >> +-- luacheck: ignore > 3. The same question as in the previous comment. Fixed. --- a/test/sql-tap/tkt3935.test.lua +++ b/test/sql-tap/tkt3935.test.lua @@ -51,77 +51,70 @@ test:do_execsql_test(          --      }) --- luacheck: ignore  test:do_catchsql_test(      "tkt3935.4",      [[ -        SELECT a FROM (t1) AS t ON b USING(a) +        SELECT a FROM (t1) AS t ON b USING(a)      ]], {          --          1, "Syntax error at line 1 at or near position 52: a JOIN clause is required before ON and USING"          --      }) --- luacheck: ignore  test:do_catchsql_test(      "tkt3935.5",      [[ -        SELECT a FROM (t1) AS t ON b +        SELECT a FROM (t1) AS t ON b      ]], {          --          1, "Syntax error at line 1 at or near position 43: a JOIN clause is required before ON and USING"          --      }) --- luacheck: ignore  test:do_catchsql_test(      "tkt3935.6",      [[ -        SELECT a FROM (SELECT * FROM t1) AS t ON b USING(a) +        SELECT a FROM (SELECT * FROM t1) AS t ON b USING(a)      ]], {          --          1, "Syntax error at line 1 at or near position 66: a JOIN clause is required before ON and USING"          --      }) --- luacheck: ignore  test:do_catchsql_test(      "tkt3935.7",      [[ -        SELECT a FROM (SELECT * FROM t1) AS t ON b +        SELECT a FROM (SELECT * FROM t1) AS t ON b      ]], {          --          1, "Syntax error at line 1 at or near position 57: a JOIN clause is required before ON and USING"          --      }) --- luacheck: ignore  test:do_catchsql_test(      "tkt3935.8",      [[ -        SELECT a FROM t1 AS t ON b +        SELECT a FROM t1 AS t ON b      ]], {          --          1, "Syntax error at line 1 at or near position 41: a JOIN clause is required before ON and USING"          --      }) --- luacheck: ignore  test:do_catchsql_test(      "tkt3935.9",      [[ -        SELECT a FROM t1 AS t ON b USING(a) +        SELECT a FROM t1 AS t ON b USING(a)      ]], {          --          1, "Syntax error at line 1 at or near position 50: a JOIN clause is required before ON and USING"          --      }) --- luacheck: ignore  test:do_catchsql_test(      "tkt3935.10",      [[ -        SELECT a FROM t1 AS t USING(a) +        SELECT a FROM t1 AS t USING(a)      ]], {          --          1, "Syntax error at line 1 at or near position 45: a JOIN clause is required before ON and USING" > >> test:do_catchsql_test( >> "tkt3935.4", >> [[