summaryrefslogtreecommitdiff
path: root/src/mongo/dbtests
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/dbtests')
-rw-r--r--src/mongo/dbtests/plan_ranking.cpp14
-rw-r--r--src/mongo/dbtests/query_stage_sort.cpp2
2 files changed, 9 insertions, 7 deletions
diff --git a/src/mongo/dbtests/plan_ranking.cpp b/src/mongo/dbtests/plan_ranking.cpp
index 18f4795f13c..c425164beca 100644
--- a/src/mongo/dbtests/plan_ranking.cpp
+++ b/src/mongo/dbtests/plan_ranking.cpp
@@ -61,7 +61,7 @@ extern AtomicWord<bool> internalQueryForceIntersectionPlans;
extern AtomicWord<bool> internalQueryPlannerEnableHashIntersection;
-extern AtomicWord<int> internalQueryExecMaxBlockingSortBytes;
+extern AtomicWord<int> internalQueryMaxBlockingSortMemoryUsageBytes;
extern AtomicWord<int> internalQueryPlanEvaluationMaxResults;
@@ -189,17 +189,19 @@ class PlanRankingPreferNonFailed : public PlanRankingTestBase {
public:
PlanRankingPreferNonFailed()
: PlanRankingTestBase(),
- _internalQueryExecMaxBlockingSortBytes(internalQueryExecMaxBlockingSortBytes.load()),
+ _internalQueryMaxBlockingSortMemoryUsageBytes(
+ internalQueryMaxBlockingSortMemoryUsageBytes.load()),
// We set the max results to decrease the amount of work that is done during the trial
// period. We want it to do less work than there are docs to ensure that no plan reaches
// EOF.
_internalQueryPlanEvaluationMaxResults(internalQueryPlanEvaluationMaxResults.load()) {
- internalQueryExecMaxBlockingSortBytes.store(10);
+ internalQueryMaxBlockingSortMemoryUsageBytes.store(10);
internalQueryPlanEvaluationMaxResults.store(100);
}
~PlanRankingPreferNonFailed() {
- internalQueryExecMaxBlockingSortBytes.store(_internalQueryExecMaxBlockingSortBytes);
+ internalQueryMaxBlockingSortMemoryUsageBytes.store(
+ _internalQueryMaxBlockingSortMemoryUsageBytes);
internalQueryPlanEvaluationMaxResults.store(_internalQueryPlanEvaluationMaxResults);
}
@@ -253,9 +255,9 @@ public:
}
private:
- // Holds the value of global "internalQueryExecMaxBlockingSortBytes" setParameter flag.
+ // Holds the value of global "internalQueryMaxBlockingSortMemoryUsageBytes" setParameter flag.
// Restored at end of test invocation regardless of test result.
- int _internalQueryExecMaxBlockingSortBytes;
+ int _internalQueryMaxBlockingSortMemoryUsageBytes;
int _internalQueryPlanEvaluationMaxResults;
};
diff --git a/src/mongo/dbtests/query_stage_sort.cpp b/src/mongo/dbtests/query_stage_sort.cpp
index 3e52f8e622a..69f8582b54c 100644
--- a/src/mongo/dbtests/query_stage_sort.cpp
+++ b/src/mongo/dbtests/query_stage_sort.cpp
@@ -221,7 +221,7 @@ public:
};
uint64_t maxMemoryUsageBytes() const {
- return internalQueryExecMaxBlockingSortBytes.load();
+ return internalQueryMaxBlockingSortMemoryUsageBytes.load();
}
static const char* ns() {