Revert "SERVER-65209 Skeleton code to create change collection."

This reverts commit f76ed79b1fe31c0f22bad3590699c2658638681d.

11 files changed, 41 insertions, 290 deletions

diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 1cdea6aa03b..ce6d1d91268 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -522,19 +522,6 @@ env.Library(
 )
 
 env.Library(
-    target='change_stream_change_collection_manager',
-    source=[
-        'change_stream_change_collection_manager.cpp'
-    ],
-    LIBDEPS_PRIVATE=[
-        '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
-        "$BUILD_DIR/mongo/db/catalog/clustered_collection_options",
-        '$BUILD_DIR/mongo/db/dbhelpers',
-        '$BUILD_DIR/mongo/db/service_context',
-    ]
-)
-
-env.Library(
     target='write_block_bypass',
     source=[
         'write_block_bypass.cpp',
@@ -2514,7 +2501,6 @@ env.Library(
         # please add that library as a private libdep of
         # mongod_initializers.
         '$BUILD_DIR/mongo/client/clientdriver_minimal',
-        '$BUILD_DIR/mongo/db/change_stream_change_collection_manager',
         '$BUILD_DIR/mongo/db/change_stream_options_manager',
         '$BUILD_DIR/mongo/db/pipeline/change_stream_expired_pre_image_remover',
         '$BUILD_DIR/mongo/idl/cluster_server_parameter',
diff --git a/src/mongo/db/catalog/create_collection.cpp b/src/mongo/db/catalog/create_collection.cpp
index de921ee027b..ffa70dc447a 100644
--- a/src/mongo/db/catalog/create_collection.cpp
+++ b/src/mongo/db/catalog/create_collection.cpp
@@ -540,6 +540,46 @@ Status _createCollection(OperationContext* opCtx,
     });
 }
 
+/**
+ * Creates the collection or the view as described by 'options'.
+ */
+Status createCollection(OperationContext* opCtx,
+                        const NamespaceString& ns,
+                        const CollectionOptions& options,
+                        const boost::optional<BSONObj>& idIndex) {
+    auto status = userAllowedCreateNS(opCtx, ns);
+    if (!status.isOK()) {
+        return status;
+    }
+
+    if (options.isView()) {
+        uassert(ErrorCodes::OperationNotSupportedInTransaction,
+                str::stream() << "Cannot create a view in a multi-document "
+                                 "transaction.",
+                !opCtx->inMultiDocumentTransaction());
+        uassert(ErrorCodes::Error(6026500),
+                "The 'clusteredIndex' option is not supported with views",
+                !options.clusteredIndex);
+
+        return _createView(opCtx, ns, options);
+    } else if (options.timeseries && !ns.isTimeseriesBucketsCollection()) {
+        // This helper is designed for user-created time-series collections on primaries. If a
+        // time-series buckets collection is created explicitly or during replication, treat this as
+        // a normal collection creation.
+        uassert(ErrorCodes::OperationNotSupportedInTransaction,
+                str::stream()
+                    << "Cannot create a time-series collection in a multi-document transaction.",
+                !opCtx->inMultiDocumentTransaction());
+        return _createTimeseries(opCtx, ns, options);
+    } else {
+        uassert(ErrorCodes::OperationNotSupportedInTransaction,
+                str::stream() << "Cannot create system collection " << ns
+                              << " within a transaction.",
+                !opCtx->inMultiDocumentTransaction() || !ns.isSystem());
+        return _createCollection(opCtx, ns, options, idIndex);
+    }
+}
+
 CollectionOptions clusterByDefaultIfNecessary(const NamespaceString& nss,
                                               CollectionOptions collectionOptions,
                                               const boost::optional<BSONObj>& idIndex) {
@@ -813,41 +853,4 @@ Status createCollectionForApplyOps(OperationContext* opCtx,
         opCtx, newCollName, newCmd, idIndex, CollectionOptions::parseForStorage);
 }
 
-Status createCollection(OperationContext* opCtx,
-                        const NamespaceString& ns,
-                        const CollectionOptions& options,
-                        const boost::optional<BSONObj>& idIndex) {
-    auto status = userAllowedCreateNS(opCtx, ns);
-    if (!status.isOK()) {
-        return status;
-    }
-
-    if (options.isView()) {
-        uassert(ErrorCodes::OperationNotSupportedInTransaction,
-                str::stream() << "Cannot create a view in a multi-document "
-                                 "transaction.",
-                !opCtx->inMultiDocumentTransaction());
-        uassert(ErrorCodes::Error(6026500),
-                "The 'clusteredIndex' option is not supported with views",
-                !options.clusteredIndex);
-
-        return _createView(opCtx, ns, options);
-    } else if (options.timeseries && !ns.isTimeseriesBucketsCollection()) {
-        // This helper is designed for user-created time-series collections on primaries. If a
-        // time-series buckets collection is created explicitly or during replication, treat this as
-        // a normal collection creation.
-        uassert(ErrorCodes::OperationNotSupportedInTransaction,
-                str::stream()
-                    << "Cannot create a time-series collection in a multi-document transaction.",
-                !opCtx->inMultiDocumentTransaction());
-        return _createTimeseries(opCtx, ns, options);
-    } else {
-        uassert(ErrorCodes::OperationNotSupportedInTransaction,
-                str::stream() << "Cannot create system collection " << ns
-                              << " within a transaction.",
-                !opCtx->inMultiDocumentTransaction() || !ns.isSystem());
-        return _createCollection(opCtx, ns, options, idIndex);
-    }
-}
-
 }  // namespace mongo
