Skip to content

A platform for community discussion. Free, open, simple.

PERF: Precompile search advanced-filter matchers once (#41642)

Alan Guo Xiang Tanfafc5657e745
diff --git a/lib/search.rb b/lib/search.rb
index 9eb0ab56f93..a3a2f55c58c 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -388,7 +388,8 @@ class Search
end
def self.advanced_filter(trigger, name: nil, enabled: -> { true }, &block)
- advanced_filters[trigger] = { block:, name:, enabled: }
+ case_insensitive_matcher = Regexp.new(trigger.source, trigger.options | Regexp::IGNORECASE)
+ advanced_filters[trigger] = { block:, name:, enabled:, case_insensitive_matcher: }
end
def self.advanced_filters
@@ -990,16 +991,14 @@ class Search
found = false
- Search.advanced_filters.each do |matcher, options|
+ cleaned = word.gsub(/["']/, "")
+
+ Search.advanced_filters.each_value do |options|
block = options[:block]
name = options[:name]
next unless options[:enabled].call
- case_insensitive_matcher =
- Regexp.new(matcher.source, matcher.options | Regexp::IGNORECASE)
-
- cleaned = word.gsub(/["']/, "")
- if cleaned =~ case_insensitive_matcher
+ if cleaned =~ options[:case_insensitive_matcher]
(@filters ||= []) << [block, $1]
@matched_advanced_filter_names << name if name
found = true