Rework resulting object counting

Totktonada · Totktonada · commit 65b32d2907c8 · 2018-08-22T04:52:11.000+03:00
diff --git a/graphql/accessor_general.lua b/graphql/accessor_general.lua
@@ -901,10 +901,6 @@ local function process_tuple(self, state, tuple, opts)
         return true -- skip pivot item too
     end
 
-    -- XXX: implement retired flag for invoke resolve and don't save-restore
-    -- resulting_object_cnt
-    local saved_resulting_object_cnt = qcontext.statistics.resulting_object_cnt
-
     -- make subrequests if needed
     for k, v in pairs(filter) do
         if obj[k] == nil then
@@ -918,8 +914,6 @@ local function process_tuple(self, state, tuple, opts)
         end
     end
 
-    qcontext.statistics.resulting_object_cnt = saved_resulting_object_cnt
-
     -- filter out non-matching objects
     local match = utils.is_subtable(obj, filter) and
         match_using_re(obj, pcre)
@@ -934,9 +928,11 @@ local function process_tuple(self, state, tuple, opts)
     state.objs[#state.objs + 1] = obj
     state.count = state.count + 1
 
-    qcontext.statistics:objects_retired({
-        retired_objects_cnt = 1,
-    })
+    if not opts.is_hidden then
+        qcontext.statistics:objects_retired({
+            retired_objects_cnt = 1,
+        })
+    end
 
     if limit ~= nil and state.count >= limit then
         return false
@@ -1072,6 +1068,7 @@ local function prepare_select_internal(self, collection_name, from, filter,
         default_unflatten_tuple = default_unflatten_tuple,
         pcre = args.pcre,
         resolveField = extra.resolveField,
+        is_hidden = extra.is_hidden,
     }
 
     -- assert that connection constraint applied only to objects got from the
diff --git a/graphql/bfs_executor.lua b/graphql/bfs_executor.lua
@@ -130,6 +130,7 @@
 ---                                 do_filter = <boolean>,
 ---                                 pivot_filter = <table>,
 ---                                 resolveField = <function>,
+---                                 is_hidden = <boolean>,
 ---                             },
 ---                             collection_name = <string>,
 ---                             from = <...>,
@@ -305,7 +306,7 @@ local function generate_cache_only_request(prepared_resolve, field_type,
     -- cache_only_prepared_resolve is the same as prepared_resolve, but it does
     -- not require fetching connected objects to fetch and return this one
     local cache_only_prepared_resolve = field_type.prepare_resolve(
-        object, local_args, info)
+        object, local_args, info, {is_hidden = true})
     local cache_only_selections = filters_to_selections(
         bare_inner_type, filter)
     return {
@@ -451,6 +452,7 @@ end
 ---
 --- @tparam table qcontext the following options:
 ---
+--- * is_item_cache_only
 --- * qcontext: query-local storage for various purposes
 ---
 --- @treturn table `prepared` of the following format:
@@ -478,6 +480,7 @@ end
 local function filter_object(object, object_type, selections, context, opts)
     local opts = opts or {}
     local qcontext = opts.qcontext
+    local is_item_cache_only = opts.is_item_cache_only or false
 
     local nullable_object_type = core_types.nullable(object_type)
 
@@ -530,7 +533,7 @@ local function filter_object(object, object_type, selections, context, opts)
 
         if field_type.prepare_resolve then
             local prepared_resolve = field_type.prepare_resolve(object, args,
-                info)
+                info, {is_hidden = is_item_cache_only})
 
             fields_info[field_name] = {
                 is_list = is_list,
@@ -577,6 +580,7 @@ local function filter_object_list(object_list, object_type, selections, context,
         opts)
     local opts = opts or {}
     local qcontext = opts.qcontext
+    local is_item_cache_only = opts.is_item_cache_only or false
 
     local nullable_object_type = core_types.nullable(object_type)
     assert(nullable_object_type.__type == 'List')
@@ -602,7 +606,7 @@ local function filter_object_list(object_list, object_type, selections, context,
 
     for _, object in ipairs(object_list or {}) do
         local prepared = filter_object(object, object_type, selections, context,
-            {qcontext = qcontext})
+            {qcontext = qcontext, is_item_cache_only = is_item_cache_only})
         local cache_only_prepared_object = prepared.cache_only_prepared_object
         local prepared_object = prepared.prepared_object
         table.insert(cache_only_prepared_object_list,
@@ -634,29 +638,7 @@ local function invoke_resolve(prepared_object, context, opts)
         if field_info.prepared_resolve.is_calculated then
             object_or_list = field_info.prepared_resolve.objs
         else
-            -- XXX: implement retired flag for invoke resolve and don't
-            -- save-restore resulting_object_cnt
-            local prepared_select
-            local extra
-            local select_state
-            local saved_resulting_object_cnt
-            if is_item_cache_only then
-                -- prevent resulting_object_cnt from being affected by cache
-                -- only requests
-                prepared_select = field_info.prepared_resolve.prepared_select
-                extra = prepared_select.extra
-                select_state = prepared_select.select_state
-                local qcontext = extra.qcontext
-                saved_resulting_object_cnt =
-                    qcontext.statistics.resulting_object_cnt
-            end
             object_or_list, object_type = field_info.prepared_resolve:invoke()
-            if saved_resulting_object_cnt then
-                extra.qcontext.statistics.resulting_object_cnt =
-                    saved_resulting_object_cnt
-                select_state.qcontext.statistics.resulting_object_cnt =
-                    saved_resulting_object_cnt
-            end
         end
         object_type = object_type or field_info.kind
         local selections = field_info.selections
@@ -667,7 +649,7 @@ local function invoke_resolve(prepared_object, context, opts)
         if field_info.is_list then
             local child_prepared_list = filter_object_list(
                 object_or_list, object_type, selections, context,
-                {qcontext = qcontext})
+                {qcontext = qcontext, is_item_cache_only = is_item_cache_only})
             -- don't perform construction for cache_only objects
             local child_cache_only_prepared_object_list =
                 child_prepared_list.cache_only_prepared_object_list
@@ -697,7 +679,8 @@ local function invoke_resolve(prepared_object, context, opts)
             end
         else
             local child_prepared = filter_object(object_or_list,
-                object_type, selections, context, {qcontext = qcontext})
+                object_type, selections, context, {qcontext = qcontext,
+                is_item_cache_only = is_item_cache_only})
             -- don't perform construction for cache_only objects
             local child_cache_only_prepared_object =
                 child_prepared.cache_only_prepared_object