diff --git a/src/mongo/db/catalog/create_collection.h b/src/mongo/db/catalog/create_collection.h
index 694f4c6ed36..ee373c7ef7b 100644
--- a/src/mongo/db/catalog/create_collection.h
+++ b/src/mongo/db/catalog/create_collection.h
@@ -55,15 +55,6 @@ Status createCollection(OperationContext* opCtx,
                         const NamespaceString& ns,
                         const CreateCommand& cmd);
 
-
-/**
- * Creates the collection or the view as described by 'options'.
- */
-Status createCollection(OperationContext* opCtx,
-                        const NamespaceString& ns,
-                        const CollectionOptions& options,
-                        const boost::optional<BSONObj>& idIndex);
-
 /**
  * Creates the change stream pre-images collection. The collection is clustered by the primary key,
  * _id.
diff --git a/src/mongo/db/change_stream_change_collection_manager.cpp b/src/mongo/db/change_stream_change_collection_manager.cpp
deleted file mode 100644
index 481cf6e664d..00000000000
--- a/src/mongo/db/change_stream_change_collection_manager.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- *    Copyright (C) 2022-present MongoDB, Inc.
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the Server Side Public License, version 1,
- *    as published by MongoDB, Inc.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    Server Side Public License for more details.
- *
- *    You should have received a copy of the Server Side Public License
- *    along with this program. If not, see
- *    <http://www.mongodb.com/licensing/server-side-public-license>.
- *
- *    As a special exception, the copyright holders give permission to link the
- *    code of portions of this program with the OpenSSL library under certain
- *    conditions as described in each individual source file and distribute
- *    linked combinations including the program with the OpenSSL library. You
- *    must comply with the Server Side Public License in all respects for
- *    all of the code used other than as permitted herein. If you modify file(s)
- *    with this exception, you may extend this exception to your version of the
- *    file(s), but you are not obligated to do so. If you do not wish to do so,
- *    delete this exception statement from your version. If you delete this
- *    exception statement from all source files in the program, then also delete
- *    it in the license file.
- */
-
-#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kQuery
-
-#include "mongo/platform/basic.h"
-
-#include "mongo/db/change_stream_change_collection_manager.h"
-
-#include "mongo/db/catalog/clustered_collection_util.h"
-#include "mongo/db/catalog/coll_mod.h"
-#include "mongo/db/catalog/create_collection.h"
-#include "mongo/db/catalog/drop_collection.h"
-#include "mongo/db/namespace_string.h"
-#include "mongo/logv2/log.h"
-
-namespace mongo {
-namespace {
-const auto getChangeCollectionManager =
-    ServiceContext::declareDecoration<boost::optional<ChangeStreamChangeCollectionManager>>();
-}  // namespace
-
-ChangeStreamChangeCollectionManager& ChangeStreamChangeCollectionManager::get(
-    ServiceContext* service) {
-    return *getChangeCollectionManager(service);
-}
-
-ChangeStreamChangeCollectionManager& ChangeStreamChangeCollectionManager::get(
-    OperationContext* opCtx) {
-    return *getChangeCollectionManager(opCtx->getServiceContext());
-}
-
-void ChangeStreamChangeCollectionManager::create(ServiceContext* service) {
-    getChangeCollectionManager(service).emplace(service);
-}
-
-Status ChangeStreamChangeCollectionManager::createChangeCollection(
-    OperationContext* opCtx, boost::optional<TenantId> tenantId) {
-    // TODO: SERVER-65950 create or update the change collection for a particular tenant.
-    const NamespaceString nss{NamespaceString::kConfigDb,
-                              NamespaceString::kChangeStreamChangeCollection};
-
-    // Make the change collection clustered by '_id'. The '_id' field will have the same value as
-    // the 'ts' field of the oplog.
-    CollectionOptions changeCollectionOptions;
-    changeCollectionOptions.clusteredIndex.emplace(clustered_util::makeDefaultClusteredIdIndex());
-
-    auto status = createCollection(opCtx, nss, changeCollectionOptions, BSONObj());
-    if (status.code() == ErrorCodes::NamespaceExists) {
-        return Status(ErrorCodes::Error::OK, "");
-    }
-
-    return status;
-}
-
-Status ChangeStreamChangeCollectionManager::dropChangeCollection(
-    OperationContext* opCtx, boost::optional<TenantId> tenantId) {
-    // TODO: SERVER-65950 remove the change collection for a particular tenant.
-    const NamespaceString nss{NamespaceString::kConfigDb,
-                              NamespaceString::kChangeStreamChangeCollection};
-    DropReply dropReply;
-    return dropCollection(
-        opCtx, nss, &dropReply, DropCollectionSystemCollectionMode::kAllowSystemCollectionDrops);
-}
-
-Status ChangeStreamChangeCollectionManager::insertDocumentsToChangeCollection(
-    OperationContext* opCtx,
-    boost::optional<TenantId> tenantId,
-    std::vector<Record>* records,
-    const std::vector<Timestamp>& timestamps) {
-    // TODO SERVER-65210 add code to insert to the change collection in the primaries.
-    return Status(ErrorCodes::OK, "");
-}
-
-}  // namespace mongo
diff --git a/src/mongo/db/change_stream_change_collection_manager.h b/src/mongo/db/change_stream_change_collection_manager.h
deleted file mode 100644
index b4ad0e25c50..00000000000
--- a/src/mongo/db/change_stream_change_collection_manager.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- *    Copyright (C) 2022-present MongoDB, Inc.
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the Server Side Public License, version 1,
- *    as published by MongoDB, Inc.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    Server Side Public License for more details.
- *
- *    You should have received a copy of the Server Side Public License
- *    along with this program. If not, see
- *    <http://www.mongodb.com/licensing/server-side-public-license>.
- *
- *    As a special exception, the copyright holders give permission to link the
- *    code of portions of this program with the OpenSSL library under certain
- *    conditions as described in each individual source file and distribute
- *    linked combinations including the program with the OpenSSL library. You
- *    must comply with the Server Side Public License in all respects for
- *    all of the code used other than as permitted herein. If you modify file(s)
- *    with this exception, you may extend this exception to your version of the
- *    file(s), but you are not obligated to do so. If you do not wish to do so,
- *    delete this exception statement from your version. If you delete this
- *    exception statement from all source files in the program, then also delete
- *    it in the license file.
- */
-
-#pragma once
-
-#include "mongo/db/catalog/collection_catalog.h"
-#include "mongo/db/operation_context.h"
-#include "mongo/db/service_context.h"
-
-namespace mongo {
-
-/**
- * Manages the creation, deletion and insertion lifecycle of the change collection.
- */
-class ChangeStreamChangeCollectionManager {
-public:
-    explicit ChangeStreamChangeCollectionManager(ServiceContext* service) {}
-
-    ~ChangeStreamChangeCollectionManager() = default;
-
-    /**
-     * Creates an instance of the class using the service-context.
-     */
-    static void create(ServiceContext* service);
-
-    /**
-     * Gets the instance of the class using the service context.
-     */
-    static ChangeStreamChangeCollectionManager& get(ServiceContext* service);
-
-    /**
-     * Gets the instance of the class using the operation context.
-     */
-    static ChangeStreamChangeCollectionManager& get(OperationContext* opCtx);
-
-    /**
-     * Creates a change collection for the specified tenant, if it doesn't exist. Returns Status::OK
-     * if the change collection already exists.
-     *
-     * TODO: SERVER-65950 make tenantId field mandatory.
-     */
-    Status createChangeCollection(OperationContext* opCtx, boost::optional<TenantId> tenantId);
-
-    /**
-     * Deletes the change collection for the specified tenant, if it already exist.
-     *
-     * TODO: SERVER-65950 make tenantId field mandatory.
-     */
-    Status dropChangeCollection(OperationContext* opCtx, boost::optional<TenantId> tenantId);
-
-    /**
-     * Inserts documents to the change collection for the specified tenant. The parameter 'records'
-     * is a vector of oplog records and the parameter 'timestamps' is a vector for respective
-     * timestamp for each oplog record.
-     *
-     * TODO: SERVER-65950 make tenantId field mandatory.
-     */
-    Status insertDocumentsToChangeCollection(OperationContext* opCtx,
-                                             boost::optional<TenantId> tenantId,
-                                             std::vector<Record>* records,
-                                             const std::vector<Timestamp>& timestamps);
-};
-
-}  // namespace mongo
diff --git a/src/mongo/db/mongod_main.cpp b/src/mongo/db/mongod_main.cpp
index be1bd6fc294..2f8a439bb10 100644
--- a/src/mongo/db/mongod_main.cpp
+++ b/src/mongo/db/mongod_main.cpp
@@ -60,7 +60,6 @@
 #include "mongo/db/catalog/health_log.h"
 #include "mongo/db/catalog/index_catalog.h"
 #include "mongo/db/catalog/index_key_validate.h"
