Cleanup unused ignore_multiple_skipped_results_ field that is unneeded now that skipped matchers are handled via callback instead of recorded to a vector

Signed-off-by: Brian Surber <[email protected]>

Author: bsurber

source/common/matcher/matcher.h

@@ -84,10 +84,8 @@ static inline MaybeMatchResult evaluateMatch(MatchTree<DataType>& match_tree, co
 // Re-entry helper class to track and match against nested reentrants for a MatchTree.
 template <class DataType> class ReenterableMatchEvaluator {
 public:
-  ReenterableMatchEvaluator(std::shared_ptr<MatchTree<DataType>> match_tree,
-                            bool ignore_multiple_skipped_results)
-      : match_tree_(match_tree), ignore_multiple_skipped_results_(ignore_multiple_skipped_results) {
-  }
+  ReenterableMatchEvaluator(std::shared_ptr<MatchTree<DataType>> match_tree)
+      : match_tree_(match_tree) {}
 
   // Match against the reentrant stack (bottom up), cleaning up any that no longer find a match.
   MaybeMatchResult evaluateMatch(const DataType& data,
@@ -198,8 +196,6 @@ template <class DataType> class ReenterableMatchEvaluator {
   // MatchTree to use for the initial match.
   std::shared_ptr<MatchTree<DataType>> match_tree_;
   std::unique_ptr<ReentrantEntry> reentrant_stack_ = nullptr;
-  // Only record the first skipped result.
-  bool ignore_multiple_skipped_results_ = false;
 };
 
 template <class DataType> using FieldMatcherFactoryCb = std::function<FieldMatcherPtr<DataType>()>;

test/common/matcher/matcher_test.cc

@@ -879,7 +879,7 @@ TEST_P(MatcherAmbiguousTest, ReentryWithRecursiveMatcher) {
   std::shared_ptr<MatchTree<TestData>> top_matcher = createMatcherFromYaml(yaml)();
 
   // Expect to hit each match once via repeated re-entry, including the recursive on-no-match.
-  ReenterableMatchEvaluator<TestData> reenterable_matcher(top_matcher, false);
+  ReenterableMatchEvaluator<TestData> reenterable_matcher(top_matcher);
   std::vector<ActionFactoryCb> skipped_results;
   SkippedMatchCb<TestData> skipped_match_cb = [&skipped_results](const OnMatch<TestData>& match) {
     skipped_results.push_back(match.action_cb_);
@@ -1067,7 +1067,7 @@ TEST_P(MatcherAmbiguousTest, ReentryWithNestedPreviewMatchers) {
   // keep_matching setting. The third nested match and on_no_match are not reached as the parent
   // matcher has finished recursion with the second match, which would have been its returned action
   // if the parent matcher wasn't skipped.
-  ReenterableMatchEvaluator<TestData> reenterable_matcher(top_matcher, false);
+  ReenterableMatchEvaluator<TestData> reenterable_matcher(top_matcher);
   std::vector<ActionFactoryCb> skipped_results;
   SkippedMatchCb<TestData> skipped_match_cb = [&skipped_results](const OnMatch<TestData>& match) {
     skipped_results.push_back(match.action_cb_);
@@ -1122,7 +1122,7 @@ TEST_P(MatcherAmbiguousTest, KeepMatchingWithUnsupportedReentry) {
   validation_visitor_.setSupportKeepMatching(true);
   std::shared_ptr<MatchTree<TestData>> matcher = createMatcherFromYaml(yaml)();
 
-  ReenterableMatchEvaluator<TestData> reenterable_matcher(matcher, false);
+  ReenterableMatchEvaluator<TestData> reenterable_matcher(matcher);
   std::vector<ActionFactoryCb> skipped_results;
   SkippedMatchCb<TestData> skipped_match_cb = [&skipped_results](const OnMatch<TestData>& match) {
     skipped_results.push_back(match.action_cb_);