SERVER-50027 Make CollectionType use IDL (Part 3)

8 files changed, 8 insertions, 12 deletions

diff --git a/src/mongo/db/commands/set_feature_compatibility_version_command.cpp b/src/mongo/db/commands/set_feature_compatibility_version_command.cpp
index 4622a495ae2..54efaed48d1 100644
--- a/src/mongo/db/commands/set_feature_compatibility_version_command.cpp
+++ b/src/mongo/db/commands/set_feature_compatibility_version_command.cpp
@@ -56,7 +56,6 @@
 #include "mongo/db/server_options.h"
 #include "mongo/logv2/log.h"
 #include "mongo/rpc/get_status_from_command_result.h"
-#include "mongo/s/catalog/type_collection.h"
 #include "mongo/s/database_version_helpers.h"
 #include "mongo/stdx/unordered_set.h"
 #include "mongo/util/exit.h"
diff --git a/src/mongo/db/s/config/sharding_catalog_manager_collection_operations.cpp b/src/mongo/db/s/config/sharding_catalog_manager_collection_operations.cpp
index 31fdcf25466..50470cf2a80 100644
--- a/src/mongo/db/s/config/sharding_catalog_manager_collection_operations.cpp
+++ b/src/mongo/db/s/config/sharding_catalog_manager_collection_operations.cpp
@@ -749,8 +749,6 @@ void ShardingCatalogManager::updateShardingCatalogEntryForCollectionInTxn(
     const bool upsert,
     const bool startTransaction,
     TxnNumber txnNumber) {
-    fassert(51249, coll.validate());
-
     auto status = getStatusFromCommandResult(
         writeToConfigDocumentInTxn(opCtx,
                                    CollectionType::ConfigNS,
diff --git a/src/mongo/db/s/resharding/resharding_coordinator_service.cpp b/src/mongo/db/s/resharding/resharding_coordinator_service.cpp
index 0988bce67c8..08f23a349e2 100644
--- a/src/mongo/db/s/resharding/resharding_coordinator_service.cpp
+++ b/src/mongo/db/s/resharding/resharding_coordinator_service.cpp
@@ -402,8 +402,6 @@ CollectionType createTempReshardingCollectionType(
     emplaceFetchTimestampIfExists(recipient, coordinatorDoc.getFetchTimestamp());
     tempEntryReshardingFields.setRecipientFields(recipient);
     collType.setReshardingFields(std::move(tempEntryReshardingFields));
-
-    invariant(collType.validate().isOK());
     return collType;
 }
 
diff --git a/src/mongo/db/s/resharding/resharding_coordinator_test.cpp b/src/mongo/db/s/resharding/resharding_coordinator_test.cpp
index 691a832603f..4ee4d193ff1 100644
--- a/src/mongo/db/s/resharding/resharding_coordinator_test.cpp
+++ b/src/mongo/db/s/resharding/resharding_coordinator_test.cpp
@@ -47,6 +47,7 @@
 #include "mongo/util/clock_source_mock.h"
 
 namespace mongo {
+namespace {
 
 class ReshardingCoordinatorPersistenceTest : public ConfigServerTestFixture {
 protected:
@@ -109,7 +110,6 @@ protected:
         }
         collType.setEpoch(std::move(epoch));
         collType.setUpdatedAt(lastUpdated);
-        collType.setDefaultCollation(BSONObj());
         collType.setUnique(false);
         collType.setDistributionMode(CollectionType::DistributionMode::kSharded);
         if (reshardingFields)
@@ -665,4 +665,5 @@ TEST_F(ReshardingCoordinatorPersistenceTest,
                        ErrorCodes::NamespaceNotFound);
 }
 
+}  // namespace
 }  // namespace mongo
diff --git a/src/mongo/db/s/resharding_util.h b/src/mongo/db/s/resharding_util.h
index 7b168de9734..33c491a4d23 100644
--- a/src/mongo/db/s/resharding_util.h
+++ b/src/mongo/db/s/resharding_util.h
@@ -40,7 +40,7 @@
 #include "mongo/db/s/resharding/donor_oplog_id_gen.h"
 #include "mongo/executor/task_executor.h"
 #include "mongo/s/catalog/type_tags.h"
-#include "mongo/s/catalog_cache.h"
+#include "mongo/s/chunk_manager.h"
 #include "mongo/s/resharded_chunk_gen.h"
 #include "mongo/s/shard_id.h"
 #include "mongo/s/write_ops/batched_command_request.h"
diff --git a/src/mongo/db/s/shardsvr_shard_collection.cpp b/src/mongo/db/s/shardsvr_shard_collection.cpp
index dcc9440606c..9508b658d7c 100644
--- a/src/mongo/db/s/shardsvr_shard_collection.cpp
+++ b/src/mongo/db/s/shardsvr_shard_collection.cpp
@@ -484,7 +484,9 @@ void updateShardingCatalogEntryForCollection(
     coll.setEpoch(initialChunks.collVersion().epoch());
     coll.setUpdatedAt(Date_t::fromMillisSinceEpoch(initialChunks.collVersion().toLong()));
     coll.setKeyPattern(prerequisites.shardKeyPattern.toBSON());
-    coll.setDefaultCollation(defaultCollator ? defaultCollator->getSpec().toBSON() : BSONObj());
+    if (defaultCollator) {
+        coll.setDefaultCollation(defaultCollator->getSpec().toBSON());
+    }
     coll.setUnique(unique);
     coll.setDistributionMode(CollectionType::DistributionMode::kSharded);
 
diff --git a/src/mongo/db/s/type_shard_collection.idl b/src/mongo/db/s/type_shard_collection.idl
index a700a8d49b6..8a58fbe3733 100644
--- a/src/mongo/db/s/type_shard_collection.idl
+++ b/src/mongo/db/s/type_shard_collection.idl
@@ -101,10 +101,9 @@ structs:
                 optional: false
             defaultCollation:
                 type: object_owned
+                description: "Optional collection default collation. If missing or set to the empty
+                              BSON, implies simple collation."
                 default: BSONObj()
-                description: "Optional collection default collation. If empty, implies simple
-                              collation."
-                optional: false
             unique:
                 type: bool
                 description: "Uniqueness of the sharding key."
diff --git a/src/mongo/db/s/type_shard_collection_test.cpp b/src/mongo/db/s/type_shard_collection_test.cpp
index d5d07bb5ac7..8840aea9851 100644
--- a/src/mongo/db/s/type_shard_collection_test.cpp
+++ b/src/mongo/db/s/type_shard_collection_test.cpp
@@ -90,7 +90,6 @@ TEST(ShardCollectionType, ToBSONEmptyDefaultCollationNotIncluded) {
     shardCollType.setKeyPattern(kKeyPattern);
     shardCollType.setUnique(true);
 
-    shardCollType.setDefaultCollation(BSONObj());
     BSONObj obj = shardCollType.toBSON();
 
     ASSERT_FALSE(obj.hasField(ShardCollectionType::kDefaultCollationFieldName));