Bug#37471922: Auto-fix clang-tidy warnings [22/n] [noclose]

Generate fixes for a number of warnings that clang-tidy can fix automatically.
This commit fixes the warning 'readability-string-compare'.

Change example:
 - if (sout.compare(sin) != 0) {
 + if (sout != sin) {

Change-Id: I6c557138f77a12f1cbc4b5b906041d270c962fb9

Author: MRajcic

client/mysqltest.cc

@@ -5642,7 +5642,7 @@ static bool validate_bug_number_argument(std::string bug_number) {
 
   // Check if string representing a bug number starts 'BUG' keyword.
   // Note: This keyword is case-inseinsitive.
-  if (bug_number.substr(0, 3).compare("bug") != 0) return false;
+  if (bug_number.substr(0, 3) != "bug") return false;
 
   // Check if the string contains '#' after 'BUG' keyword
   if (bug_number.at(3) != '#') return false;

client/mysqltest/error_names.cc

@@ -33,7 +33,7 @@ static st_error global_error_names[] = {
 
 int get_errcode_from_name(std::string error_name) {
   for (st_error *error = global_error_names; error->name; error++) {
-    if (error_name.compare(error->name) == 0) return error->error_code;
+    if (error_name == error->name) return error->error_code;
   }
 
   // Unknown SQL error name, return -1

client/mysqltest/regular_expressions.cc

@@ -189,7 +189,7 @@ int multi_reg_replace(struct st_replace_regex *r, char *val, size_t *len) {
           If some replacement is performed, write the replaced string into the
           output buffer.
         */
-        if (sout.compare(sin) != 0) {
+        if (sout != sin) {
           *len = sout.length();
           if (*len >= (uint)*buf_len_p) {
             uint need_buf_len = (*len) + 1;

plugin/clone/src/clone_plugin.cc

@@ -266,7 +266,7 @@ static int match_valid_donor_address(MYSQL_THD thd, const char *host,
                    transform_lower);
 
     /* Check if input matches with configured host and port. */
-    if (0 == valid_host.compare(host) && port == valid_port) {
+    if (host == valid_host && port == valid_port) {
       found = true;
     }
     return (found);

plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_control_interface.cc

@@ -330,7 +330,7 @@ static bool skip_own_peer_address(
 
   for (const auto &local_node_info_str_ip_entry : my_own_addresses) {
     for (auto &peer_rep_ip_entry : peer_rep_ip) {
-      if (peer_rep_ip_entry.compare(local_node_info_str_ip_entry.first) == 0 &&
+      if (peer_rep_ip_entry == local_node_info_str_ip_entry.first &&
           peer_port == my_own_port) {
         // Skip own address if configured in the peer list
         return true;

plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_interface.cc

@@ -472,9 +472,8 @@ enum_gcs_error Gcs_xcom_interface::configure(
 
   bool should_configure_allowlist = false;
   if (ip_allowlist_reconfigure_str) {
-    should_configure_allowlist =
-        ip_allowlist_reconfigure_str->compare("on") == 0 ||
-        ip_allowlist_reconfigure_str->compare("true") == 0;
+    should_configure_allowlist = *ip_allowlist_reconfigure_str == "on" ||
+                                 *ip_allowlist_reconfigure_str == "true";
   }
 
   if (should_configure_allowlist) {
@@ -542,8 +541,8 @@ enum_gcs_error Gcs_xcom_interface::configure(
    */
   if (bootstrap_group_str != nullptr) {
     // Changing bootstrap_group
-    bool received_boot_param = bootstrap_group_str->compare("on") == 0 ||
-                               bootstrap_group_str->compare("true") == 0;
+    bool received_boot_param =
+        *bootstrap_group_str == "on" || *bootstrap_group_str == "true";
 
     m_boot = received_boot_param;
     xcom_control->set_boot_node(m_boot);
@@ -960,8 +959,7 @@ bool Gcs_xcom_interface::initialize_xcom(
 
   MYSQL_GCS_LOG_DEBUG("Configured Local member: %s", local_node_str->c_str())
 
-  m_boot = bootstrap_group_str->compare("on") == 0 ||
-           bootstrap_group_str->compare("true") == 0;
+  m_boot = *bootstrap_group_str == "on" || *bootstrap_group_str == "true";
 
   MYSQL_GCS_LOG_DEBUG("Configured Bootstrap: %s", bootstrap_group_str->c_str())
 
@@ -1238,7 +1236,7 @@ enum_gcs_error Gcs_xcom_interface::configure_message_stages(
    */
   const std::string *sptr =
       m_initialization_parameters.get_parameter("compression");
-  if (sptr->compare("on") == 0) {
+  if (*sptr == "on") {
     compression_threshold = static_cast<unsigned long long>(atoll(
         m_initialization_parameters.get_parameter("compression_threshold")
             ->c_str()));
@@ -1249,7 +1247,7 @@ enum_gcs_error Gcs_xcom_interface::configure_message_stages(
   }
 
   sptr = m_initialization_parameters.get_parameter("fragmentation");
-  if (sptr->compare("on") == 0) {
+  if (*sptr == "on") {
     fragmentation_threshold = static_cast<unsigned long long>(atoll(
         m_initialization_parameters.get_parameter("fragmentation_threshold")
             ->c_str()));

plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_networking.cc

@@ -246,7 +246,7 @@ bool get_local_private_addresses(std::map<std::string, int> &out,
     std::string ip = it->first;
     int cidr = it->second;
 
-    if (ip.compare("::1") == 0 || ip.compare(0, 2, "fd") == 0 ||
+    if (ip == "::1" || ip.compare(0, 2, "fd") == 0 ||
         ip.compare(0, 4, "fe80") == 0) {
       out.insert(std::make_pair(ip, cidr));
     }

plugin/group_replication/libmysqlgcs/src/bindings/xcom/gcs_xcom_utils.cc

@@ -198,9 +198,8 @@ void fix_parameters_syntax(Gcs_interface_parameters &interface_params) {
 
   bool should_configure_allowlist = true;
   if (ip_allowlist_reconfigure_str) {
-    should_configure_allowlist =
-        ip_allowlist_reconfigure_str->compare("on") == 0 ||
-        ip_allowlist_reconfigure_str->compare("true") == 0;
+    should_configure_allowlist = *ip_allowlist_reconfigure_str == "on" ||
+                                 *ip_allowlist_reconfigure_str == "true";
   }
 
   // sets the default ip allowlist
@@ -466,7 +465,7 @@ bool is_parameters_syntax_correct(
     }
 
     for (auto &ip_entry : ip) {
-      if (ip_entry.compare(host) != 0)
+      if (ip_entry != host)
         MYSQL_GCS_LOG_INFO("Translated '" << host << "' to "
                                           << ip_entry.c_str());
     }
@@ -483,7 +482,7 @@ bool is_parameters_syntax_correct(
     // see if any IP matches fromt he root namespace
     for (it = ips.begin(); it != ips.end() && !matches_local_ip; it++) {
       for (auto &ip_entry : ip) {
-        matches_local_ip = (*it).first.compare(ip_entry) == 0;
+        matches_local_ip = (*it).first == ip_entry;
 
         if (matches_local_ip) break;
       }
@@ -516,7 +515,7 @@ bool is_parameters_syntax_correct(
         for (it = namespace_ips.begin();
              it != namespace_ips.end() && !matches_local_ip; it++) {
           for (auto &ip_entry : ip) {
-            matches_local_ip = (*it).first.compare(ip_entry) == 0;
+            matches_local_ip = (*it).first == ip_entry;
 
             if (matches_local_ip) break;
           }

plugin/group_replication/libmysqlgcs/src/gcs_interface_factory.cc

@@ -100,7 +100,7 @@ enum_available_interfaces Gcs_interface_factory::from_string(
   std::transform(binding.begin(), binding.end(),
                  std::back_inserter(binding_to_lower), ::tolower);
 
-  if (binding_to_lower.compare("xcom") == 0) retval = XCOM;
+  if (binding_to_lower == "xcom") retval = XCOM;
 
   return retval;
 }

plugin/group_replication/libmysqlgcs/src/interface/gcs_group_identifier.cc

@@ -36,6 +36,6 @@ bool Gcs_group_identifier::operator<(const Gcs_group_identifier &other) const {
 }
 
 bool Gcs_group_identifier::operator==(const Gcs_group_identifier &other) const {
-  return group_id.compare(other.group_id) == 0;
+  return group_id == other.group_id;
 }
 /* purecov: end */

plugin/group_replication/libmysqlgcs/src/interface/gcs_member_identifier.cc

@@ -43,5 +43,5 @@ bool Gcs_member_identifier::operator<(
 
 bool Gcs_member_identifier::operator==(
     const Gcs_member_identifier &other) const {
-  return m_member_id.compare(other.m_member_id) == 0;
+  return m_member_id == other.m_member_id;
 }

plugin/group_replication/src/member_info.cc

@@ -806,7 +806,7 @@ void Group_member_info::set_is_primary_election_running(bool is_running) {
 
 bool Group_member_info::operator==(Group_member_info &other) {
   MUTEX_LOCK(lock, &update_lock);
-  return uuid.compare(other.get_uuid()) == 0;
+  return uuid == other.get_uuid();
 }
 
 const char *Group_member_info::get_member_status_string(

plugin/rewriter/rule.cc

@@ -180,5 +180,5 @@ Rewrite_result Rule::create_new_query(MYSQL_THD thd) {
 
 bool Rule::matches(MYSQL_THD thd) const {
   string normalized_query = services::get_current_query_normalized(thd);
-  return normalized_query.compare(m_pattern.normalized_pattern) == 0;
+  return normalized_query == m_pattern.normalized_pattern;
 }

unittest/gunit/libmysqlgcs/xcom/gcs_parameters-t.cc

@@ -114,14 +114,12 @@ TEST_F(GcsParametersTest, ParametersCompression) {
       m_xcs->get_initialization_parameters();
 
   // compression is ON by default
-  ASSERT_TRUE(init_params.get_parameter("compression")->compare("on") == 0);
+  ASSERT_TRUE(*init_params.get_parameter("compression") == "on");
 
   // compression_threshold is set to the default
   std::stringstream ss;
   ss << Gcs_message_stage_lz4::DEFAULT_THRESHOLD;
-  ASSERT_TRUE(
-      init_params.get_parameter("compression_threshold")->compare(ss.str()) ==
-      0);
+  ASSERT_TRUE(*init_params.get_parameter("compression_threshold") == ss.str());
 
   // finalize the interface
   err = m_gcs->finalize();
@@ -152,12 +150,11 @@ TEST_F(GcsParametersTest, ParametersCompression) {
   ASSERT_EQ(err, GCS_OK);
 
   // compression is ON by default
-  ASSERT_TRUE(init_params2.get_parameter("compression")->compare(compression) ==
-              0);
+  ASSERT_TRUE(*init_params2.get_parameter("compression") == compression);
 
   // compression is set to the value we explicitly configured
-  ASSERT_TRUE(init_params2.get_parameter("compression_threshold")
-                  ->compare(compression_threshold) == 0);
+  ASSERT_TRUE(*init_params2.get_parameter("compression_threshold") ==
+              compression_threshold);
 
   err = m_gcs->finalize();
 
@@ -189,14 +186,13 @@ TEST_F(GcsParametersTest, ParametersFragmentation) {
       m_xcs->get_initialization_parameters();
 
   // fragmentation is ON by default
-  ASSERT_TRUE(init_params.get_parameter("fragmentation")->compare("on") == 0);
+  ASSERT_TRUE(*init_params.get_parameter("fragmentation") == "on");
 
   // fragmentation_threshold is set to the default
   std::stringstream ss;
   ss << Gcs_message_stage_split_v2::DEFAULT_THRESHOLD;
-  ASSERT_TRUE(
-      init_params.get_parameter("fragmentation_threshold")->compare(ss.str()) ==
-      0);
+  ASSERT_TRUE(*init_params.get_parameter("fragmentation_threshold") ==
+              ss.str());
 
   // finalize the interface
   err = m_gcs->finalize();
@@ -228,12 +224,11 @@ TEST_F(GcsParametersTest, ParametersFragmentation) {
   ASSERT_EQ(err, GCS_OK);
 
   // fragmentation is ON by default
-  ASSERT_TRUE(
-      init_params2.get_parameter("fragmentation")->compare(fragmentation) == 0);
+  ASSERT_TRUE(*init_params2.get_parameter("fragmentation") == fragmentation);
 
   // fragmentation is set to the value we explicitly configured
-  ASSERT_TRUE(init_params2.get_parameter("fragmentation_threshold")
-                  ->compare(fragmentation_threshold) == 0);
+  ASSERT_TRUE(*init_params2.get_parameter("fragmentation_threshold") ==
+              fragmentation_threshold);
 
   err = m_gcs->finalize();
 

unittest/gunit/libmysqlgcs/xcom/gcs_xcom_statistics_interface-t.cc

@@ -129,8 +129,8 @@ TEST_F(XcomStatisticsTest, SuspiciousCountTest) {
 
   uint32_t node_to_find = 0;
   auto find_node_lambda = [&](Gcs_node_suspicious elem) {
-    return elem.m_node_address.compare(
-               suspicious_list.at(node_to_find).m_node_address) == 0;
+    return elem.m_node_address ==
+           suspicious_list.at(node_to_find).m_node_address;
   };
 
   for (; node_to_find < suspicious_list_ret.size(); node_to_find++) {
@@ -142,7 +142,7 @@ TEST_F(XcomStatisticsTest, SuspiciousCountTest) {
   }
 
   auto do_not_find_node_lambda = [](Gcs_node_suspicious elem) {
-    return elem.m_node_address.compare("node6") == 0;
+    return elem.m_node_address == "node6";
   };
 
   auto result_from_find =

unittest/gunit/libmysqlgcs/xcom/gcs_xcom_statistics_manager-t.cc

@@ -127,7 +127,7 @@ TEST_F(XcomStatisticsManagerTest, AddAndGetMultipleSuspiciousTest) {
   std::string node_to_find{"node1"};
 
   auto find_node = [&](Gcs_node_suspicious &elem) {
-    return elem.m_node_address.compare(node_to_find) == 0;
+    return elem.m_node_address == node_to_find;
   };
 
   auto result1 =