diff --git a/graphql/convert_schema/resolve.lua b/graphql/convert_schema/resolve.lua
@@ -121,8 +121,8 @@ function resolve.gen_resolve_function(collection_name, connection,
                 ('performing a subrequest by the non-existent ' ..
                 'field "%s" of the collection "%s"'):format(field_name,
                 c.destination_collection))
-            -- XXX: implement retired flag for invoke resolve and don't
-            -- save-restore resulting_object_cnt
+            local opts = table.copy(opts or {})
+            opts.is_hidden = true
             return bare_destination_type.fields[field_name].resolve(
                 object, filter, info, opts)
         end
@@ -132,9 +132,9 @@ function resolve.gen_resolve_function(collection_name, connection,
     -- genResolveField, arguments, accessor
     return function(parent, args_instance, info, opts)
         local opts = opts or {}
-        assert(type(opts) == 'table',
-            'opts must be nil or a table, got ' .. type(opts))
-        -- no opts for now
+        check(opts, 'opts', 'table')
+        local is_hidden = opts.is_hidden or false
+        check(is_hidden, 'is_hidden', 'boolean')
 
         local from = gen_from_parameter(collection_name, parent, c)
 
@@ -170,6 +170,7 @@ function resolve.gen_resolve_function(collection_name, connection,
             resolveField = resolveField, -- for subrequests
             extra_args = {},
             exp_tuple_count = exp_tuple_count,
+            is_hidden = opts.is_hidden,
         }
 
         -- object_args_instance will be passed to 'filter'
@@ -242,7 +243,12 @@ function resolve.gen_resolve_function_multihead(collection_name, connection,
         return res_var, var_idx, box_field_name
     end
 
-    return function(parent, _, info)
+    return function(parent, _, info, opts)
+        local opts = opts or {}
+        check(opts, 'opts', 'table')
+        local is_hidden = opts.is_hidden or false
+        check(is_hidden, 'is_hidden', 'boolean')
+
         -- If a parent object does not have all source fields (for any of
         -- variants) non-null then we do not resolve variant and just return
         -- box.NULL.
@@ -275,16 +281,16 @@ function resolve.gen_resolve_function_multihead(collection_name, connection,
             name = c.name,
             destination_collection = v.destination_collection,
         }
-        local opts = {
+        local gen_opts = {
             disable_dangling_check = disable_dangling_check,
             gen_prepare = gen_prepare,
         }
         -- XXX: generate a function (using gen_resolve_function) for each
         -- variant once at schema generation time
         if gen_prepare then
             local result = resolve.gen_resolve_function(collection_name,
-                quazi_connection, destination_type, {}, accessor, opts)(
-                parent, {}, info)
+                quazi_connection, destination_type, {}, accessor, gen_opts)(
+                parent, {}, info, opts)
             result.connection = quazi_connection
             result.invoke = function(prepared_resolve)
                 local result = invoke_resolve(prepared_resolve)
@@ -294,8 +300,8 @@ function resolve.gen_resolve_function_multihead(collection_name, connection,
             return result
         else
             local result = resolve.gen_resolve_function(collection_name,
-                quazi_connection, destination_type, {}, accessor, opts)(
-                parent, {}, info)
+                quazi_connection, destination_type, {}, accessor, gen_opts)(
+                parent, {}, info, opts)
             -- This 'wrapping' is needed because we use 'select' on 'collection'
             -- GraphQL type and the result of the resolve function must be in
             -- {'collection_name': {result}} format to be avro-valid.
