Fix StrSplit empty string case (#1142)

This also fixes #1135. Because StrSplit was returning a vector with an empty string, it was treated by PerfCounters::Create as a legitimate ask for setting up a counter with that name. The empty vector is understood by PerfCounters as "just return NoCounters()".

Fix StrSplit empty string case (#1142)
e0826ede · Mircea Trofin · GitHub · e50b572e · e0826ede · e0826ede
Unverified Commit e0826ede authored May 06, 2021 by Mircea Trofin Committed by GitHub May 06, 2021
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

string_util.cc src/string_util.cc +1 -0

string_util_gtest.cc test/string_util_gtest.cc +1 -1

No files found.
--- a/src/string_util.cc
+++ b/src/string_util.cc
@@ -164,6 +164,7 @@ std::string StrFormat(const char* format, ...) {
 }

 std::vector<std::string> StrSplit(const std::string& str, char delim) {
+  if (str.empty()) return {};
  std::vector<std::string> ret;
  size_t first = 0;
  size_t next = str.find(delim);

--- a/test/string_util_gtest.cc
+++ b/test/string_util_gtest.cc
@@ -151,7 +151,7 @@ TEST(StringUtilTest, stod) {
 }

 TEST(StringUtilTest, StrSplit) {
-  EXPECT_EQ(benchmark::StrSplit("", ','), std::vector<std::string>{""});
+  EXPECT_EQ(benchmark::StrSplit("", ','), std::vector<std::string>{});
  EXPECT_EQ(benchmark::StrSplit("hello", ','),
            std::vector<std::string>({"hello"}));
  EXPECT_EQ(benchmark::StrSplit("hello,there", ','),