diff --git a/.luacheckrc b/.luacheckrc index 497b1efc81453b1c57dd8ab3a8a04ceca3c76614..180da6569fb0e84d0b47231f3b56003c89b899b4 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -48,7 +48,7 @@ exclude_files = { "test/sql/**/*.lua", "test/swim/**/*.lua", "test/var/**/*.lua", - "test/vinyl/**/*.lua", + "test/vinyl/*.test.lua", "test/wal_off/*.test.lua", "test/xlog/*.test.lua", "third_party/**/*.lua", diff --git a/test/vinyl/large.lua b/test/vinyl/large.lua index e10e94c1a8ba10c4739bf9ac19975dfbd70193fc..a997aec7eeb29e4aaf69ade39be1c251fb586fba 100644 --- a/test/vinyl/large.lua +++ b/test/vinyl/large.lua @@ -1,5 +1,4 @@ -fiber = require('fiber') -digest = require('digest') +local digest = require('digest') local PAGE_SIZE = 1024 local RANGE_SIZE = 64 * PAGE_SIZE diff --git a/test/vinyl/stress.lua b/test/vinyl/stress.lua index 5e8d897953b679510e2325c864e57676ea03d2e4..d8c1b631c4fd18ab5eb353dc26c6e1d8a7be7ec3 100644 --- a/test/vinyl/stress.lua +++ b/test/vinyl/stress.lua @@ -62,7 +62,7 @@ local function t2(ch, time_limit) local t = math.random(16) local space = spaces[math.fmod(t, #spaces) + 1] if t < 12 then - local l = space:get({k}) + space:get({k}) else space:delete({k}) end @@ -99,19 +99,19 @@ local function stress(time_limit) math.randomseed(os.time()); - for i = 1, 6 do + for _ = 1, 6 do fiber.create(t1, ch, time_limit) end; - for i = 1, 6 do + for _ = 1, 6 do fiber.create(t2, ch, time_limit) end; - for i = 1, 4 do + for _ = 1, 4 do fiber.create(t3, ch, time_limit) end; - for i = 1, 16 do + for _ = 1, 16 do ch:get() end; end diff --git a/test/vinyl/upgrade/2.5.1/gh-5107-upsert-upgrade/fill.lua b/test/vinyl/upgrade/2.5.1/gh-5107-upsert-upgrade/fill.lua index 1916aea6e7cfbad067d1cf5d5532a2429e099776..64b375462df3858d7d6b7afe3af4b79fd1faafb9 100644 --- a/test/vinyl/upgrade/2.5.1/gh-5107-upsert-upgrade/fill.lua +++ b/test/vinyl/upgrade/2.5.1/gh-5107-upsert-upgrade/fill.lua @@ -1,7 +1,7 @@ box.cfg{} -s = box.schema.create_space('test', {engine = 'vinyl'}) -pk = s:create_index('pk') +local s = box.schema.create_space('test', {engine = 'vinyl'}) +s:create_index('pk') s:insert({1, 2}) box.snapshot() s:upsert({1, 0}, {{'+', 2, 1}}) diff --git a/test/vinyl/vinyl.lua b/test/vinyl/vinyl.lua index 31307f4bc92e868fb39532f9e5d49522d18dc143..1d313b4e49b2d0eb6ed8f1f4d36b7fc95eb1d507 100644 --- a/test/vinyl/vinyl.lua +++ b/test/vinyl/vinyl.lua @@ -15,21 +15,4 @@ box.cfg { vinyl_max_tuple_size = 1024 * 1024 * 6, } -function box_info_sort(data) - if type(data)~='table' then - return data - end - local keys = {} - for k in pairs(data) do - table.insert(keys, k) - end - table.sort(keys) - local result = {} - for _,k in pairs(keys) do - local v = data[k] - table.insert(result, {[k] = box_info_sort(v) }) - end - return result -end - require('console').listen(os.getenv('ADMIN'))