diff options
author | Mathias Stearn <mathias@10gen.com> | 2018-04-23 12:53:04 -0400 |
---|---|---|
committer | Mathias Stearn <mathias@10gen.com> | 2018-04-23 17:46:18 -0400 |
commit | 390d83a19828c50db5cdce1eed056d8aea1fb9ad (patch) | |
tree | aba138008f11123f00d91978e2c9dd5c9e0d1eb1 | |
parent | 046740799031ca275dc3e9a5e25c4d1581ab88fb (diff) | |
download | mongo-390d83a19828c50db5cdce1eed056d8aea1fb9ad.tar.gz |
SERVER-34617 Make NamespaceString::db() return whole ns() when it has no dots
-rw-r--r-- | src/mongo/db/namespace_string.h | 2 | ||||
-rw-r--r-- | src/mongo/db/namespace_string_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/namespace_string.h b/src/mongo/db/namespace_string.h index f9ee71c2637..a5e9f15bd39 100644 --- a/src/mongo/db/namespace_string.h +++ b/src/mongo/db/namespace_string.h @@ -175,7 +175,7 @@ public: }; StringData db() const { - return _dotIndex == std::string::npos ? StringData() : StringData(_ns.c_str(), _dotIndex); + return _dotIndex == std::string::npos ? _ns : StringData(_ns.data(), _dotIndex); } StringData coll() const { diff --git a/src/mongo/db/namespace_string_test.cpp b/src/mongo/db/namespace_string_test.cpp index 1b8a396776c..24610b8b493 100644 --- a/src/mongo/db/namespace_string_test.cpp +++ b/src/mongo/db/namespace_string_test.cpp @@ -335,7 +335,7 @@ TEST(NamespaceStringTest, NamespaceStringParse2) { TEST(NamespaceStringTest, NamespaceStringParse3) { NamespaceString ns("abc"); - ASSERT_EQUALS(std::string(""), ns.db()); + ASSERT_EQUALS(std::string("abc"), ns.db()); ASSERT_EQUALS(std::string(""), ns.coll()); } |