Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

perf(plugins-iterator): remove unneeded tail-calls and optimize lookup_cfg #13511

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −28
Draft

perf(plugins-iterator): remove unneeded tail-calls and optimize lookup_cfg #13511

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 29 additions & 28 deletions kong/runloop/plugins_iterator.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ local pcall = pcall
local subsystem = ngx.config.subsystem
local pairs = pairs
local ipairs = ipairs
local format = string.format
local fetch_table = tablepool.fetch
local release_table = tablepool.release
local uuid = require("kong.tools.uuid").uuid
Expand Down Expand Up @@ -82,7 +81,7 @@ local PluginsIterator = {}
-- @tparam string|nil consumer_id The consumer identifier. If `nil`, an empty string is used.
-- @treturn string The compound key, in the format `route_id:service_id:consumer_id`.
local function build_compound_key(route_id, service_id, consumer_id)
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just trying to understand the code and new to Lua.
Is there any reason to keep this function if we are not using it and the scope is local as well ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SauravPrakash98 it is used during building new plugin iterator, just not used on request time.

return format("%s:%s:%s", route_id or "", service_id or "", consumer_id or "")
return (route_id or "") .. ":" .. (service_id or "") .. ":" .. (consumer_id or "")
end


Expand Down Expand Up @@ -118,7 +117,8 @@ end


local function get_loaded_plugins()
return assert(kong.db.plugins:get_handlers())
local loaded_plugins = assert(kong.db.plugins:get_handlers())
return loaded_plugins
end


Expand Down Expand Up @@ -208,53 +208,52 @@ end
-- @tparam string|nil consumer_id The consumer identifier.
-- @return any|nil The configuration corresponding to the best matching combination, or 'nil' if no configuration is found.
local function lookup_cfg(combos, route_id, service_id, consumer_id)
-- Use the build_compound_key function to create an index for the 'combos' table
if route_id and service_id and consumer_id then
local key = build_compound_key(route_id, service_id, consumer_id)
if combos[key] then
return combos[key]
local cfg = combos[route_id .. ":" .. service_id .. ":" .. consumer_id]
if cfg then
return cfg
end
end

if route_id and consumer_id then
local key = build_compound_key(route_id, nil, consumer_id)
if combos[key] then
return combos[key]
local cfg = combos[route_id .. "::" .. consumer_id]
if cfg then
return cfg
end
end

if service_id and consumer_id then
local key = build_compound_key(nil, service_id, consumer_id)
if combos[key] then
return combos[key]
local cfg = combos[":" .. service_id .. ":" .. consumer_id]
if cfg then
return cfg
end
end

if route_id and service_id then
local key = build_compound_key(route_id, service_id, nil)
if combos[key] then
return combos[key]
local cfg = combos[route_id .. ":" .. service_id .. ":"]
if cfg then
return cfg
end
end

if consumer_id then
local key = build_compound_key(nil, nil, consumer_id)
if combos[key] then
return combos[key]
local cfg = combos["::" .. consumer_id]
if cfg then
return cfg
end
end

if route_id then
local key = build_compound_key(route_id, nil, nil)
if combos[key] then
return combos[key]
local cfg = combos[route_id .. "::"]
if cfg then
return cfg
end
end

if service_id then
local key = build_compound_key(nil, service_id, nil)
if combos[key] then
return combos[key]
local cfg = combos[":" .. service_id .. ":"]
if cfg then
return cfg
end
end

Expand Down Expand Up @@ -282,7 +281,8 @@ local function load_configuration_through_combos(ctx, combos, plugin)
local consumer_id = (not handler.no_consumer and ctx.authenticated_consumer) and ctx.authenticated_consumer.id or nil

-- Call the lookup_cfg function to get the best matching plugin configuration
return lookup_cfg(combos, route_id, service_id, consumer_id)
local cfg = lookup_cfg(combos, route_id, service_id, consumer_id)
return cfg
end


Expand All @@ -296,7 +296,7 @@ end


local function get_next_init_worker(plugins, i)
local i = i + 1
i = i + 1
local plugin = plugins[i]
if not plugin then
return nil
Expand Down Expand Up @@ -360,7 +360,8 @@ local function get_collected_iterator(self, phase, ctx)
return get_next_global_or_collected_plugin, plugins
end

return get_global_iterator(self, phase)
local iterator, invariant_state = get_global_iterator(self, phase)
return iterator, invariant_state
end


Expand Down
Loading