diff options
Diffstat (limited to 'src/mongo/db/shard_role.h')
| -rw-r--r-- | src/mongo/db/shard_role.h | 48 |
1 files changed, 10 insertions, 38 deletions
diff --git a/src/mongo/db/shard_role.h b/src/mongo/db/shard_role.h index 71853124a5f..866fd91ebe2 100644 --- a/src/mongo/db/shard_role.h +++ b/src/mongo/db/shard_role.h @@ -44,15 +44,18 @@ namespace mongo { */ struct CollectionOrViewAcquisitionRequest { /** - * Overload, which acquires a collection by NSS, ignoring the current UUID mapping. + * Overload, which acquires a collection by NSS or DB/UUID, without imposing an expected + * relationship between NSS and UUID. */ CollectionOrViewAcquisitionRequest( - NamespaceString nss, + NamespaceStringOrUUID nssOrUUID, PlacementConcern placementConcern, repl::ReadConcernArgs readConcern, AcquisitionPrerequisites::OperationType operationType, AcquisitionPrerequisites::ViewMode viewMode = AcquisitionPrerequisites::kCanBeView) - : nss(nss), + : nss(nssOrUUID.nss()), + dbname(nssOrUUID.dbName()), + uuid(nssOrUUID.uuid()), placementConcern(placementConcern), readConcern(readConcern), operationType(operationType), @@ -77,24 +80,6 @@ struct CollectionOrViewAcquisitionRequest { viewMode(viewMode) {} /** - * Overload, which acquires a collection by NSS or DB/UUID, without imposing an expected - * relationship between NSS and UUID. - */ - CollectionOrViewAcquisitionRequest( - NamespaceStringOrUUID nssOrUUID, - PlacementConcern placementConcern, - repl::ReadConcernArgs readConcern, - AcquisitionPrerequisites::OperationType operationType, - AcquisitionPrerequisites::ViewMode viewMode = AcquisitionPrerequisites::kCanBeView) - : nss(nssOrUUID.nss()), - dbname(nssOrUUID.dbName()), - uuid(nssOrUUID.uuid()), - placementConcern(placementConcern), - readConcern(readConcern), - operationType(operationType), - viewMode(viewMode) {} - - /** * Infers the placement and read concerns from the OperationShardingState and ReadConcern values * on the OperationContext. */ @@ -118,13 +103,14 @@ struct CollectionOrViewAcquisitionRequest { struct CollectionAcquisitionRequest : public CollectionOrViewAcquisitionRequest { /** - * Overload, which acquires a collection by NSS, ignoring the current UUID mapping. + * Overload, which acquires a collection by NSS or DB/UUID, without imposing an expected + * relationship between NSS and UUID. */ - CollectionAcquisitionRequest(NamespaceString nss, + CollectionAcquisitionRequest(NamespaceStringOrUUID nssOrUUID, PlacementConcern placementConcern, repl::ReadConcernArgs readConcern, AcquisitionPrerequisites::OperationType operationType) - : CollectionOrViewAcquisitionRequest(nss, + : CollectionOrViewAcquisitionRequest(nssOrUUID, placementConcern, readConcern, operationType, @@ -147,20 +133,6 @@ struct CollectionAcquisitionRequest : public CollectionOrViewAcquisitionRequest AcquisitionPrerequisites::kMustBeCollection) {} /** - * Overload, which acquires a collection by NSS or DB/UUID, without imposing an expected - * relationship between NSS and UUID. - */ - CollectionAcquisitionRequest(NamespaceStringOrUUID nssOrUUID, - PlacementConcern placementConcern, - repl::ReadConcernArgs readConcern, - AcquisitionPrerequisites::OperationType operationType) - : CollectionOrViewAcquisitionRequest(nssOrUUID, - placementConcern, - readConcern, - operationType, - AcquisitionPrerequisites::kMustBeCollection) {} - - /** * Infers the placement and read concerns from the OperationShardingState and ReadConcern values * on the OperationContext. */ |