diff options
| author | Daniel Gómez Ferro <daniel.gomezferro@mongodb.com> | 2021-11-26 14:39:47 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-12-02 09:08:59 +0000 |
| commit | a51938f6f77a6c4934c0cc91bca31cebb6af62e5 (patch) | |
| tree | c6ad3f87cc216930c8707fdb9c7d3d2cfaf084cb /src/mongo/db/auth | |
| parent | c5f47b7a04ce688b088c1373805e876b0debae66 (diff) | |
| download | mongo-a51938f6f77a6c4934c0cc91bca31cebb6af62e5.tar.gz | |
SERVER-60837 Remove CollectionUUID and OptionalCollectionUUID aliases
Diffstat (limited to 'src/mongo/db/auth')
| -rw-r--r-- | src/mongo/db/auth/auth_op_observer.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/db/auth/auth_op_observer.h | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/mongo/db/auth/auth_op_observer.cpp b/src/mongo/db/auth/auth_op_observer.cpp index 729493ed970..325b9f99fb4 100644 --- a/src/mongo/db/auth/auth_op_observer.cpp +++ b/src/mongo/db/auth/auth_op_observer.cpp @@ -164,7 +164,7 @@ void AuthOpObserver::postRenameCollection(OperationContext* const opCtx, const NamespaceString& fromCollection, const NamespaceString& toCollection, const UUID& uuid, - OptionalCollectionUUID dropTargetUUID, + const boost::optional<UUID>& dropTargetUUID, bool stayTemp) { const auto cmdNss = fromCollection.getCommandNS(); @@ -186,7 +186,7 @@ void AuthOpObserver::onRenameCollection(OperationContext* const opCtx, const NamespaceString& fromCollection, const NamespaceString& toCollection, const UUID& uuid, - OptionalCollectionUUID dropTargetUUID, + const boost::optional<UUID>& dropTargetUUID, std::uint64_t numRecords, bool stayTemp) { postRenameCollection(opCtx, fromCollection, toCollection, uuid, dropTargetUUID, stayTemp); diff --git a/src/mongo/db/auth/auth_op_observer.h b/src/mongo/db/auth/auth_op_observer.h index b921c67519f..5bf86445b7a 100644 --- a/src/mongo/db/auth/auth_op_observer.h +++ b/src/mongo/db/auth/auth_op_observer.h @@ -47,13 +47,13 @@ public: void onCreateIndex(OperationContext* opCtx, const NamespaceString& nss, - CollectionUUID uuid, + const UUID& uuid, BSONObj indexDoc, bool fromMigrate) final {} void onStartIndexBuild(OperationContext* opCtx, const NamespaceString& nss, - CollectionUUID collUUID, + const UUID& collUUID, const UUID& indexBuildUUID, const std::vector<BSONObj>& indexes, bool fromMigrate) final {} @@ -64,14 +64,14 @@ public: void onCommitIndexBuild(OperationContext* opCtx, const NamespaceString& nss, - CollectionUUID collUUID, + const UUID& collUUID, const UUID& indexBuildUUID, const std::vector<BSONObj>& indexes, bool fromMigrate) final {} void onAbortIndexBuild(OperationContext* opCtx, const NamespaceString& nss, - CollectionUUID collUUID, + const UUID& collUUID, const UUID& indexBuildUUID, const std::vector<BSONObj>& indexes, const Status& cause, @@ -99,7 +99,7 @@ public: void onInternalOpMessage(OperationContext* opCtx, const NamespaceString& nss, - OptionalCollectionUUID uuid, + const boost::optional<UUID>& uuid, const BSONObj& msgObj, const boost::optional<BSONObj> o2MsgObj, const boost::optional<repl::OpTime> preImageOpTime, @@ -141,7 +141,7 @@ public: const NamespaceString& fromCollection, const NamespaceString& toCollection, const UUID& uuid, - OptionalCollectionUUID dropTargetUUID, + const boost::optional<UUID>& dropTargetUUID, std::uint64_t numRecords, bool stayTemp) final; @@ -159,7 +159,7 @@ public: const NamespaceString& fromCollection, const NamespaceString& toCollection, const UUID& uuid, - OptionalCollectionUUID dropTargetUUID, + const boost::optional<UUID>& dropTargetUUID, std::uint64_t numRecords, bool stayTemp) final { return repl::OpTime(); @@ -168,7 +168,7 @@ public: const NamespaceString& fromCollection, const NamespaceString& toCollection, const UUID& uuid, - OptionalCollectionUUID dropTargetUUID, + const boost::optional<UUID>& dropTargetUUID, bool stayTemp) final; void onApplyOps(OperationContext* opCtx, const std::string& dbName, |