summaryrefslogtreecommitdiff
path: root/src/mongo/util/namespace_string_util.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/util/namespace_string_util.cpp')
-rw-r--r--src/mongo/util/namespace_string_util.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/mongo/util/namespace_string_util.cpp b/src/mongo/util/namespace_string_util.cpp
index 4350752c444..9d949d405da 100644
--- a/src/mongo/util/namespace_string_util.cpp
+++ b/src/mongo/util/namespace_string_util.cpp
@@ -194,6 +194,10 @@ NamespaceString NamespaceStringUtil::parseNamespaceFromRequest(
NamespaceString NamespaceStringUtil::parseNamespaceFromRequest(
const boost::optional<TenantId>& tenantId, StringData db, StringData coll) {
+ if (!gMultitenancySupport) {
+ return NamespaceString{tenantId, db, coll};
+ }
+
if (coll.empty())
return deserialize(tenantId, db);
@@ -206,6 +210,10 @@ NamespaceString NamespaceStringUtil::parseNamespaceFromRequest(
NamespaceString NamespaceStringUtil::parseNamespaceFromRequest(const DatabaseName& dbName,
StringData coll) {
+ if (!gMultitenancySupport) {
+ return NamespaceString{dbName, coll};
+ }
+
if (coll.empty()) {
return NamespaceString(dbName);
}
@@ -224,6 +232,10 @@ NamespaceString NamespaceStringUtil::parseNamespaceFromDoc(
NamespaceString NamespaceStringUtil::parseNamespaceFromDoc(
const boost::optional<TenantId>& tenantId, StringData db, StringData coll) {
+ if (!gMultitenancySupport) {
+ return NamespaceString{tenantId, db, coll};
+ }
+
if (coll.empty())
return deserialize(tenantId, db);
@@ -236,6 +248,10 @@ NamespaceString NamespaceStringUtil::parseNamespaceFromDoc(
NamespaceString NamespaceStringUtil::parseNamespaceFromDoc(const DatabaseName& dbName,
StringData coll) {
+ if (!gMultitenancySupport) {
+ return NamespaceString{dbName, coll};
+ }
+
if (coll.empty())
return NamespaceString(dbName);