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

changes by bungle to refactor(router/atc): do not create new table in split_routes_and_services_by_path() #12901

Closed
wants to merge 5 commits into from
Closed

changes by bungle to refactor(router/atc): do not create new table in split_routes_and_services_by_path() #12901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0f5c08e
refactor(router/atc): optimize `split_routes_and_services_by_path()`
chronolaw Apr 18, 2024
738a06c
code clean
chronolaw Apr 19, 2024
6823dcb
small clean
chronolaw Apr 20, 2024
d49ea3b
rename idx to key to avoid confusing
chronolaw Apr 20, 2024
65adade
changes by bungle
bungle Apr 22, 2024
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
108 changes: 55 additions & 53 deletions kong/router/transform.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
local bit = require("bit")
local buffer = require("string.buffer")
local tb_new = require("table.new")
local tb_nkeys = require("table.nkeys")
local tb_clear = require("table.clear")
local uuid = require("resty.jit-uuid")
local lrucache = require("resty.lrucache")
local ipmatcher = require("resty.ipmatcher")
Expand All @@ -12,7 +12,6 @@ local type = type
local assert = assert
local pairs = pairs
local ipairs = ipairs
local tostring = tostring
local tb_insert = table.insert
local fmt = string.format
local byte = string.byte
Expand Down Expand Up @@ -670,68 +669,72 @@ end
local uuid_generator = assert(uuid.factory_v5('7f145bf9-0dce-4f91-98eb-debbce4b9f6b'))


local function sort_by_regex_or_length(path)
return is_regex_magic(path) or #path
end

-- group array-like table t to regex and length groups
local group_by_map = {}
local path_groups = {}
local function group_by_regex_or_length(t)
tb_clear(group_by_map)
tb_clear(path_groups)
local idx = 0
for _, v in ipairs(t) do
local k = is_regex_magic(v) and 0 or #v
if group_by_map[k] then
tb_insert(path_groups[group_by_map[k]], v)

-- group array-like table t by the function f, returning a table mapping from
-- the result of invoking f on one of the elements to the actual elements.
local function group_by(t, f)
local result = {}
for _, value in ipairs(t) do
local key = f(value)
if result[key] then
tb_insert(result[key], value)
else
result[key] = { value }
idx = idx + 1
group_by_map[k] = idx
path_groups[idx] = { v }
end
end
return result
return path_groups, idx
end

-- split routes into multiple routes, one for each prefix length and one for all
-- regular expressions
local function split_route_by_path_info(route_and_service, routes_and_services_split)
local original_route = route_and_service.route

if is_empty_field(original_route.paths) or #original_route.paths == 1 or
not is_null(original_route.expression) -- expression will ignore paths
then
tb_insert(routes_and_services_split, route_and_service)
return
end

-- make sure that route_and_service contains only the two expected entries, route and service
assert(tb_nkeys(route_and_service) == 1 or tb_nkeys(route_and_service) == 2)

local grouped_paths = group_by(
original_route.paths, sort_by_regex_or_length
)
for index, paths in pairs(grouped_paths) do
local cloned_route = {
route = shallow_copy(original_route),
service = route_and_service.service,
}

cloned_route.route.original_route = original_route
cloned_route.route.paths = paths
cloned_route.route.id = uuid_generator(original_route.id .. "#" .. tostring(index))
-- split routes into multiple routes,
-- one for each prefix length and one for all regular expressions
local function split_routes_and_services_by_path(routes_and_services)
local count = #routes_and_services
for i = 1, count do
local route_and_service = routes_and_services[i]
local original_route = route_and_service.route
local original_paths = original_route.paths

tb_insert(routes_and_services_split, cloned_route)
end
end
if is_empty_field(original_paths) or #original_paths == 1 or
not is_null(original_route.expression) -- expression will ignore paths
then
goto continue
end

local grouped_paths, grouped_paths_count = group_by_regex_or_length(original_paths)
if grouped_paths_count == 1 then
goto continue
end

local function split_routes_and_services_by_path(routes_and_services)
local count = #routes_and_services
local routes_and_services_split = tb_new(count, 0)
-- make sure that route_and_service contains only
-- the two expected entries, route and service
local nkeys = tb_nkeys(route_and_service)
assert(nkeys == 1 or nkeys == 2)

local original_route_id = original_route.id
local original_service = route_and_service.service

for j = 1, grouped_paths_count do
local route = shallow_copy(original_route)
-- create a new route from the original route
route.original_route = original_route
route.paths = grouped_paths[j]
route.id = uuid_generator(original_route_id .. "#" .. j)
routes_and_services[j == 1 and i or (count + j - 1)] = {
route = route,
service = original_service,
}
end

for i = 1, count do
split_route_by_path_info(routes_and_services[i], routes_and_services_split)
end
::continue::
end -- for routes_and_services

return routes_and_services_split
return routes_and_services
end


Expand All @@ -753,4 +756,3 @@ return {

split_routes_and_services_by_path = split_routes_and_services_by_path,
}

13 changes: 9 additions & 4 deletions spec/01-unit/08-router_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ local Router
local path_handling_tests = require "spec.fixtures.router_path_handling_tests"
local uuid = require("kong.tools.utils").uuid
local get_expression = require("kong.router.transform").get_expression
local deep_copy = require("kong.tools.table").deep_copy

local function reload_router(flavor, subsystem)
_G.kong = {
Expand Down Expand Up @@ -3663,7 +3664,8 @@ for _, flavor in ipairs({ "traditional", "traditional_compatible", "expressions"
}

lazy_setup(function()
router = assert(new_router(use_case_routes))
-- deep copy use_case_routes in case it changes
router = assert(new_router(deep_copy(use_case_routes)))
end)

it("strips the specified paths from the given uri if matching", function()
Expand Down Expand Up @@ -3717,7 +3719,8 @@ for _, flavor in ipairs({ "traditional", "traditional_compatible", "expressions"
},
}

local router = assert(new_router(use_case_routes))
-- deep copy use_case_routes in case it changes
local router = assert(new_router(deep_copy(use_case_routes)))

local _ngx = mock_ngx("POST", "/my-route/hello/world",
{ host = "domain.org" })
Expand Down Expand Up @@ -4900,7 +4903,8 @@ for _, flavor in ipairs({ "traditional", "traditional_compatible", "expressions"
},
}

router = assert(new_router(use_case))
-- deep copy use_case in case it changes
router = assert(new_router(deep_copy(use_case)))
end)

it("[assigns different priorities to regex and non-regex path]", function()
Expand Down Expand Up @@ -4948,7 +4952,8 @@ for _, flavor in ipairs({ "traditional", "traditional_compatible", "expressions"
},
}

router = assert(new_router(use_case))
-- deep copy use_case in case it changes
router = assert(new_router(deep_copy(use_case)))
end)

it("[assigns different priorities to each path]", function()
Expand Down
Loading