WIP: Fix & refactor 'common' test

Author: Totktonada

test/bench/bench.lua

@@ -13,7 +13,6 @@ local clock = require('clock')
 local fiber = require('fiber')
 local digest = require('digest')
 local multirunner = require('test.common.lua.multirunner')
-local graphql = require('graphql')
 local utils = require('graphql.utils')
 local test_run = utils.optional_require('test_run')
 test_run = test_run and test_run.new()
@@ -29,29 +28,6 @@ local SCRIPT_DIR = fio.abspath(debug.getinfo(1).source:match("@?(.*/)")
 
 local bench = {}
 
-function bench.graphql_from_testdata(testdata, shard)
-    local accessor_class = shard and graphql.accessor_shard or
-        graphql.accessor_space
-
-    local meta = testdata.get_test_metadata()
-
-    local accessor = accessor_class.new({
-        schemas = meta.schemas,
-        collections = meta.collections,
-        service_fields = meta.service_fields,
-        indexes = meta.indexes,
-        timeout_ms = graphql.TIMEOUT_INFINITY,
-    })
-
-    local gql_wrapper = graphql.new({
-        schemas = meta.schemas,
-        collections = meta.collections,
-        accessor = accessor,
-    })
-
-    return gql_wrapper
-end
-
 local function workload(shard, bench_prepare, bench_iter, opts)
     local iterations = opts.iterations
     local exp_checksum = opts.checksum

test/bench/nesting-1-1.test.lua

@@ -9,6 +9,7 @@ local fio = require('fio')
 package.path = fio.abspath(debug.getinfo(1).source:match("@?(.*/)")
     :gsub('/./', '/'):gsub('/+$', '')) .. '/../../?.lua' .. ';' .. package.path
 
+local utils = require('test.utils')
 local bench = require('test.bench.bench')
 local testdata = require('test.testdata.bench_testdata')
 
@@ -18,7 +19,7 @@ local testdata = require('test.testdata.bench_testdata')
 local function bench_prepare(state)
     local virtbox = state.shard or box.space
 
-    state.gql_wrapper = bench.graphql_from_testdata(testdata, state.shard)
+    state.gql_wrapper = utils.graphql_from_testdata(testdata, state.shard)
     testdata.fill_test_data(virtbox)
 
     local query = [[

test/bench/nesting-1-100.test.lua

@@ -9,6 +9,7 @@ local fio = require('fio')
 package.path = fio.abspath(debug.getinfo(1).source:match("@?(.*/)")
     :gsub('/./', '/'):gsub('/+$', '')) .. '/../../?.lua' .. ';' .. package.path
 
+local utils = require('test.utils')
 local bench = require('test.bench.bench')
 local testdata = require('test.testdata.bench_testdata')
 
@@ -18,7 +19,7 @@ local testdata = require('test.testdata.bench_testdata')
 local function bench_prepare(state)
     local virtbox = state.shard or box.space
 
-    state.gql_wrapper = bench.graphql_from_testdata(testdata, state.shard)
+    state.gql_wrapper = utils.graphql_from_testdata(testdata, state.shard)
     testdata.fill_test_data(virtbox)
 
     local query = [[

test/bench/nesting-2-1-1.test.lua

@@ -9,6 +9,7 @@ local fio = require('fio')
 package.path = fio.abspath(debug.getinfo(1).source:match("@?(.*/)")
     :gsub('/./', '/'):gsub('/+$', '')) .. '/../../?.lua' .. ';' .. package.path
 
+local utils = require('test.utils')
 local bench = require('test.bench.bench')
 local testdata = require('test.testdata.bench_testdata')
 
@@ -18,7 +19,7 @@ local testdata = require('test.testdata.bench_testdata')
 local function bench_prepare(state)
     local virtbox = state.shard or box.space
 
-    state.gql_wrapper = bench.graphql_from_testdata(testdata, state.shard)
+    state.gql_wrapper = utils.graphql_from_testdata(testdata, state.shard)
     testdata.fill_test_data(virtbox)
 
     local query = [[

test/bench/nesting-2-100-1.test.lua

@@ -9,6 +9,7 @@ local fio = require('fio')
 package.path = fio.abspath(debug.getinfo(1).source:match("@?(.*/)")
     :gsub('/./', '/'):gsub('/+$', '')) .. '/../../?.lua' .. ';' .. package.path
 
+local utils = require('test.utils')
 local bench = require('test.bench.bench')
 local testdata = require('test.testdata.bench_testdata')
 
@@ -18,7 +19,7 @@ local testdata = require('test.testdata.bench_testdata')
 local function bench_prepare(state)
     local virtbox = state.shard or box.space
 
-    state.gql_wrapper = bench.graphql_from_testdata(testdata, state.shard)
+    state.gql_wrapper = utils.graphql_from_testdata(testdata, state.shard)
     testdata.fill_test_data(virtbox)
 
     local query = [[

test/bench/nesting-3-1-1-1.test.lua

@@ -9,6 +9,7 @@ local fio = require('fio')
 package.path = fio.abspath(debug.getinfo(1).source:match("@?(.*/)")
     :gsub('/./', '/'):gsub('/+$', '')) .. '/../../?.lua' .. ';' .. package.path
 
+local utils = require('test.utils')
 local bench = require('test.bench.bench')
 local testdata = require('test.testdata.bench_testdata')
 
@@ -18,7 +19,7 @@ local testdata = require('test.testdata.bench_testdata')
 local function bench_prepare(state)
     local virtbox = state.shard or box.space
 
-    state.gql_wrapper = bench.graphql_from_testdata(testdata, state.shard)
+    state.gql_wrapper = utils.graphql_from_testdata(testdata, state.shard)
     testdata.fill_test_data(virtbox)
 
     local query = [[

test/bench/nesting-3-100-100-1.test.lua

@@ -9,6 +9,7 @@ local fio = require('fio')
 package.path = fio.abspath(debug.getinfo(1).source:match("@?(.*/)")
     :gsub('/./', '/'):gsub('/+$', '')) .. '/../../?.lua' .. ';' .. package.path
 
+local utils = require('test.utils')
 local bench = require('test.bench.bench')
 local testdata = require('test.testdata.bench_testdata')
 
@@ -18,7 +19,7 @@ local testdata = require('test.testdata.bench_testdata')
 local function bench_prepare(state)
     local virtbox = state.shard or box.space
 
-    state.gql_wrapper = bench.graphql_from_testdata(testdata, state.shard)
+    state.gql_wrapper = utils.graphql_from_testdata(testdata, state.shard)
     testdata.fill_test_data(virtbox)
 
     local query = [[