SERVER-47521 Remove getCollectionDescription_DEPRECATED function

5 files changed, 0 insertions, 21 deletions

diff --git a/src/mongo/db/s/collection_sharding_runtime.cpp b/src/mongo/db/s/collection_sharding_runtime.cpp
index a8bf443d7fb..438898ce31f 100644
--- a/src/mongo/db/s/collection_sharding_runtime.cpp
+++ b/src/mongo/db/s/collection_sharding_runtime.cpp
@@ -144,15 +144,6 @@ ScopedCollectionDescription CollectionShardingRuntime::getCollectionDescription(
     return {std::move(optMetadata)};
 }
 
-ScopedCollectionDescription CollectionShardingRuntime::getCollectionDescription_DEPRECATED() {
-    auto optMetadata = _getCurrentMetadataIfKnown(boost::none);
-
-    if (!optMetadata)
-        return {kUnshardedCollection};
-
-    return {std::move(optMetadata)};
-}
-
 boost::optional<CollectionMetadata> CollectionShardingRuntime::getCurrentMetadataIfKnown() {
     auto optMetadata = _getCurrentMetadataIfKnown(boost::none);
     if (!optMetadata)
diff --git a/src/mongo/db/s/collection_sharding_runtime.h b/src/mongo/db/s/collection_sharding_runtime.h
index c86215b011c..0356c22cc54 100644
--- a/src/mongo/db/s/collection_sharding_runtime.h
+++ b/src/mongo/db/s/collection_sharding_runtime.h
@@ -76,7 +76,6 @@ public:
                                               OrphanCleanupPolicy orphanCleanupPolicy) override;
 
     ScopedCollectionDescription getCollectionDescription(OperationContext* opCtx) override;
-    ScopedCollectionDescription getCollectionDescription_DEPRECATED() override;
 
     void checkShardVersionOrThrow(OperationContext* opCtx) override;
 
diff --git a/src/mongo/db/s/collection_sharding_state.h b/src/mongo/db/s/collection_sharding_state.h
index d2505601729..5cf19dfc8ad 100644
--- a/src/mongo/db/s/collection_sharding_state.h
+++ b/src/mongo/db/s/collection_sharding_state.h
@@ -93,11 +93,6 @@ public:
      */
     virtual ScopedCollectionDescription getCollectionDescription(OperationContext* opCtx) = 0;
 
-    // TODO (SERVER-32198): This method must not be used in any new code because it does not provide
-    // the necessary guarantees that getCollectionDescription above does. Specifically, it silently
-    // treats UNKNOWN metadata as UNSHARDED, which can lead to data loss.
-    virtual ScopedCollectionDescription getCollectionDescription_DEPRECATED() = 0;
-
     /**
      * This method must be called with an OperationShardingState, which specifies an expected shard
      * version for the collection and it will invariant otherwise.
diff --git a/src/mongo/db/s/collection_sharding_state_factory_embedded.cpp b/src/mongo/db/s/collection_sharding_state_factory_embedded.cpp
index eb1ac0e9a30..e4be7a1862a 100644
--- a/src/mongo/db/s/collection_sharding_state_factory_embedded.cpp
+++ b/src/mongo/db/s/collection_sharding_state_factory_embedded.cpp
@@ -56,9 +56,6 @@ public:
     ScopedCollectionDescription getCollectionDescription(OperationContext* opCtx) override {
         return {kUnshardedCollection};
     }
-    ScopedCollectionDescription getCollectionDescription_DEPRECATED() override {
-        return {kUnshardedCollection};
-    }
     ScopedCollectionFilter getOwnershipFilter(OperationContext*,
                                               OrphanCleanupPolicy orphanCleanupPolicy) override {
         return {kUnshardedCollection};
diff --git a/src/mongo/db/s/collection_sharding_state_factory_standalone.cpp b/src/mongo/db/s/collection_sharding_state_factory_standalone.cpp
index d3c81b7a5cc..3c0be93b3be 100644
--- a/src/mongo/db/s/collection_sharding_state_factory_standalone.cpp
+++ b/src/mongo/db/s/collection_sharding_state_factory_standalone.cpp
@@ -55,9 +55,6 @@ public:
     ScopedCollectionDescription getCollectionDescription(OperationContext* opCtx) override {
         return {kUnshardedCollection};
     }
-    ScopedCollectionDescription getCollectionDescription_DEPRECATED() override {
-        return {kUnshardedCollection};
-    }
     ScopedCollectionFilter getOwnershipFilter(OperationContext*,
                                               OrphanCleanupPolicy orphanCleanupPolicy) override {
         return {kUnshardedCollection};