diff options
Diffstat (limited to 'src/mongo/db/namespace_string.cpp')
| -rw-r--r-- | src/mongo/db/namespace_string.cpp | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/mongo/db/namespace_string.cpp b/src/mongo/db/namespace_string.cpp index 374fe4e5795..13729330ee1 100644 --- a/src/mongo/db/namespace_string.cpp +++ b/src/mongo/db/namespace_string.cpp @@ -35,7 +35,6 @@ #include "mongo/base/parse_number.h" #include "mongo/base/status.h" -#include "mongo/db/query/query_shape/serialization_options.h" #include "mongo/db/server_options.h" #include "mongo/util/str.h" @@ -50,7 +49,6 @@ constexpr auto fle2Prefix = "enxcol_."_sd; constexpr auto fle2EscSuffix = ".esc"_sd; constexpr auto fle2EccSuffix = ".ecc"_sd; constexpr auto fle2EcocSuffix = ".ecoc"_sd; -constexpr auto fle2EcocCompactSuffix = ".ecoc.compact"_sd; } // namespace @@ -171,12 +169,6 @@ const NamespaceString NamespaceString::kClusterParametersNamespace(NamespaceStri const NamespaceString NamespaceString::kConfigsvrShardsNamespace(NamespaceString::kConfigDb, "shards"); -const NamespaceString NamespaceString::kConfigsvrCollectionsNamespace(NamespaceString::kConfigDb, - "collections"); - -const NamespaceString NamespaceString::kLocalHealthLogNamespace(NamespaceString::kLocalDb, - "system.healthlog"); - bool NamespaceString::isListCollectionsCursorNS() const { return coll() == listCollectionsCursorCol; } @@ -196,8 +188,6 @@ bool NamespaceString::isLegalClientSystemNS( return true; if (coll() == "system.backup_users") return true; - if (coll() == "system.new_users") - return true; } else if (db() == kConfigDb) { if (coll() == "system.sessions") return true; @@ -212,7 +202,7 @@ bool NamespaceString::isLegalClientSystemNS( } else if (db() == kLocalDb) { if (coll() == kSystemReplSetNamespace.coll()) return true; - if (coll() == kLocalHealthLogNamespace.coll()) + if (coll() == "system.healthlog") return true; if (coll() == kConfigsvrRestoreNamespace.coll()) return true; @@ -279,10 +269,6 @@ std::string NamespaceString::getSisterNS(StringData local) const { return db().toString() + "." + local.toString(); } -std::string NamespaceString::toString(const SerializationOptions& opts) const { - return opts.serializeIdentifier(ns()); -} - void NamespaceString::serializeCollectionName(BSONObjBuilder* builder, StringData fieldName) const { if (isCollectionlessAggregateNS()) { builder->append(fieldName, 1); @@ -407,7 +393,7 @@ bool NamespaceString::isConfigTransactionsCollection() const { bool NamespaceString::isFLE2StateCollection() const { return coll().startsWith(fle2Prefix) && (coll().endsWith(fle2EscSuffix) || coll().endsWith(fle2EccSuffix) || - coll().endsWith(fle2EcocSuffix) || coll().endsWith(fle2EcocCompactSuffix)); + coll().endsWith(fle2EcocSuffix)); } NamespaceString NamespaceString::makeTimeseriesBucketsNamespace() const { |
