Support shard-2.1 (when will be released)

Fixed running on several shard configuration in test/common suite.

* Fixed #61.
* Related to #111.

TBD: test/shard_* is not working because of cluster dropping.

Author: Totktonada

README.md

@@ -101,13 +101,15 @@ make test
   * tarantool,
   * lulpeg,
   * >=tarantool/avro-schema-2.0-71-gfea0ead,
-  * >=tarantool/shard-1.1-91-gfa88bf8 (but < 2.0) (optional),
+  * >=tarantool/shard-1.1-91-gfa88bf8 (but < 2.0) or >=tarantool/shard-2.1
+    (when will be released) (optional),
   * lrexlib-pcre2 or lrexlib-pcre (optional).
 * For test (additionally to 'for use'):
   * python 2.7,
   * virtualenv,
   * luacheck,
-  * >=tarantool/shard-1.1-92-gec1a27e (but < 2.0),
+  * >=tarantool/shard-1.1-92-gec1a27e (but < 2.0) or >=tarantool/shard-2.1
+    (when will be released),
   * >=tarantool/avro-schema-2.2.2-4-g1145e3e.
 * For building apidoc (additionally to 'for use'):
   * ldoc.

graphql/accessor_shard.lua

@@ -2,22 +2,30 @@
 --- (@{accessor_general}) behaves as shard accessor and provides the
 --- `accessor_shard.new` function to create a new shard data accessor instance.
 
+local json = require('json')
 local shard = require('shard')
 local accessor_general = require('graphql.accessor_general')
 
 local accessor_shard = {}
 
 local LIMIT = 100000 -- XXX: we need to raise an error when a limit reached
 
+local function shard_check_error(func_name, result, err)
+    if result ~= nil then return end
+    error(('%s: %s'):format(func_name, json.encode(err)))
+end
+
 -- Check whether a collection (it is sharded space for that accessor) exists.
 local function is_collection_exists(collection_name)
+    local func_name = 'accessor_shard.is_collection_exists'
     local exists
     for _, zone in ipairs(shard.shards) do
         for _, node in ipairs(zone) do
