From d50f2ae4875cea32662454090c308bb8c7b622eb Mon Sep 17 00:00:00 2001 From: Yao Chen Date: Fri, 23 Mar 2018 11:10:13 -0700 Subject: rename neq_all_string to neq_any_string in statsd_config Bug: 73897465 Test: statsd_test Change-Id: I1d020de873fc26fbb502f0b3487b85fdb3896753 --- cmds/statsd/src/matchers/matcher_util.cpp | 4 ++-- cmds/statsd/src/statsd_config.proto | 2 +- 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"); -- cgit v1.2.3-59-g8ed1b