diff options
| author | 2018-03-23 21:15:02 +0000 | |
|---|---|---|
| committer | 2018-03-23 21:15:02 +0000 | |
| commit | 3991138f3a58cdee447c74c3bf9bcf7923900747 (patch) | |
| tree | 74fc2ad206fa47ce323db9e7d696f950c5f49925 | |
| parent | 4cd95f64c22854f47dbdb5d6fd330abd5fb82b0e (diff) | |
| parent | d50f2ae4875cea32662454090c308bb8c7b622eb (diff) | |
Merge "rename neq_all_string to neq_any_string in statsd_config" into pi-dev
| -rw-r--r-- | cmds/statsd/src/matchers/matcher_util.cpp | 4 | ||||
| -rw-r--r-- | cmds/statsd/src/statsd_config.proto | 2 | ||||
| -rw-r--r-- | cmds/statsd/tests/LogEntryMatcher_test.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/cmds/statsd/src/matchers/matcher_util.cpp b/cmds/statsd/src/matchers/matcher_util.cpp index b7105b351a10..8dc5cef988b0 100644 --- a/cmds/statsd/src/matchers/matcher_util.cpp +++ b/cmds/statsd/src/matchers/matcher_util.cpp @@ -236,8 +236,8 @@ bool matchesSimple(const UidMap& uidMap, const FieldValueMatcher& matcher, } return false; } - case FieldValueMatcher::ValueMatcherCase::kNeqAllString: { - const auto& str_list = matcher.neq_all_string(); + case FieldValueMatcher::ValueMatcherCase::kNeqAnyString: { + const auto& str_list = matcher.neq_any_string(); for (int i = start; i < end; i++) { bool notEqAll = true; for (const auto& str : str_list.str_value()) { diff --git a/cmds/statsd/src/statsd_config.proto b/cmds/statsd/src/statsd_config.proto index 2c701915f429..93df9b824ac3 100644 --- a/cmds/statsd/src/statsd_config.proto +++ b/cmds/statsd/src/statsd_config.proto @@ -78,7 +78,7 @@ message FieldValueMatcher { MessageMatcher matches_tuple = 12; StringListMatcher eq_any_string = 13; - StringListMatcher neq_all_string = 14; + StringListMatcher neq_any_string = 14; } } diff --git a/cmds/statsd/tests/LogEntryMatcher_test.cpp b/cmds/statsd/tests/LogEntryMatcher_test.cpp index 36c6e0c964bd..b0da07bb7f29 100644 --- a/cmds/statsd/tests/LogEntryMatcher_test.cpp +++ b/cmds/statsd/tests/LogEntryMatcher_test.cpp @@ -339,7 +339,7 @@ TEST(AtomMatcherTest, TestNeqAnyStringMatcher) { ATTRIBUTION_UID_FIELD_ID); auto neqStringList = attributionMatcher->mutable_matches_tuple() ->mutable_field_value_matcher(0) - ->mutable_neq_all_string(); + ->mutable_neq_any_string(); neqStringList->add_str_value("pkg2"); neqStringList->add_str_value("pkg3"); |