-            local cur = shard:space_call(collection_name, node,
+            local cur, err = shard:space_call(collection_name, node,
                 function(space_obj)
                     return space_obj ~= nil
                 end)
+            shard_check_error(func_name, cur, err)
             assert(exists == nil or cur == exists,
                 ('space "%s" exists on some shards, ' ..
                 'but does not on others'):format(collection_name))
@@ -31,13 +39,15 @@ end
 --- determining whether the index exists within a shard cluster is
 --- not-so-trivial as for local spaces.
 local function is_index_exists(collection_name, index_name)
+    local func_name = 'accessor_shard.is_index_exists'
     local exists
     for _, zone in ipairs(shard.shards) do
         for _, node in ipairs(zone) do
-            local cur = shard:space_call(collection_name, node,
+            local cur, err = shard:space_call(collection_name, node,
                 function(space_obj)
                     return space_obj.index[index_name] ~= nil
                 end)
+            shard_check_error(func_name, cur, err)
             assert(exists == nil or cur == exists,
                 ('index "%s" of space "%s" exists on some shards, ' ..
                 'but does not on others'):format(index_name, collection_name))
@@ -57,10 +67,12 @@ local function get_index(collection_name, index_name)
     local index = setmetatable({}, {
         __index = {
             pairs = function(self, value, opts)
+                local func_name = 'accessor_shard.get_index.<index>.pairs'
                 local opts = opts or {}
                 opts.limit = opts.limit or LIMIT
-                local tuples = shard:secondary_select(collection_name,
+                local tuples, err = shard:secondary_select(collection_name,
                     index_name, opts, value, 0)
+                shard_check_error(func_name, tuples, err)
                 local cur = 1
                 local function gen()
                     if cur > #tuples then return nil end

test/common/limit_result.test.lua

@@ -1,46 +1,19 @@
 #!/usr/bin/env tarantool
-local multirunner = require('multirunner')
-local data = require('test_data_user_order')
-local test_run = require('test_run').new()
-local tap = require('tap')
-local graphql = require('graphql')
 
-box.cfg({})
-local test = tap.test('result cnt')
-test:plan(6)
+local fio = require('fio')
 
 -- require in-repo version of graphql/ sources despite current working directory
-local fio = require('fio')
 package.path = fio.abspath(debug.getinfo(1).source:match("@?(.*/)")
     :gsub('/./', '/'):gsub('/+$', '')) .. '/../../?.lua' .. ';' .. package.path
 
-local function run(setup_name, shard)
-    print(setup_name)
-    local accessor_class
-    local virtbox
-    -- SHARD
-    if shard ~= nil then
-        accessor_class = graphql.accessor_shard
-        virtbox = shard
-    else
-        accessor_class = graphql.accessor_space
-        virtbox = box.space
-    end
-    local accessor = accessor_class.new({
-        schemas = data.meta.schemas,
-        collections = data.meta.collections,
-        service_fields = data.meta.service_fields,
-        indexes = data.meta.indexes,
-        resulting_object_cnt_max = 3,
-        fetched_object_cnt_max = 5
-    })
+local tap = require('tap')
+local utils = require('test.utils')
+local testdata = require('test.common.lua.test_data_user_order')
+
+local function run_queries(gql_wrapper)
+    local test = tap.test('result cnt')
+    test:plan(2)
 
-    local gql_wrapper = graphql.new({
-        schemas = data.meta.schemas,
-        collections = data.meta.collections,
-        accessor = accessor,
-    })
-    data.fill_test_data(virtbox)
     local query = [[
         query object_result_max($user_id: Int, $description: String) {
             user_collection(id: $user_id) {
@@ -75,12 +48,17 @@ local function run(setup_name, shard)
               'count%[6%] exceeds limit%[5%] %(`fetched_object_cnt_max`',
               'resulting_object_cnt_max test')
 
-
+    assert(test:check(), 'check plan')
 end
 
-multirunner.run(test_run,
-                data.init_spaces,
-                data.drop_spaces,
-                run)
+box.cfg({})
+
+utils.run_testdata(testdata, {
+    run_queries = run_queries,
+    graphql_opts = {
+        resulting_object_cnt_max = 3,
+        fetched_object_cnt_max = 5,
+    }
+})
 
-os.exit(test:check() == true and 0 or 1)
+os.exit()

test/common/lua/multirunner.lua

@@ -58,6 +58,8 @@ local CONFS = {
 local initialized = false
 
 local function init_shard(test_run, servers, config, use_tcp)
+    assert(initialized == false)
+
     local suite = 'common'
     local uris = test_run:create_cluster(servers, suite)
 
@@ -70,17 +72,10 @@ local function init_shard(test_run, servers, config, use_tcp)
         end
     end
 
-    -- XXX: for now we always use one shard configuration (a first one),
-    -- because it is unclear how to reload shard module with an another
-    -- configuration; the another way is use several test configurations, but
-    -- it seems to be non-working in 'core = app' tests with current test-run.
-    -- Ways to better handle this is subject to future digging.
     local shard = require('shard')
-    if not initialized then
-        shard.init(config)
-        initialized = true
-    end
+    shard.init(config)
     shard.wait_connection()
+    initialized = true
     return shard
 end
 
@@ -160,31 +155,6 @@ local function run_conf(conf_name, opts)
     return result
 end
 
--- Run tests on multiple accessors and configurations.
--- Feel free to add more configurations.
-local function run(test_run, init_function, cleanup_function, workload)
-    -- ensure stable order
-    local names = {}
-    for conf_name, conf in pairs(CONFS) do
-        -- allow to run w/o test-run
-        if test_run ~= nil or conf.type == 'space' then
-            names[#names + 1] = conf_name
-        end
-    end
-    table.sort(names)
-
-    for _, conf_name in ipairs(names) do
-        run_conf(conf_name, {
-            test_run = test_run,
-            init_function = init_function,
-            cleanup_function = cleanup_function,
-            workload = workload,
-            servers = nil,
-            use_tcp = false,
-        })
-    end
-end
-
 local function get_conf(conf_name)
     local conf = CONFS[conf_name]
     assert(conf ~= nil)
@@ -193,6 +163,5 @@ end
 
 return {
     run_conf = run_conf,
-    run = run,
     get_conf = get_conf,
 }

test/common/lua/test_data_nested_record.lua

@@ -2,6 +2,7 @@
 -- https://github.com/tarantool/graphql/issues/46
 -- https://github.com/tarantool/graphql/issues/49
 
+local tap = require('tap')
 local json = require('json')
 local yaml = require('yaml')
 local utils = require('graphql.utils')
@@ -79,7 +80,8 @@ function testdata.fill_test_data(virtbox)
 end
 
 function testdata.run_queries(gql_wrapper)
-    local output = ''
+    local test = tap.test('nested_record')
+    test:plan(1)
 
     local query_1 = [[
         query getUserByUid($uid: Long) {
@@ -101,12 +103,20 @@ function testdata.run_queries(gql_wrapper)
         return gql_query_1:execute(variables_1)
     end)
 
-    output = output .. 'RUN 1 {{{\n' ..
-        (('QUERY\n%s'):format(query_1:rstrip())) .. '\n' ..
-        (('VARIABLES\n%s'):format(yaml.encode(variables_1))) .. '\n' ..
-        (('RESULT\n%s'):format(yaml.encode(result_1))) .. '\n' ..
-        '}}}\n'
+    local exp_result_1 = yaml.decode(([[
+        ---
+        user:
+        - uid: 5
+          p1: p1 5
+          p2: p2 5
+          nested:
+            x: 1005
+            y: 2005
+    ]]):strip())
 
+    test:is_deeply(result_1, exp_result_1, '1')
+
+    -- XXX: uncomment when arguments for nested records will be supported
     --[=[
     local query_2 = [[
         query getUserByX($x: Long) {
@@ -128,14 +138,21 @@ function testdata.run_queries(gql_wrapper)
         return gql_query_2:execute(variables_2)
     end)
 
-    output = output .. 'RUN 2 {{{\n' ..
-        (('QUERY\n%s'):format(query_2:rstrip())) .. '\n' ..
-        (('VARIABLES\n%s'):format(yaml.encode(variables_2))) .. '\n' ..
-        (('RESULT\n%s'):format(yaml.encode(result_2))) .. '\n' ..
-        '}}}\n'
+    local exp_result_2 = yaml.decode(([[
+        ---
+        user:
+        - uid: 5
+          p1: p1 5
+          p2: p2 5
+          nested:
+            x: 1005
+            y: 2005
+    ]]):strip())
+
+    test:is_deeply(result_2, exp_result_2, '2')
     ]=]--
 
-    return output:rstrip()
+    assert(test:check(), 'check plan')
 end
 
 return testdata