Skip to content

perf(util): replace global RWMutex with sync.Map in reCache to eliminate mutex contention (fix #1690) #1750

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
Jaymr1031-Z wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −12
Open

perf(util): replace global RWMutex with sync.Map in reCache to eliminate mutex contention (fix #1690) #1750

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
18 changes: 6 additions & 12 deletions util/builtin_operators.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ var (
keyMatch5Re = regexp.MustCompile(`\{[^/]+\}`)
keyGet2Re1 = regexp.MustCompile(`:[^/]+`)
keyGet3Re1 = regexp.MustCompile(`\{[^/]+?\}`) // non-greedy match of `{...}` to support multiple {} in `/.../`
reCache = map[string]*regexp.Regexp{}
reCacheMu = sync.RWMutex{}
reCache sync.Map // string -> *regexp.Regexp
)

// regexpMetaChars is exactly the set of characters that regexp.QuoteMeta escapes.
Expand Down Expand Up @@ -128,18 +127,13 @@ var (
)

func mustCompileOrGet(key string) *regexp.Regexp {
reCacheMu.RLock()
re, ok := reCache[key]
reCacheMu.RUnlock()

if !ok {
re = regexp.MustCompile(key)
reCacheMu.Lock()
reCache[key] = re
reCacheMu.Unlock()
if v, ok := reCache.Load(key); ok {
return v.(*regexp.Regexp)
}

return re
re := regexp.MustCompile(key)
actual, _ := reCache.LoadOrStore(key, re)
return actual.(*regexp.Regexp)
}

// validate the variadic parameter size and type as string.
Expand Down