diff options
| author | Billy Donahue <billy.donahue@mongodb.com> | 2021-06-01 13:49:32 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-06-01 19:09:10 +0000 |
| commit | 28289208f069afd884625faafde5d0a14c25970f (patch) | |
| tree | 10598b28a5c06a7ba6c78354191ba8e252e1315a | |
| parent | 42c5d1c871b3760fe0ad4024706b0ed74a71ec22 (diff) | |
| download | mongo-28289208f069afd884625faafde5d0a14c25970f.tar.gz | |
SERVER-57329 fix long long to size_t narrowing
| -rw-r--r-- | src/mongo/db/pipeline/document_source_group.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/db/pipeline/document_source_group.cpp b/src/mongo/db/pipeline/document_source_group.cpp index 2bb19decafc..1cb4cd7d303 100644 --- a/src/mongo/db/pipeline/document_source_group.cpp +++ b/src/mongo/db/pipeline/document_source_group.cpp @@ -381,9 +381,8 @@ intrusive_ptr<DocumentSourceGroup> DocumentSourceGroup::create( const boost::intrusive_ptr<Expression>& groupByExpression, std::vector<AccumulationStatement> accumulationStatements, boost::optional<size_t> maxMemoryUsageBytes) { - size_t memoryBytes = maxMemoryUsageBytes ? *maxMemoryUsageBytes - : internalDocumentSourceGroupMaxMemoryBytes.load(); - intrusive_ptr<DocumentSourceGroup> groupStage(new DocumentSourceGroup(expCtx, memoryBytes)); + intrusive_ptr<DocumentSourceGroup> groupStage( + new DocumentSourceGroup(expCtx, maxMemoryUsageBytes)); groupStage->setIdExpression(groupByExpression); for (auto&& statement : accumulationStatements) { groupStage->addAccumulator(statement); @@ -398,8 +397,9 @@ DocumentSourceGroup::DocumentSourceGroup(const intrusive_ptr<ExpressionContext>& : DocumentSource(kStageName, expCtx), _doingMerge(false), _memoryTracker{expCtx->allowDiskUse && !expCtx->inMongos, - maxMemoryUsageBytes ? *maxMemoryUsageBytes - : internalDocumentSourceGroupMaxMemoryBytes.load()}, + maxMemoryUsageBytes + ? *maxMemoryUsageBytes + : static_cast<size_t>(internalDocumentSourceGroupMaxMemoryBytes.load())}, _initialized(false), _groups(expCtx->getValueComparator().makeUnorderedValueMap<Accumulators>()), _spilled(false) { |