diff options
author | Maria van Keulen <maria@mongodb.com> | 2017-10-09 14:48:46 -0400 |
---|---|---|
committer | Maria van Keulen <maria@mongodb.com> | 2017-10-09 14:49:16 -0400 |
commit | 9eba349099bdc58f3ad4e55aa2e846d6d0244f41 (patch) | |
tree | 678f5a046fbbb5bab30c70b608206957c32df6ac /src/mongo/db/repl/storage_interface_mock.h | |
parent | 29342abd41293c78104c288cb1c4807df94d8de2 (diff) | |
download | mongo-9eba349099bdc58f3ad4e55aa2e846d6d0244f41.tar.gz |
Revert "SERVER-30131 Ensure collections on local have UUIDs"
This reverts commit 84690cb878db1b231c00d3c9fcb0005ca7cb6361.
Diffstat (limited to 'src/mongo/db/repl/storage_interface_mock.h')
-rw-r--r-- | src/mongo/db/repl/storage_interface_mock.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/mongo/db/repl/storage_interface_mock.h b/src/mongo/db/repl/storage_interface_mock.h index 9c88532781f..f0c14a61b9e 100644 --- a/src/mongo/db/repl/storage_interface_mock.h +++ b/src/mongo/db/repl/storage_interface_mock.h @@ -122,9 +122,6 @@ public: BoundInclusion boundInclusion, std::size_t limit)>; using IsAdminDbValidFn = stdx::function<Status(OperationContext* opCtx)>; - using GetCollectionUUIDFn = stdx::function<StatusWith<OptionalCollectionUUID>( - OperationContext* opCtx, const NamespaceString& nss)>; - using UpgradeUUIDSchemaVersionNonReplicatedFn = stdx::function<Status(OperationContext* opCtx)>; StorageInterfaceMock() = default; @@ -256,15 +253,6 @@ public: return 0; } - StatusWith<OptionalCollectionUUID> getCollectionUUID(OperationContext* opCtx, - const NamespaceString& nss) override { - return getCollectionUUIDFn(opCtx, nss); - } - - Status upgradeUUIDSchemaVersionNonReplicated(OperationContext* opCtx) override { - return upgradeUUIDSchemaVersionNonReplicatedFn(opCtx); - } - void setStableTimestamp(ServiceContext* serviceCtx, SnapshotName snapshotName) override; void setInitialDataTimestamp(ServiceContext* serviceCtx, SnapshotName snapshotName) override; @@ -342,15 +330,6 @@ public: IsAdminDbValidFn isAdminDbValidFn = [](OperationContext*) { return Status{ErrorCodes::IllegalOperation, "IsAdminDbValidFn not implemented."}; }; - GetCollectionUUIDFn getCollectionUUIDFn = []( - OperationContext* opCtx, const NamespaceString& nss) -> StatusWith<OptionalCollectionUUID> { - return Status{ErrorCodes::IllegalOperation, "GetCollectionUUIDFn not implemented."}; - }; - UpgradeUUIDSchemaVersionNonReplicatedFn upgradeUUIDSchemaVersionNonReplicatedFn = - [](OperationContext* opCtx) -> Status { - return Status{ErrorCodes::IllegalOperation, - "UpgradeUUIDSchemaVersionNonReplicatedFn not implemented."}; - }; private: mutable stdx::mutex _mutex; @@ -358,8 +337,6 @@ private: bool _rbidInitialized = false; SnapshotName _stableTimestamp = SnapshotName::min(); SnapshotName _initialDataTimestamp = SnapshotName::min(); - OptionalCollectionUUID _uuid; - bool _schemaUpgraded; }; } // namespace repl |