Skip to content

perf: optimize KeyMatch functions with fast path for wildcard replacement #1699

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

Open
AKonnyaku wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −6
Open

perf: optimize KeyMatch functions with fast path for wildcard replacement #1699

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
24 changes: 18 additions & 6 deletions util/builtin_operators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,9 @@ func KeyGetFunc(args ...interface{}) (interface{}, error) {
// KeyMatch2 determines whether key1 matches the pattern of key2 (similar to RESTful path), key2 can contain a *.
// For example, "/foo/bar" matches "/foo/*", "/resource1" matches "/:resource".
func KeyMatch2(key1 string, key2 string) bool {
key2 = strings.Replace(key2, "/*", "/.*", -1)
if strings.Contains(key2, "/*") { //nolint:gosimple // optimization
key2 = strings.Replace(key2, "/*", "/.*", -1)
}

key2 = keyMatch2Re.ReplaceAllString(key2, "$1[^/]+$2")

Expand All @@ -160,7 +162,9 @@ func KeyMatch2Func(args ...interface{}) (interface{}, error) {
// For example, "/resource1" matches "/:resource"
// if the pathVar == "resource", then "resource1" will be returned.
func KeyGet2(key1, key2 string, pathVar string) string {
key2 = strings.Replace(key2, "/*", "/.*", -1)
if strings.Contains(key2, "/*") { //nolint:gosimple // optimization
key2 = strings.Replace(key2, "/*", "/.*", -1)
}
keys := keyGet2Re1.FindAllString(key2, -1)
key2 = keyGet2Re1.ReplaceAllString(key2, "$1([^/]+)$2")
key2 = "^" + key2 + "$"
Expand Down Expand Up @@ -194,7 +198,9 @@ func KeyGet2Func(args ...interface{}) (interface{}, error) {
// KeyMatch3 determines whether key1 matches the pattern of key2 (similar to RESTful path), key2 can contain a *.
// For example, "/foo/bar" matches "/foo/*", "/resource1" matches "/{resource}".
func KeyMatch3(key1 string, key2 string) bool {
key2 = strings.Replace(key2, "/*", "/.*", -1)
if strings.Contains(key2, "/*") { //nolint:gosimple // optimization
key2 = strings.Replace(key2, "/*", "/.*", -1)
}
key2 = keyMatch3Re.ReplaceAllString(key2, "$1[^/]+$2")

return RegexMatch(key1, "^"+key2+"$")
Expand All @@ -216,7 +222,9 @@ func KeyMatch3Func(args ...interface{}) (interface{}, error) {
// For example, "project/proj_project1_admin/" matches "project/proj_{project}_admin/"
// if the pathVar == "project", then "project1" will be returned.
func KeyGet3(key1, key2 string, pathVar string) string {
key2 = strings.Replace(key2, "/*", "/.*", -1)
if strings.Contains(key2, "/*") { //nolint:gosimple // optimization
key2 = strings.Replace(key2, "/*", "/.*", -1)
}

keys := keyGet3Re1.FindAllString(key2, -1)
key2 = keyGet3Re1.ReplaceAllString(key2, "$1([^/]+?)$2")
Expand Down Expand Up @@ -253,7 +261,9 @@ func KeyGet3Func(args ...interface{}) (interface{}, error) {
// "/parent/123/child/456" does not match "/parent/{id}/child/{id}"
// But KeyMatch3 will match both.
func KeyMatch4(key1 string, key2 string) bool {
key2 = strings.Replace(key2, "/*", "/.*", -1)
if strings.Contains(key2, "/*") { //nolint:gosimple // optimization
key2 = strings.Replace(key2, "/*", "/.*", -1)
}

tokens := []string{}

Expand Down Expand Up @@ -312,7 +322,9 @@ func KeyMatch5(key1 string, key2 string) bool {
key1 = key1[:i]
}

key2 = strings.Replace(key2, "/*", "/.*", -1)
if strings.Contains(key2, "/*") { //nolint:gosimple // optimization
key2 = strings.Replace(key2, "/*", "/.*", -1)
}
key2 = keyMatch5Re.ReplaceAllString(key2, "$1[^/]+$2")

return RegexMatch(key1, "^"+key2+"$")
Expand Down
Loading