Reduce code duplication in test/bench/bench.lua

Author: Totktonada

test/bench/bench.lua

@@ -15,6 +15,7 @@ local digest = require('digest')
 local multirunner = require('test.common.lua.multirunner')
 local graphql = require('graphql')
 local utils = require('graphql.utils')
+local test_utils = require('test.utils')
 local test_run = utils.optional_require('test_run')
 test_run = test_run and test_run.new()
 
@@ -29,29 +30,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
@@ -178,4 +156,14 @@ function bench.run(test_name, opts)
     end
 end
 
+-- helper for preparing benchmarking environment
+function bench.bench_prepare_helper(testdata, shard)
+    testdata.fill_test_data(shard or box.space)
+    return test_utils.graphql_from_testdata(testdata, shard, {
+        graphql_opts = {
+            timeout_ms = graphql.TIMEOUT_INFINITY,
+        }
+    })
+end
+
 return bench

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

@@ -16,11 +16,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)
-    testdata.fill_test_data(virtbox)
-
+    state.gql_wrapper = bench.bench_prepare_helper(testdata, state.shard)
     local query = [[
         query match_by_user_id($user_id: String) {
             user(user_id: $user_id) {

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

@@ -16,11 +16,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)
-    testdata.fill_test_data(virtbox)
-
+    state.gql_wrapper = bench.bench_prepare_helper(testdata, state.shard)
     local query = [[
         query match_users {
             user {

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

@@ -16,11 +16,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)
-    testdata.fill_test_data(virtbox)
-
+    state.gql_wrapper = bench.bench_prepare_helper(testdata, state.shard)
     local query = [[
         query match_by_user_and_passport_id($user_id: String,
                 $passport_id: String) {

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

@@ -16,11 +16,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)
-    testdata.fill_test_data(virtbox)
-
+    state.gql_wrapper = bench.bench_prepare_helper(testdata, state.shard)
     local query = [[
         query match_by_passport_id($passport_id: String) {
             user(user_to_passport_c: {passport_id: $passport_id}) {

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

@@ -16,11 +16,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)
-    testdata.fill_test_data(virtbox)
-
+    state.gql_wrapper = bench.bench_prepare_helper(testdata, state.shard)
     local query = [[
         query match_by_user_and_passport($user_id: String, $number: String) {
             user(user_id: $user_id, user_to_passport_c: {

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

@@ -16,11 +16,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)
-    testdata.fill_test_data(virtbox)
-
+    state.gql_wrapper = bench.bench_prepare_helper(testdata, state.shard)
     local query = [[
         query match_by_passport($number: String) {
             user(user_to_passport_c: {passport_c: {number: $number}}) {