[TNTP-2177] Role-based model support in CRUD for single operations is provided

(cherry picked from commit 800d614aab4b49a7d2115d27d0836483dc9429f4)

Author: a1div0

CHANGELOG.md

@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+* Обеспечена поддержка ролевой модели в CRUD (https://jira.vk.team/browse/TNTP-2177)
 
 ### Fixed
 * `crud.schema` no longer returns TCF system space `_cdc_state`.

Makefile

@@ -0,0 +1,48 @@
+SHELL := /bin/bash
+
+S3_TARANTOOL_SDK_3_PATH := s3://packages/enterprise/release/linux/x86_64/3.3/tarantool-enterprise-sdk-gc64-3.3.1-0-r55.linux.x86_64.tar.gz
+S3_TARANTOOL_SDK_2_PATH := s3://packages/enterprise/release/linux/x86_64/2.11/tarantool-enterprise-sdk-gc64-2.11.6-0-r677.linux.x86_64.tar.gz
+S3_ENDPOINT_URL := $(if $(S3_ENDPOINT_URL),$(S3_ENDPOINT_URL),https://hb.vkcs.cloud)
+
+SDK_TEST := $(if $(SDK_TEST),$(SDK_TEST),sdk-3)
+
+.rocks: sdk
+	# в sdk-2 есть все нужные роки, в sdk-3 нет
+	source ./sdk-2/env.sh && \
+	tt rocks install luacheck 0.26.0 --only-server=sdk-2/rocks && \
+	tt rocks install luacov 0.13.0 --only-server=sdk-2/rocks && \
+	tt rocks install luacov-reporters 0.1.0 --only-server=sdk-2/rocks && \
+	tt rocks install metrics  1.1.0 --only-server=sdk-2/rocks && \
+	tt rocks install ddl-ee 1.8.0 --only-server=sdk-2/rocks && \
+	tt rocks install cartridge 2.15.1 --only-server=sdk-2/rocks && \
+	tt rocks install migrations-ee 1.3.1 --only-server=sdk-2/rocks && \
+	tt rocks make
+
+sdk-2:
+	aws --endpoint-url "$(S3_ENDPOINT_URL)" s3 cp "$(S3_TARANTOOL_SDK_2_PATH)" .
+	mkdir sdk-2 && tar -xvzf tarantool-enterprise-*.tar.gz -C ./sdk-2 --strip-components=1 && rm tarantool-enterprise-*.tar.gz
+
+sdk-3:
+	aws --endpoint-url "$(S3_ENDPOINT_URL)" s3 cp "$(S3_TARANTOOL_SDK_3_PATH)" .
+	mkdir sdk-3 && tar -xvzf tarantool-enterprise-*.tar.gz -C ./sdk-3 --strip-components=1 && rm tarantool-enterprise-*.tar.gz
+
+sdk: sdk-2 sdk-3
+	# в sdk-3 нет luatest
+	source sdk-3/env.sh && \
+	cp sdk-2/rocks/luatest-1.0.1-1.all.rock sdk-3/rocks/ && \
+	chmod 644 sdk-3/rocks/* && \
+	tt rocks make_manifest sdk-3/rocks
+
+lint: .rocks
+	source sdk-2/env.sh && .rocks/bin/luacheck .
+
+.PHONY: test
+test:
+	@echo "RUN TESTS WITH $(SDK_TEST)"
+	# luatest будет свой для каждого sdk
+	source $(SDK_TEST)/env.sh && \
+	tt rocks install luatest 1.0.1 --only-server=$(SDK_TEST)/rocks && \
+	.rocks/bin/luatest -v --coverage test/
+
+coverage:
+	source sdk-2/env.sh && ./.rocks/bin/luacov -r summary && cat luacov.report.out

crud/cfg.lua

@@ -157,7 +157,7 @@ local function __call(self, opts)
     })
     -- Value validation would be performed in stats checks, if required.
 
-    opts = table.deepcopy(opts) or {}
+    opts = table.deepcopy(opts or {})
     -- opts from Cartridge clusterwide configuration is read-only,
     -- but we want to work with copy anyway.
     setmetatable(opts, {})

crud/common/call.lua

@@ -1,5 +1,6 @@
 local errors = require('errors')
 
+local call_cache = require('crud.common.call_cache')
 local dev_checks = require('crud.common.dev_checks')
 local utils = require('crud.common.utils')
 local sharding_utils = require('crud.common.sharding.utils')
@@ -11,8 +12,18 @@ local BasePostprocessor = require('crud.common.map_call_cases.base_postprocessor
 
 local CallError = errors.new_class('CallError')
 
+local CALL_FUNC_NAME = 'call_on_storage'
+local CRUD_CALL_FUNC_NAME = utils.get_storage_call(CALL_FUNC_NAME)
+
+
 local call = {}
 
+local function call_on_storage(run_as_user, func_name, ...)
+    return box.session.su(run_as_user, call_cache.func_name_to_func(func_name), ...)
+end
+
+call.storage_api = {[CALL_FUNC_NAME] = call_on_storage}
+
 function call.get_vshard_call_name(mode, prefer_replica, balance)
     dev_checks('string', '?boolean', '?boolean')
 
@@ -71,11 +82,12 @@ local function wrap_vshard_err(vshard_router, err, func_name, replicaset_id, buc
     ))
 end
 
-local function retry_call_with_master_discovery(replicaset, method, ...)
+local function retry_call_with_master_discovery(replicaset, method, func_name, func_args, call_opts)
+    local func_args_ext = utils.append_array({ box.session.effective_user(), func_name }, func_args)
+
     -- In case cluster was just bootstrapped with auto master discovery,
     -- replicaset may miss master.
-
-    local resp, err = replicaset[method](replicaset, ...)
+    local resp, err = replicaset[method](replicaset, CRUD_CALL_FUNC_NAME, func_args_ext, call_opts)
 
     if err == nil then
         return resp, err
@@ -87,7 +99,7 @@ local function retry_call_with_master_discovery(replicaset, method, ...)
 
     -- Retry only once: should be enough for initial discovery,
     -- otherwise force user fix up cluster bootstrap.
-    return replicaset[method](replicaset, ...)
+    return replicaset[method](replicaset, CRUD_CALL_FUNC_NAME, func_args_ext, call_opts)
 end
 
 function call.map(vshard_router, func_name, func_args, opts)

crud/common/call_cache.lua

@@ -0,0 +1,31 @@
+local func_name_to_func_cache = {}
+
+local function func_name_to_func(func_name)
+    if func_name_to_func_cache[func_name] then
+        return func_name_to_func_cache[func_name]
+    end
+
+    local current = _G
+    for part in string.gmatch(func_name, "[^%.]+") do
+        current = rawget(current, part)
+        if current == nil then
+            error(("Function '%s' is not registered"):format(func_name))
+        end
+    end
+
+    if type(current) ~= "function" then
+        error(func_name .. " is not a function")
+    end
+
+    func_name_to_func_cache[func_name] = current
+    return current
+end
+
+local function reset()
+    func_name_to_func_cache = {}
+end
+
+return {
+    func_name_to_func = func_name_to_func,
+    reset = reset,
+}

crud/common/schema.lua

@@ -217,15 +217,16 @@ function schema.wrap_func_result(space, func, args, opts)
     opts = opts or {}
 
     local ok, func_res = pcall(func, unpack(args))
-    if not ok then
-        result.err = func_res
-        if opts.add_space_schema_hash then
-            result.space_schema_hash = get_space_schema_hash(space)
-        end
-    else
+    if ok then
         if opts.noreturn ~= true then
             result.res = filter_tuple_fields(func_res, opts.field_names)
         end
+    else
+        result.err = func_res
+        if opts.add_space_schema_hash then
+            local _, space_schema_hash = pcall(get_space_schema_hash, space)
+            result.space_schema_hash = space_schema_hash
+        end
     end
 
     if opts.fetch_latest_metadata == true then

crud/common/utils.lua

@@ -1166,18 +1166,22 @@ function utils.update_storage_call_error_description(err, func_name, replicaset_
         return nil
     end
 
-    if (err.type == 'ClientError' or err.type == 'AccessDeniedError')
+    if (err.type == 'ClientError' or err.type == 'AccessDeniedError' or err.type == 'LuajitError')
         and type(err.message) == 'string' then
         local not_defined_str = string.format("Procedure '%s' is not defined", func_name)
+        local not_registered_str = string.format("Function '%s' is not registered", func_name)
         local access_denied_str = string.format("Execute access to function '%s' is denied", func_name)
-        if err.message == not_defined_str or err.message:startswith(access_denied_str) then
+        if err.message == not_defined_str or err.message:startswith(access_denied_str)
+                or err.message:find(not_registered_str)
+                or err.message == "Procedure '_crud.call_on_storage' is not defined"
+                or err.message:startswith("Execute access to function '_crud.call_on_storage' is denied") then
             if func_name:startswith('_crud.') then
-                err = NotInitializedError:new("Function %s is not registered: " ..
+                err = NotInitializedError:new("Function '%s' is not registered: " ..
                     "crud isn't initialized on replicaset %q or crud module versions mismatch " ..
                     "between router and storage",
                     func_name, replicaset_id or "Unknown")
             else
-                err = NotInitializedError:new("Function %s is not registered", func_name)
+                err = NotInitializedError:new("Function '%s' is not registered", func_name)
             end
         end
     end
@@ -1324,4 +1328,14 @@ for k, v in pairs(require('crud.common.vshard_utils')) do
     utils[k] = v
 end
 
+function utils.append_array(array_src, array_dst)
+    if not array_dst then
+        return array_src
+    end
+
+    table.move(array_dst, 1, #array_dst, #array_src + 1, array_src)
+
+    return array_src
+end
+
 return utils

crud/count.lua

@@ -51,21 +51,21 @@ local function count_on_storage(space_name, index_id, conditions, opts)
     end
 
     local value = opts.scan_value
-
-    local filter_func, err = filters.gen_func(space, index, conditions, {
-        tarantool_iter = opts.tarantool_iter,
-        scan_condition_num = opts.scan_condition_num,
-    })
-    if err ~= nil then
-        return nil, CountError:new("Failed to generate tuples filter: %s", err)
-    end
-
+    local filter_func
     local tuples_count = 0
     local looked_up_tuples = 0
 
     for _, tuple in index:pairs(value, {iterator = opts.tarantool_iter}) do
         if tuple == nil then
             break
+        elseif not filter_func then
+            filter_func, err = filters.gen_func(space, index, conditions, {
+                tarantool_iter = opts.tarantool_iter,
+                scan_condition_num = opts.scan_condition_num,
+            })
+            if err ~= nil then
+                return nil, CountError:new("Failed to generate tuples filter: %s", err)
+            end
         end
 
         looked_up_tuples = looked_up_tuples + 1

crud/len.lua

@@ -1,6 +1,7 @@
 local checks = require('checks')
 local errors = require('errors')
 
+local call = require('crud.common.call')
 local utils = require('crud.common.utils')
 local dev_checks = require('crud.common.dev_checks')
 
@@ -60,7 +61,10 @@ function len.call(space_name, opts)
         return nil, LenError:new("Space %q doesn't exist", space_name)
     end
 
-    local results, err = vshard_router:map_callrw(CRUD_LEN_FUNC_NAME, {space_name}, opts)
+    local results, err = call.map(vshard_router, CRUD_LEN_FUNC_NAME, {space_name}, {
+        mode = 'write',
+        timeout = opts.timeout,
+    })
 
     if err ~= nil then
         return nil, LenError:new("Failed to call len on storage-side: %s", err)

crud/readview.lua

@@ -2,6 +2,7 @@ local fiber = require('fiber')
 local checks = require('checks')
 local errors = require('errors')
 
+local call = require('crud.common.call')
 local const = require('crud.common.const')
 local stash = require('crud.common.stash')
 local utils = require('crud.common.utils')
@@ -334,8 +335,15 @@ function Readview_obj.create(vshard_router, opts)
     setmetatable(readview, Readview_obj)
 
     readview._name = opts.name
-    local results, err, err_id = vshard_router:map_callrw(CRUD_OPEN_FUNC_NAME,
-        {readview._name}, {timeout = opts.timeout})
+    local results, err, err_id = call.map(
+            vshard_router,
+            CRUD_OPEN_FUNC_NAME,
+            {readview._name},
+            {
+                mode = "write",
+                timeout = opts.timeout,
+            }
+    )
     if err ~= nil then
         return nil, ReadviewError:new(
             "Failed to call readview_open_on_storage on storage-side: storage id: %s err: %s",