From 0966c1e4b1012020631457250c25b93d0e8f9977 Mon Sep 17 00:00:00 2001 From: Billy Donahue Date: Tue, 26 May 2026 14:30:15 -0400 Subject: [PATCH] SERVER-127488 fix single-char StringData::find calls (#54402) GitOrigin-RevId: 68e4068306280eee5fb3a9063d2217a8366ad5ac --- src/mongo/db/index/btree_key_generator.cpp | 2 +- src/mongo/db/query/query_tester/test.cpp | 4 ++-- .../db/s/analyze_shard_key_read_write_distribution_stage.cpp | 2 +- src/mongo/db/shard_role/shard_catalog/create_collection.cpp | 2 +- src/mongo/platform/decimal128.cpp | 2 +- src/mongo/unittest/unittest_main_core.cpp | 2 +- src/mongo/util/net/http_client_curl.cpp | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mongo/db/index/btree_key_generator.cpp b/src/mongo/db/index/btree_key_generator.cpp index cabca5a7f08..842e72fa15d 100644 --- a/src/mongo/db/index/btree_key_generator.cpp +++ b/src/mongo/db/index/btree_key_generator.cpp @@ -77,7 +77,7 @@ std::pair extractNonArrayElementAtPath(const BSONObj& obj, St static const auto kEmptyElt = BSONElement{}; auto&& [elt, tail] = [&]() -> std::pair { - if (auto dotOffset = path.find("."); dotOffset != std::string::npos) { + if (auto dotOffset = path.find('.'); dotOffset != std::string::npos) { return {obj.getField(path.substr(0, dotOffset)), path.substr(dotOffset + 1)}; } return {obj.getField(path), ""_sd}; diff --git a/src/mongo/db/query/query_tester/test.cpp b/src/mongo/db/query/query_tester/test.cpp index a5e0bc22734..ce1fabdb189 100644 --- a/src/mongo/db/query/query_tester/test.cpp +++ b/src/mongo/db/query/query_tester/test.cpp @@ -294,7 +294,7 @@ Test Test::parseTest(std::fstream& fs, } else { auto sd = StringData{lineFromFile}; { - auto endDocument = sd.rfind("}"); + auto endDocument = sd.rfind('}'); if (endDocument == std::string::npos) { continue; } @@ -303,7 +303,7 @@ Test Test::parseTest(std::fstream& fs, sd.remove_suffix(sd.size() - endDocument - 1); } { - auto startDocument = sd.find("{"); + auto startDocument = sd.find('{'); if (startDocument == std::string::npos) { continue; } diff --git a/src/mongo/db/s/analyze_shard_key_read_write_distribution_stage.cpp b/src/mongo/db/s/analyze_shard_key_read_write_distribution_stage.cpp index 1a70c96172b..7f60b371f57 100644 --- a/src/mongo/db/s/analyze_shard_key_read_write_distribution_stage.cpp +++ b/src/mongo/db/s/analyze_shard_key_read_write_distribution_stage.cpp @@ -264,7 +264,7 @@ void processSampledDiffs(OperationContext* opCtx, size_t startIndex = 0; while (startIndex < shardKeyFieldName.size()) { - const size_t lastDotIndex = shardKeyFieldName.find(".", startIndex); + const size_t lastDotIndex = shardKeyFieldName.find('.', startIndex); if (lastDotIndex == std::string::npos) { break; } diff --git a/src/mongo/db/shard_role/shard_catalog/create_collection.cpp b/src/mongo/db/shard_role/shard_catalog/create_collection.cpp index 02791b0c6a0..8c99a14959d 100644 --- a/src/mongo/db/shard_role/shard_catalog/create_collection.cpp +++ b/src/mongo/db/shard_role/shard_catalog/create_collection.cpp @@ -147,7 +147,7 @@ Status validateClusteredIndexSpec(OperationContext* opCtx, } const auto arbitraryClusterKeyField = clustered_util::getClusterKeyFieldName(spec); - if (arbitraryClusterKeyField.find(".", 0) != std::string::npos) { + if (arbitraryClusterKeyField.find('.', 0) != std::string::npos) { return Status( ErrorCodes::Error(6053701), "The clusteredIndex option does not support a cluster key with nested fields"); diff --git a/src/mongo/platform/decimal128.cpp b/src/mongo/platform/decimal128.cpp index 37fdd7f3497..8800baecbfc 100644 --- a/src/mongo/platform/decimal128.cpp +++ b/src/mongo/platform/decimal128.cpp @@ -513,7 +513,7 @@ std::string Decimal128::toString() const { StringData dec128String(decimalCharRepresentation); - int ePos = dec128String.find("E"); + int ePos = dec128String.find('E'); // Calculate the precision and exponent of the number and output it in a readable manner int precision = 0; diff --git a/src/mongo/unittest/unittest_main_core.cpp b/src/mongo/unittest/unittest_main_core.cpp index 4c56f0c74e7..d9d54b0407b 100644 --- a/src/mongo/unittest/unittest_main_core.cpp +++ b/src/mongo/unittest/unittest_main_core.cpp @@ -179,7 +179,7 @@ bool matchesGoogleFilter(StringData filt, StringData suite, StringData test) { filt.remove_prefix(1); continue; } - size_t pos = filt.find_first_of(":"); + size_t pos = filt.find_first_of(':'); StringData elem = filt.substr(0, pos); filt = filt.substr(pos); if (matchesGooglePattern(elem, fullName)) diff --git a/src/mongo/util/net/http_client_curl.cpp b/src/mongo/util/net/http_client_curl.cpp index c7b743b11ff..a3de5516138 100644 --- a/src/mongo/util/net/http_client_curl.cpp +++ b/src/mongo/util/net/http_client_curl.cpp @@ -644,7 +644,7 @@ HostAndPort exactHostAndPortFromUrl(StringData url) { url = url.substr(slashesIndex + slashes.size()); if (url.find('/') != std::string::npos) { - url = url.substr(0, url.find("/")); + url = url.substr(0, url.find('/')); } auto hp = HostAndPort(url);