Support avro-schema-3* (updated tests)

Totktonada · Totktonada · commit 9d342b988861 · 2018-05-26T09:43:35.000+02:00
Changed only tests where a data layout is different between avro-schema-2* and avro-schema-3*. The avro_refs test triggers a flatten bug in avro-schema-2.3.2, so the data flattened manually in the case. The bug is not reported, because it is recomended to move to avro-schema-3* to use record*. Fixes #150.
diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,8 @@ dist: trusty
 env:
     - SHARD_VERSION=1.2 AVRO_SCHEMA=2.3.2
     - SHARD_VERSION=2.1 AVRO_SCHEMA=2.3.2
+    - SHARD_VERSION=1.2 AVRO_SCHEMA=3.0.0
+    - SHARD_VERSION=2.1 AVRO_SCHEMA=3.0.0
 
 branches:
   only:
diff --git a/README.md b/README.md
@@ -155,7 +155,7 @@ make test
 * For use:
   * tarantool,
   * lulpeg,
-  * >=tarantool/avro-schema-2.0-71-gfea0ead (but < 3.0.0),
+  * >=tarantool/avro-schema-2.0-71-gfea0ead,
   * >=tarantool/shard-1.1-91-gfa88bf8 (but < 2.0) or
     >=tarantool/shard-2.1-0-g0a7d98f (optional),
   * lrexlib-pcre2 or lrexlib-pcre (optional),
@@ -164,7 +164,7 @@ make test
   * python 2.7,
   * virtualenv,
   * luacheck,
-  * >=tarantool/avro-schema-2.2.2-4-g1145e3e (but < 3.0.0),
+  * >=tarantool/avro-schema-2.2.2-4-g1145e3e,
   * >=tarantool/shard-1.1-92-gec1a27e (but < 2.0) or
     >=tarantool/shard-2.1-0-g0a7d98f,
   * tarantool/http.
diff --git a/test/common/multirunner.lua b/test/common/multirunner.lua
@@ -110,13 +110,17 @@ local function run_conf(conf_name, opts)
 
     local test_run = opts.test_run
     local init_function = opts.init_function
+    local init_function_params = opts.init_function_params or {}
     local cleanup_function = opts.cleanup_function
+    local cleanup_function_params = opts.cleanup_function_params or {}
     local workload = opts.workload
     local servers = opts.servers or servers -- prefer opts.servers
     local use_tcp = opts.use_tcp or false
 
     assert(init_function ~= nil)
+    assert(type(init_function_params) == 'table')
     assert(cleanup_function ~= nil)
+    assert(type(cleanup_function_params) == 'table')
     assert(workload ~= nil)
     assert(use_tcp ~= nil)
     if conf_type == 'shard' then
@@ -127,9 +131,9 @@ local function run_conf(conf_name, opts)
     local result
 
     if conf_type == 'space' then
-        init_function()
+        init_function(unpack(init_function_params))
         result = workload(conf_name, nil)
-        cleanup_function()
+        cleanup_function(unpack(cleanup_function_params))
     elseif conf_type == 'shard' then
         -- convert functions to string, so, that it can be executed on shards
         local init_script = string.dump(init_function)
@@ -139,14 +143,14 @@ local function run_conf(conf_name, opts)
 
         for_each_server(shard, function(uri)
             local c = net_box.connect(uri)
-            c:eval(init_script)
+            c:eval(init_script, init_function_params)
         end)
 
         result = workload(conf_name, shard)
 
         for_each_server(shard, function(uri)
             local c = net_box.connect(uri)
-            c:eval(cleanup_script)
+            c:eval(cleanup_script, cleanup_function_params)
         end)
 
         shard_cleanup(test_run, servers)
diff --git a/test/extra/to_avro_nested.test.lua b/test/extra/to_avro_nested.test.lua
@@ -17,7 +17,7 @@ box.cfg{wal_mode="none"}
 test:plan(4)
 
 data.init_spaces()
