summaryrefslogtreecommitdiff
path: root/src/mongo/db/exec/sort.cpp
diff options
context:
space:
mode:
authorMark Benvenuto <mark.benvenuto@mongodb.com>2017-01-05 10:56:41 -0500
committerMark Benvenuto <mark.benvenuto@mongodb.com>2017-01-05 10:56:41 -0500
commitba55f2573976ba570c2319bce9b598f0a660445f (patch)
tree7fc8adb43798e03517933c4e575dcbebe8f42087 /src/mongo/db/exec/sort.cpp
parentf5fbf31650eea903edbbcd2f9ef042b4c39e2ecb (diff)
downloadmongo-ba55f2573976ba570c2319bce9b598f0a660445f.tar.gz
SERVER-25932 Make MONGO_EXPORT_SERVER_PARAMETER use AtomicWord instead of std::atomic
Diffstat (limited to 'src/mongo/db/exec/sort.cpp')
-rw-r--r--src/mongo/db/exec/sort.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/exec/sort.cpp b/src/mongo/db/exec/sort.cpp
index 91dabd1ce46..2fd40f0efb2 100644
--- a/src/mongo/db/exec/sort.cpp
+++ b/src/mongo/db/exec/sort.cpp
@@ -101,7 +101,7 @@ bool SortStage::isEOF() {
}
PlanStage::StageState SortStage::doWork(WorkingSetID* out) {
- const size_t maxBytes = static_cast<size_t>(internalQueryExecMaxBlockingSortBytes);
+ const size_t maxBytes = static_cast<size_t>(internalQueryExecMaxBlockingSortBytes.load());
if (_memUsage > maxBytes) {
mongoutils::str::stream ss;
ss << "Sort operation used more than the maximum " << maxBytes
@@ -219,7 +219,7 @@ void SortStage::doInvalidate(OperationContext* txn, const RecordId& dl, Invalida
unique_ptr<PlanStageStats> SortStage::getStats() {
_commonStats.isEOF = isEOF();
- const size_t maxBytes = static_cast<size_t>(internalQueryExecMaxBlockingSortBytes);
+ const size_t maxBytes = static_cast<size_t>(internalQueryExecMaxBlockingSortBytes.load());
_specificStats.memLimit = maxBytes;
_specificStats.memUsage = _memUsage;
_specificStats.limit = _limit;