filter_grep: Improve the performance

[repeatedly]

• Remove catch
• Reduce method call

Warming up --------------------------------------
                 old     3.371k i/100ms
                 new     3.522k i/100ms
Calculating -------------------------------------
                 old     33.531k (± 4.1%) i/s -    168.550k in   5.035547s
                 new     35.888k (± 3.4%) i/s -    179.622k in   5.011044s

Signed-off-by: Masahiro Nakagawa [email protected]

[repeatedly]

@okkez How about this change?

[okkez]

Looks nice.
And more, how about applying following changes?
But my additional changes do not improve performance.
My benchmark script reports the unstable result.

diff --git a/lib/fluent/plugin/filter_grep.rb b/lib/fluent/plugin/filter_grep.rb
index 5c62f012..f590550b 100644
--- a/lib/fluent/plugin/filter_grep.rb
+++ b/lib/fluent/plugin/filter_grep.rb
@@ -161,10 +161,8 @@ module Fluent::Plugin
 
     def filter(tag, time, record)
       begin
-        if @_regexp_and_conditions
-          @_regexp_and_conditions.each do |expression|
-            return nil unless expression.match?(record)
-          end
+        if @_regexp_and_conditions && @_regexp_and_conditions.any? { |expression| !expression.match?(record) }
+          return nil
         end
         if @_regexp_or_conditions && @_regexp_or_conditions.none? { |expression| expression.match?(record) }
           return nil
@@ -172,10 +170,8 @@ module Fluent::Plugin
         if @_exclude_and_conditions && @_exclude_and_conditions.all? { |expression| expression.match?(record) }
           return nil
         end
-        if @_exclude_or_conditions
-          @_exclude_or_conditions.each do |expression|
-            return nil if expression.match?(record)
-          end
+        if @_exclude_or_conditions && @_exclude_or_conditions.any? { |expression| expression.match?(record) }
+          return nil
         end
       rescue => e
         log.warn "failed to grep events", error: e

[repeatedly]

okay. Will apply it.