-data.fill_test_data(box.space)
+data.fill_test_data(box.space, data.meta)
 
 local accessor = graphql.accessor_space.new({
     schemas = data.meta.schemas,
diff --git a/test/extra/to_avro_nullable.test.lua b/test/extra/to_avro_nullable.test.lua
@@ -16,8 +16,8 @@ box.cfg{wal_mode="none"}
 test:plan(4)
 
 testdata.init_spaces()
-testdata.fill_test_data()
 local meta = testdata.get_test_metadata()
+testdata.fill_test_data(box.space, meta)
 
 local accessor = graphql.accessor_space.new({
     schemas = meta.schemas,
diff --git a/test/space/nested_args.test.lua b/test/space/nested_args.test.lua
@@ -11,6 +11,7 @@ local tap = require('tap')
 local yaml = require('yaml')
 local graphql = require('graphql')
 local utils = require('graphql.utils')
+local test_utils = require('test.utils')
 local common_testdata = require('test.testdata.common_testdata')
 local emails_testdata = require('test.testdata.nullable_1_1_conn_testdata')
 
@@ -23,12 +24,16 @@ common_testdata.init_spaces()
 emails_testdata.init_spaces()
 
 -- upload test data
-common_testdata.fill_test_data()
-emails_testdata.fill_test_data()
+local common_meta = common_testdata.meta or common_testdata.get_test_metadata()
+local emails_meta = emails_testdata.meta or emails_testdata.get_test_metadata()
+common_testdata.fill_test_data(box.space, common_meta)
+emails_testdata.fill_test_data(box.space, emails_meta)
+
+local avro_version = test_utils.major_avro_schema_version()
 
 local LOCALPART_FN = 1
 local DOMAIN_FN = 2
-local BODY_FN = 7
+local BODY_FN = avro_version == 3 and 5 or 7
 
 for _, tuple in box.space.email:pairs() do
     local body = tuple[BODY_FN]
diff --git a/test/space/server.test.lua b/test/space/server.test.lua
@@ -18,7 +18,8 @@ box.cfg{background = false}
 testdata.init_spaces()
 
 -- upload test data
-testdata.fill_test_data()
+local meta = testdata.meta or testdata.get_test_metadata()
+testdata.fill_test_data(box.space, meta)
 
 -- acquire metadata
 local metadata = testdata.get_test_metadata()
diff --git a/test/space/unflatten_tuple.test.lua b/test/space/unflatten_tuple.test.lua
@@ -21,16 +21,16 @@ local testdata = require('test.testdata.common_testdata')
 box.cfg{background = false}
 testdata.init_spaces()
 
--- upload test data
-testdata.fill_test_data()
-
 -- acquire metadata
 local metadata = testdata.get_test_metadata()
 local schemas = metadata.schemas
 local collections = metadata.collections
 local service_fields = metadata.service_fields
 local indexes = metadata.indexes
 
+-- upload test data
+testdata.fill_test_data(box.space, metadata)
+
 -- build accessor and graphql schemas
 -- ----------------------------------
 
diff --git a/test/testdata/avro_refs_testdata.lua b/test/testdata/avro_refs_testdata.lua
@@ -8,6 +8,7 @@ local tap = require('tap')
 local json = require('json')
 local yaml = require('yaml')
 local utils = require('graphql.utils')
+local test_utils = require('test.utils')
 
 local testdata = {}
 
@@ -94,25 +95,51 @@ function testdata.drop_spaces()
     box.space.foo:drop()
 end
 
-function testdata.fill_test_data(virtbox)
-    local NULL_T = 0
-    local VALUE_T = 1
-
+function testdata.fill_test_data(virtbox, meta)
     local x = 1000
     local y = 2000
     local a = 3000
     local b = 4000
 
-    -- non-null bar, baz and its refs
-    virtbox.foo:replace({1,                       -- id
-        x, y, x, y, VALUE_T, {x, y},              -- bar & refs
-        VALUE_T, {a, b}, a, b, VALUE_T, {a, b},   -- baz & refs
-    })
-    -- null in nullable bar, baz refs
-    virtbox.foo:replace({2,                       -- id
-        x, y, x, y, NULL_T, box.NULL,             -- bar & refs
-        NULL_T, box.NULL, a, b, NULL_T, box.NULL, -- baz & refs
-    })
+    local avro_version = test_utils.major_avro_schema_version()
+
+    if avro_version == 3 then
+        -- non-null bar, baz and its refs
+        test_utils.replace_object(virtbox, meta, 'foo', {
+            id = 1,
+            bar = {x = x, y = y},
+            bar_ref = {x = x, y = y},
+            bar_nref = {x = x, y = y},
+            baz = {x = a, y = b},
+            baz_ref = {x = a, y = b},
+            baz_nref = {x = a, y = b},
+        })
+        -- null in nullable bar, baz refs
+        test_utils.replace_object(virtbox, meta, 'foo', {
+            id = 2,
+            bar = {x = x, y = y},
+            bar_ref = {x = x, y = y},
+            bar_nref = box.NULL,
+            baz = box.NULL,
+            baz_ref = {x = a, y = b},
+            baz_nref = box.NULL,
+        })
+    else
+        -- flatten does not work properly in the case of avro-schema-2.3.2
+        local NULL_T = 0
+        local VALUE_T = 1
+
+        -- non-null bar, baz and its refs
+        virtbox.foo:replace({1,                       -- id
+            x, y, x, y, VALUE_T, {x, y},              -- bar & refs
+            VALUE_T, {a, b}, a, b, VALUE_T, {a, b},   -- baz & refs
+        })
+        -- null in nullable bar, baz refs
+        virtbox.foo:replace({2,                       -- id
+            x, y, x, y, NULL_T, box.NULL,             -- bar & refs
+            NULL_T, box.NULL, a, b, NULL_T, box.NULL, -- baz & refs
+        })
+    end
 end
 
 function testdata.run_queries(gql_wrapper)
diff --git a/test/testdata/common_testdata.lua b/test/testdata/common_testdata.lua
@@ -151,41 +151,88 @@ function common_testdata.init_spaces()
     end)
 end
 
-function common_testdata.fill_test_data(shard)
-    local shard = shard or box.space
-
-    local NULL_T = 0
-    local STRING_T = 1
-
-    shard.user_collection:replace(
-        {1827767717, 'user_id_1', 'Ivan', STRING_T, 'Ivanovich', 'Ivanov'})
-    shard.user_collection:replace(
-        {1827767717, 'user_id_2', 'Vasiliy', NULL_T, box.NULL, 'Pupkin'})
-    shard.order_collection:replace(
-        {'order_id_1', 'user_id_1', 'first order of Ivan', 0, 0, true})
-    shard.order_collection:replace(
-        {'order_id_2', 'user_id_1', 'second order of Ivan', 0, 0, false})
-    shard.order_collection:replace(
-        {'order_id_3', 'user_id_2', 'first order of Vasiliy', 0, 0, true})
+function common_testdata.fill_test_data(virtbox, meta)
+    test_utils.replace_object(virtbox, meta, 'user_collection', {
+        user_id = 'user_id_1',
+        first_name = 'Ivan',
+        middle_name = 'Ivanovich',
+        last_name = 'Ivanov',
+    }, {
+        1827767717,
+    })
+    test_utils.replace_object(virtbox, meta, 'user_collection', {
+        user_id = 'user_id_2',
+        first_name = 'Vasiliy',
+        middle_name = box.NULL,
+        last_name = 'Pupkin',
+    }, {
+        1827767717,
+    })
+
+    test_utils.replace_object(virtbox, meta, 'order_collection', {
+        order_id = 'order_id_1',
+        user_id = 'user_id_1',
+        description = 'first order of Ivan',
+        price = 0,
+        discount = 0,
+        in_stock = true,
+    })
+    test_utils.replace_object(virtbox, meta, 'order_collection', {
+        order_id = 'order_id_2',
+        user_id = 'user_id_1',
+        description = 'second order of Ivan',
+        price = 0,
+        discount = 0,
+        in_stock = false,
+    })
+    test_utils.replace_object(virtbox, meta, 'order_collection', {
+        order_id = 'order_id_3',
+        user_id = 'user_id_2',
+        description = 'first order of Vasiliy',
+        price = 0,
+        discount = 0,
+        in_stock = true,
+    })
 
     for i = 3, 100 do
         local s = tostring(i)
-        shard.user_collection:replace(
-            {1827767717, 'user_id_' .. s, 'first name ' .. s, NULL_T, box.NULL,
-            'last name ' .. s})
+        test_utils.replace_object(virtbox, meta, 'user_collection', {
+            user_id = 'user_id_' .. s,
+            first_name = 'first name ' .. s,
+            middle_name = box.NULL,
+            last_name = 'last name ' .. s,
+        }, {
+            1827767717,
+        })
         for j = (4 + (i - 3) * 40), (4 + (i - 2) * 40) - 1 do
             local t = tostring(j)
-            shard.order_collection:replace({
-                'order_id_' .. t, 'user_id_' .. s, 'order of user ' .. s,
-                i + j / 3, i + j / 3, j % 2 == 1,
+            test_utils.replace_object(virtbox, meta, 'order_collection', {
+                order_id = 'order_id_' .. t,
+                user_id = 'user_id_' .. s,
+                description = 'order of user ' .. s,
+                price = i + j / 3,
+                discount = i + j / 3,
+                in_stock = j % 2 == 1,
             })
         end
     end
 
-    shard.user_collection:replace(
-        {1827767717, 'user_id_101', 'Иван', STRING_T, 'Иванович', 'Иванов'})
-    shard.order_collection:replace(
-        {'order_id_3924', 'user_id_101', 'Покупка 3924', 0, 0, true})
+    test_utils.replace_object(virtbox, meta, 'user_collection', {
+        user_id = 'user_id_101',
+        first_name = 'Иван',
+        middle_name = 'Иванович',
+        last_name = 'Иванов',
+    }, {
+        1827767717,
+    })
+    test_utils.replace_object(virtbox, meta, 'order_collection', {
+        order_id = 'order_id_3924',
+        user_id = 'user_id_101',
+        description = 'Покупка 3924',
+        price = 0,
+        discount = 0,
+        in_stock = true,
+    })
 end
 
 function common_testdata.drop_spaces()
diff --git a/test/testdata/nested_record_testdata.lua b/test/testdata/nested_record_testdata.lua
@@ -6,6 +6,7 @@ local tap = require('tap')
 local json = require('json')
 local yaml = require('yaml')
 local utils = require('graphql.utils')
+local test_utils = require('test.utils')
 
 local testdata = {}
 
@@ -68,14 +69,22 @@ function testdata.drop_spaces()
     box.space.user:drop()
 end
 
-function testdata.fill_test_data(virtbox)
+function testdata.fill_test_data(virtbox, meta)
     for i = 1, 15 do
         local uid = i
         local p1 = 'p1 ' .. tostring(i)
         local p2 = 'p2 ' .. tostring(i)
         local x = 1000 + i
         local y = 2000 + i
-        virtbox.user:replace({uid, p1, p2, x, y})
+        test_utils.replace_object(virtbox, meta, 'user', {
+            uid = uid,
+            p1 = p1,
+            p2 = p2,
+            nested = {
+                x = x,
+                y = y,
+            }
+        })
     end
 end
 
diff --git a/test/testdata/nullable_1_1_conn_testdata.lua b/test/testdata/nullable_1_1_conn_testdata.lua
diff --git a/test/testdata/nullable_index_testdata.lua b/test/testdata/nullable_index_testdata.lua
diff --git a/test/utils.lua b/test/utils.lua
