gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do constant time matching for exact match filters.

Browse Source
This commit is contained in:
Hossein Ghahramanzadeh 2022-01-29 08:05:03 +01:00
parent 28e1da21d8
commit 2eadda6e00
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
googletest/src/gtest.cc
View File

@ -50,6 +50,7 @@
#include <map> #include <map>
#include <ostream> // NOLINT #include <ostream> // NOLINT
#include <sstream> #include <sstream>
#include <unordered_set>
#include <vector> #include <vector>
#include "gtest/gtest-assertion-result.h" #include "gtest/gtest-assertion-result.h"
@ -725,6 +726,11 @@ static bool PatternMatchesString(const std::string& name_str,
return true; return true;
} }
static bool IsGlobPattern(const std::string& pattern) {
return std::any_of(pattern.begin(), pattern.end(),
[](const char c) { return c == '?' || c == '*'; });
}
namespace { namespace {
class UnitTestFilter { class UnitTestFilter {
@ -734,13 +740,19 @@ class UnitTestFilter {
// Constructs a filter from a string of patterns separated by `:`. // Constructs a filter from a string of patterns separated by `:`.
explicit UnitTestFilter(const std::string& filter) { explicit UnitTestFilter(const std::string& filter) {
// By design "" filter matches "" string. // By design "" filter matches "" string.
SplitString(filter, ':', &patterns_); SplitString(filter, ':', &glob_patterns_);
const auto exact_match_pattern_begin = std::partition(
glob_patterns_.begin(), glob_patterns_.end(), &IsGlobPattern);
exact_match_patterns_.insert(exact_match_pattern_begin,
glob_patterns_.end());
glob_patterns_.erase(exact_match_pattern_begin, glob_patterns_.end());
} }
// Returns true if and only if name matches at least one of the patterns in // Returns true if and only if name matches at least one of the patterns in
// the filter. // the filter.
bool MatchesName(const std::string& name) const { bool MatchesName(const std::string& name) const {
return std::any_of(patterns_.begin(), patterns_.end(), return exact_match_patterns_.count(name) ||
std::any_of(glob_patterns_.begin(), glob_patterns_.end(),
[&name](const std::string& pattern) { [&name](const std::string& pattern) {
return PatternMatchesString( return PatternMatchesString(
name, pattern.c_str(), name, pattern.c_str(),
@ -749,7 +761,8 @@ class UnitTestFilter {
} }
private: private:
std::vector<std::string> patterns_; std::vector<std::string> glob_patterns_;
std::unordered_set<std::string> exact_match_patterns_;
}; };
class PositiveAndNegativeUnitTestFilter { class PositiveAndNegativeUnitTestFilter {