diff options
| author | Billy Donahue <billy.donahue@mongodb.com> | 2022-09-29 02:05:23 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-09-29 02:37:12 +0000 |
| commit | d3cc9f7fc4088dc8fa3f9fc7fe5f1d6d7c62cfa4 (patch) | |
| tree | 8d1b154a48af1473489bce4f0ab7f6fae279afe9 | |
| parent | 5cbe7f207d1abe694708bf729e4808a4a5413e60 (diff) | |
| download | mongo-d3cc9f7fc4088dc8fa3f9fc7fe5f1d6d7c62cfa4.tar.gz | |
SERVER-70079 Remove optional_util::setOrAdd
| -rw-r--r-- | src/mongo/db/s/resharding/resharding_metrics.cpp | 2 | ||||
| -rw-r--r-- | src/mongo/db/s/resharding/resharding_recipient_service.cpp | 8 | ||||
| -rw-r--r-- | src/mongo/util/optional_util.h | 11 |
3 files changed, 5 insertions, 16 deletions
diff --git a/src/mongo/db/s/resharding/resharding_metrics.cpp b/src/mongo/db/s/resharding/resharding_metrics.cpp index 7827ab4896d..4fe86f2c51c 100644 --- a/src/mongo/db/s/resharding/resharding_metrics.cpp +++ b/src/mongo/db/s/resharding/resharding_metrics.cpp @@ -73,7 +73,7 @@ Date_t readStartTime(const CommonReshardingMetadata& metadata, ClockSource* fall void ReshardingMetrics::ExternallyTrackedRecipientFields::accumulateFrom( const ReshardingOplogApplierProgress& progressDoc) { - using optional_util::setOrAdd; + auto setOrAdd = [](auto& opt, auto add) { opt = opt.value_or(0) + add; }; setOrAdd(insertsApplied, progressDoc.getInsertsApplied()); setOrAdd(updatesApplied, progressDoc.getUpdatesApplied()); setOrAdd(deletesApplied, progressDoc.getDeletesApplied()); diff --git a/src/mongo/db/s/resharding/resharding_recipient_service.cpp b/src/mongo/db/s/resharding/resharding_recipient_service.cpp index 012a70221ea..00bc2433322 100644 --- a/src/mongo/db/s/resharding/resharding_recipient_service.cpp +++ b/src/mongo/db/s/resharding/resharding_recipient_service.cpp @@ -1174,14 +1174,15 @@ void ReshardingRecipientService::RecipientStateMachine::_restoreMetrics( std::vector<std::pair<ShardId, boost::optional<ReshardingOplogApplierProgress>>> progressDocList; for (const auto& donor : _donorShards) { + auto setOrAdd = [](auto& opt, auto add) { opt = opt.value_or(0) + add; }; { AutoGetCollection oplogBufferColl(opCtx.get(), resharding::getLocalOplogBufferNamespace( _metadata.getSourceUUID(), donor.getShardId()), MODE_IS); if (oplogBufferColl) { - optional_util::setOrAdd(externalMetrics.oplogEntriesFetched, - oplogBufferColl->numRecords(opCtx.get())); + setOrAdd(externalMetrics.oplogEntriesFetched, + oplogBufferColl->numRecords(opCtx.get())); } } @@ -1201,8 +1202,7 @@ void ReshardingRecipientService::RecipientStateMachine::_restoreMetrics( if (!result.isEmpty()) { progressDoc = ReshardingOplogApplierProgress::parse( IDLParserContext("resharding-recipient-service-progress-doc"), result); - optional_util::setOrAdd(externalMetrics.oplogEntriesApplied, - progressDoc->getNumEntriesApplied()); + setOrAdd(externalMetrics.oplogEntriesApplied, progressDoc->getNumEntriesApplied()); } } diff --git a/src/mongo/util/optional_util.h b/src/mongo/util/optional_util.h index e1820af7320..dca4ab7b7c4 100644 --- a/src/mongo/util/optional_util.h +++ b/src/mongo/util/optional_util.h @@ -139,15 +139,4 @@ template <typename T, std::enable_if_t<canStreamWithExtension<T>, int> = 0> Extension(const T& t)->Extension<T>; } // namespace optional_io - -namespace optional_util { -template <typename T, typename U> -void setOrAdd(boost::optional<T>& counter, U value) { - if (!counter) { - counter = value; - return; - } - counter = *counter + value; -} -} // namespace optional_util } // namespace mongo |