| William A. Kennington III | b95905d | 2021-06-02 12:40:56 -0700 | [diff] [blame] | 1 | From 6fdb2d304e05a17e57b2efd7f8252794a8722dbe Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 1 Jun 2021 08:25:36 -0700 |
| 4 | Subject: [PATCH] Use explicit typecast to size_t |
| 5 | |
| 6 | maxMemoryUsageBytes is size_t type which may not match long long value |
| 7 | internalDocumentSourceGroupMaxMemoryBytes.load() returns, so typecast it |
| 8 | to avoid narrowing warning from clang |
| 9 | |
| 10 | document_source_group.cpp:378:22: error: non-constant-expression cannot be narrowed from type 'long long' to 'size_t' (aka 'unsigned int') in initializer list [-Wc++11-narrowing] |
| 11 | maxMemoryUsageBytes ? *maxMemoryUsageBytes |
| 12 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 13 | |
| 14 | Upstream-Status: Submitted [https://github.com/mongodb/mongo/pull/1405] |
| 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 16 | --- |
| 17 | src/mongo/db/pipeline/document_source_group.cpp | 2 +- |
| 18 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 19 | |
| 20 | diff --git a/src/mongo/db/pipeline/document_source_group.cpp b/src/mongo/db/pipeline/document_source_group.cpp |
| 21 | index c7bf44e72e..a52906a940 100644 |
| 22 | --- a/src/mongo/db/pipeline/document_source_group.cpp |
| 23 | +++ b/src/mongo/db/pipeline/document_source_group.cpp |
| 24 | @@ -376,7 +376,7 @@ DocumentSourceGroup::DocumentSourceGroup(const intrusive_ptr<ExpressionContext>& |
| 25 | _doingMerge(false), |
| 26 | _memoryTracker{pExpCtx->allowDiskUse && !pExpCtx->inMongos, |
| 27 | maxMemoryUsageBytes ? *maxMemoryUsageBytes |
| 28 | - : internalDocumentSourceGroupMaxMemoryBytes.load()}, |
| 29 | + : (size_t)internalDocumentSourceGroupMaxMemoryBytes.load()}, |
| 30 | _initialized(false), |
| 31 | _groups(pExpCtx->getValueComparator().makeUnorderedValueMap<Accumulators>()), |
| 32 | _spilled(false) { |
| 33 | -- |
| 34 | 2.31.1 |
| 35 | |