-#include "mongo/db/change_stream_change_collection_manager.h"
 #include "mongo/db/change_stream_options_manager.h"
 #include "mongo/db/client.h"
 #include "mongo/db/client_metadata_propagation_egress_hook.h"
@@ -1543,8 +1542,6 @@ int mongod_main(int argc, char* argv[]) {
     ReadWriteConcernDefaults::create(service, readWriteConcernDefaultsCacheLookupMongoD);
     ChangeStreamOptionsManager::create(service);
 
-    ChangeStreamChangeCollectionManager::create(service);
-
 #if defined(_WIN32)
     if (ntservice::shouldStartService()) {
         ntservice::startService();
diff --git a/src/mongo/db/namespace_string.cpp b/src/mongo/db/namespace_string.cpp
index 525dd9c6724..26f9249996e 100644
--- a/src/mongo/db/namespace_string.cpp
+++ b/src/mongo/db/namespace_string.cpp
@@ -243,10 +243,6 @@ bool NamespaceString::isLegalClientSystemNS(
         return true;
     }
 
-    if (isChangeStreamChangeCollection()) {
-        return true;
-    }
-
     return false;
 }
 
@@ -404,10 +400,6 @@ bool NamespaceString::isChangeStreamPreImagesCollection() const {
     return ns() == kChangeStreamPreImagesNamespace.ns();
 }
 
-bool NamespaceString::isChangeStreamChangeCollection() const {
-    return db() == kConfigDb && coll() == kChangeStreamChangeCollection;
-}
-
 bool NamespaceString::isConfigImagesCollection() const {
     return ns() == kConfigImagesNamespace.ns();
 }
@@ -432,8 +424,7 @@ NamespaceString NamespaceString::getTimeseriesViewNamespace() const {
 }
 
 bool NamespaceString::isImplicitlyReplicated() const {
-    if (isChangeStreamPreImagesCollection() || isConfigImagesCollection() || isChangeCollection() ||
-        isChangeStreamChangeCollection()) {
+    if (isChangeStreamPreImagesCollection() || isConfigImagesCollection() || isChangeCollection()) {
         // Implicitly replicated namespaces are replicated, although they only replicate a subset of
         // writes.
         invariant(isReplicated());
diff --git a/src/mongo/db/namespace_string.h b/src/mongo/db/namespace_string.h
index 692d768dcca..38606ae3d4f 100644
--- a/src/mongo/db/namespace_string.h
+++ b/src/mongo/db/namespace_string.h
@@ -76,9 +76,6 @@ public:
     // Name for the system views collection
     static constexpr StringData kSystemDotViewsCollectionName = "system.views"_sd;
 
-    // Name for the change stream change collection.
-    static constexpr StringData kChangeStreamChangeCollection = "system.change_collection"_sd;
-
     // Names of privilege document collections
     static constexpr StringData kSystemUsers = "system.users"_sd;
     static constexpr StringData kSystemRoles = "system.roles"_sd;
@@ -459,11 +456,6 @@ public:
     bool isChangeStreamPreImagesCollection() const;
 
     /**
-     * Returns whether the specified namespace is config.system.changeCollection.
-     */
-    bool isChangeStreamChangeCollection() const;
-
-    /**
      * Returns whether the specified namespace is config.image_collection.
      */
     bool isConfigImagesCollection() const;
diff --git a/src/mongo/db/query/query_feature_flags.idl b/src/mongo/db/query/query_feature_flags.idl
index f9b7ddb8ec8..87379efcf87 100644
--- a/src/mongo/db/query/query_feature_flags.idl
+++ b/src/mongo/db/query/query_feature_flags.idl
@@ -146,8 +146,3 @@ feature_flags:
       description: "Enables creation of a new columnstore index type"
       cpp_varname: gFeatureFlagColumnstoreIndexes
       default: false
-
-    featureFlagServerlessChangeStreams:
-      description: "Feature flag to enable reading change events from the change collection rather than the oplog"
-      cpp_varname: gFeatureFlagServerlessChangeStreams
-      default: false
\ No newline at end of file
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index f12237cf395..b7c4f4c2a88 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -1506,7 +1506,6 @@ env.Library(
     LIBDEPS_PRIVATE=[
         '$BUILD_DIR/mongo/db/catalog/catalog_helpers',
         '$BUILD_DIR/mongo/db/catalog/local_oplog_info',
-        '$BUILD_DIR/mongo/db/change_stream_change_collection_manager',
         '$BUILD_DIR/mongo/db/commands/mongod_fcv',
         '$BUILD_DIR/mongo/db/commands/rwc_defaults_commands',
         '$BUILD_DIR/mongo/db/index_builds_coordinator_interface',
diff --git a/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp b/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp
index 25982c4e638..a46671d6c62 100644
--- a/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp
+++ b/src/mongo/db/repl/replication_coordinator_external_state_impl.cpp
@@ -45,7 +45,6 @@
 #include "mongo/db/catalog/database.h"
 #include "mongo/db/catalog/database_holder.h"
 #include "mongo/db/catalog/local_oplog_info.h"
-#include "mongo/db/change_stream_change_collection_manager.h"
 #include "mongo/db/client.h"
 #include "mongo/db/commands/feature_compatibility_version.h"
 #include "mongo/db/commands/rwc_defaults_commands_gen.h"
@@ -557,17 +556,6 @@ OpTime ReplicationCoordinatorExternalStateImpl::onTransitionToPrimary(OperationC
         createChangeStreamPreImagesCollection(opCtx);
     }
 
-    // TODO: SERVER-65948 move the change collection creation logic from here to the PM-2502 hooks.
-    // The change collection will be created when the change stream is enabled.
-    if (::mongo::feature_flags::gFeatureFlagServerlessChangeStreams.isEnabled(
-            serverGlobalParams.featureCompatibility)) {
-        auto& changeCollectionManager = ChangeStreamChangeCollectionManager::get(opCtx);
-        auto status = changeCollectionManager.createChangeCollection(opCtx, boost::none);
-        if (!status.isOK()) {
-            fassert(6520900, status);
-        }
-    }
-
     serverGlobalParams.validateFeaturesAsPrimary.store(true);
 
     return opTimeToReturn;