summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mongo/db/curop.cpp2
-rw-r--r--src/mongo/db/exec/cached_plan.cpp10
-rw-r--r--src/mongo/db/exec/multi_plan.cpp12
-rw-r--r--src/mongo/db/query/get_executor.cpp8
-rw-r--r--src/mongo/db/query/plan_ranker.cpp2
5 files changed, 17 insertions, 17 deletions
diff --git a/src/mongo/db/curop.cpp b/src/mongo/db/curop.cpp
index 3b5f71f23ce..5e1a14663dc 100644
--- a/src/mongo/db/curop.cpp
+++ b/src/mongo/db/curop.cpp
@@ -459,7 +459,7 @@ string OpDebug::report(Client* client,
}
if (!curop.getPlanSummary().empty()) {
- s << " planSummary: " << redact(curop.getPlanSummary().toString());
+ s << " planSummary: " << curop.getPlanSummary().toString();
}
if (!updateobj.isEmpty()) {
diff --git a/src/mongo/db/exec/cached_plan.cpp b/src/mongo/db/exec/cached_plan.cpp
index f1867423b78..8c729927e71 100644
--- a/src/mongo/db/exec/cached_plan.cpp
+++ b/src/mongo/db/exec/cached_plan.cpp
@@ -140,7 +140,7 @@ Status CachedPlanStage::pickBestPlan(PlanYieldPolicy* yieldPolicy) {
LOG(1) << "Execution of cached plan failed, falling back to replan."
<< " query: " << redact(_canonicalQuery->toStringShort())
- << " planSummary: " << redact(Explain::getPlanSummary(child().get()))
+ << " planSummary: " << Explain::getPlanSummary(child().get())
<< " status: " << redact(statusObj);
const bool shouldCache = false;
@@ -151,7 +151,7 @@ Status CachedPlanStage::pickBestPlan(PlanYieldPolicy* yieldPolicy) {
LOG(1) << "Execution of cached plan failed: PlanStage died"
<< ", query: " << redact(_canonicalQuery->toStringShort())
- << " planSummary: " << redact(Explain::getPlanSummary(child().get()))
+ << " planSummary: " << Explain::getPlanSummary(child().get())
<< " status: " << redact(statusObj);
return WorkingSetCommon::getMemberObjectStatus(statusObj);
@@ -166,7 +166,7 @@ Status CachedPlanStage::pickBestPlan(PlanYieldPolicy* yieldPolicy) {
<< " works, but was originally cached with only " << _decisionWorks
<< " works. Evicting cache entry and replanning query: "
<< redact(_canonicalQuery->toStringShort())
- << " plan summary before replan: " << redact(Explain::getPlanSummary(child().get()));
+ << " plan summary before replan: " << Explain::getPlanSummary(child().get());
const bool shouldCache = true;
return replan(yieldPolicy, shouldCache);
@@ -241,7 +241,7 @@ Status CachedPlanStage::replan(PlanYieldPolicy* yieldPolicy, bool shouldCache) {
LOG(1)
<< "Replanning of query resulted in single query solution, which will not be cached. "
<< redact(_canonicalQuery->toStringShort())
- << " plan summary after replan: " << redact(Explain::getPlanSummary(child().get()))
+ << " plan summary after replan: " << Explain::getPlanSummary(child().get())
<< " previous cache entry evicted: " << (shouldCache ? "yes" : "no");
return Status::OK();
}
@@ -274,7 +274,7 @@ Status CachedPlanStage::replan(PlanYieldPolicy* yieldPolicy, bool shouldCache) {
}
LOG(1) << "Replanning " << redact(_canonicalQuery->toStringShort())
- << " resulted in plan with summary: " << redact(Explain::getPlanSummary(child().get()))
+ << " resulted in plan with summary: " << Explain::getPlanSummary(child().get())
<< ", which " << (shouldCache ? "has" : "has not") << " been written to the cache";
return Status::OK();
}
diff --git a/src/mongo/db/exec/multi_plan.cpp b/src/mongo/db/exec/multi_plan.cpp
index 28c14dbcba3..10b36d49b8d 100644
--- a/src/mongo/db/exec/multi_plan.cpp
+++ b/src/mongo/db/exec/multi_plan.cpp
@@ -239,7 +239,7 @@ Status MultiPlanStage::pickBestPlan(PlanYieldPolicy* yieldPolicy) {
const auto& bestSolution = bestCandidate.solution;
LOG(5) << "Winning solution:\n" << redact(bestSolution->toString());
- LOG(2) << "Winning plan: " << redact(Explain::getPlanSummary(bestCandidate.root));
+ LOG(2) << "Winning plan: " << Explain::getPlanSummary(bestCandidate.root);
_backupPlanIdx = kNoSuchPlan;
if (bestSolution->hasBlockingStage && (0 == alreadyProduced.size())) {
@@ -276,10 +276,10 @@ Status MultiPlanStage::pickBestPlan(PlanYieldPolicy* yieldPolicy) {
LOG(1) << "Winning plan tied with runner-up. Not caching."
<< " ns: " << _collection->ns() << " " << redact(_query->toStringShort())
- << " winner score: " << ranking->scores[0] << " winner summary: "
- << redact(Explain::getPlanSummary(_candidates[winnerIdx].root))
+ << " winner score: " << ranking->scores[0]
+ << " winner summary: " << Explain::getPlanSummary(_candidates[winnerIdx].root)
<< " runner-up score: " << ranking->scores[1] << " runner-up summary: "
- << redact(Explain::getPlanSummary(_candidates[runnerUpIdx].root));
+ << Explain::getPlanSummary(_candidates[runnerUpIdx].root);
}
if (alreadyProduced.empty()) {
@@ -290,8 +290,8 @@ Status MultiPlanStage::pickBestPlan(PlanYieldPolicy* yieldPolicy) {
size_t winnerIdx = ranking->candidateOrder[0];
LOG(1) << "Winning plan had zero results. Not caching."
<< " ns: " << _collection->ns() << " " << redact(_query->toStringShort())
- << " winner score: " << ranking->scores[0] << " winner summary: "
- << redact(Explain::getPlanSummary(_candidates[winnerIdx].root));
+ << " winner score: " << ranking->scores[0]
+ << " winner summary: " << Explain::getPlanSummary(_candidates[winnerIdx].root);
}
}
diff --git a/src/mongo/db/query/get_executor.cpp b/src/mongo/db/query/get_executor.cpp
index d6c0cc2bd8e..93d529704c9 100644
--- a/src/mongo/db/query/get_executor.cpp
+++ b/src/mongo/db/query/get_executor.cpp
@@ -407,7 +407,7 @@ StatusWith<PrepareExecutionResult> prepareExecution(OperationContext* opCtx,
root.reset(rawRoot);
LOG(2) << "Using fast count: " << redact(canonicalQuery->toStringShort())
- << ", planSummary: " << redact(Explain::getPlanSummary(root.get()));
+ << ", planSummary: " << Explain::getPlanSummary(root.get());
querySolution.reset(solutions[i]);
return PrepareExecutionResult(
@@ -425,7 +425,7 @@ StatusWith<PrepareExecutionResult> prepareExecution(OperationContext* opCtx,
LOG(2) << "Only one plan is available; it will be run but will not be cached. "
<< redact(canonicalQuery->toStringShort())
- << ", planSummary: " << redact(Explain::getPlanSummary(root.get()));
+ << ", planSummary: " << Explain::getPlanSummary(root.get());
querySolution.reset(solutions[0]);
return PrepareExecutionResult(
@@ -1536,7 +1536,7 @@ StatusWith<unique_ptr<PlanExecutor>> getExecutorDistinct(OperationContext* txn,
unique_ptr<PlanStage> root(rawRoot);
LOG(2) << "Using fast distinct: " << redact(cq->toStringShort())
- << ", planSummary: " << redact(Explain::getPlanSummary(root.get()));
+ << ", planSummary: " << Explain::getPlanSummary(root.get());
return PlanExecutor::make(txn,
std::move(ws),
@@ -1572,7 +1572,7 @@ StatusWith<unique_ptr<PlanExecutor>> getExecutorDistinct(OperationContext* txn,
unique_ptr<PlanStage> root(rawRoot);
LOG(2) << "Using fast distinct: " << redact(cq->toStringShort())
- << ", planSummary: " << redact(Explain::getPlanSummary(root.get()));
+ << ", planSummary: " << Explain::getPlanSummary(root.get());
return PlanExecutor::make(txn,
std::move(ws),
diff --git a/src/mongo/db/query/plan_ranker.cpp b/src/mongo/db/query/plan_ranker.cpp
index ce943e117a7..9377e1382fc 100644
--- a/src/mongo/db/query/plan_ranker.cpp
+++ b/src/mongo/db/query/plan_ranker.cpp
@@ -95,7 +95,7 @@ size_t PlanRanker::pickBestPlan(const vector<CandidatePlan>& candidates, PlanRan
LOG(5) << "Scoring plan " << i << ":" << endl
<< redact(candidates[i].solution->toString()) << "Stats:\n"
<< redact(Explain::statsToBSON(*statTrees[i]).jsonString(Strict, true));
- LOG(2) << "Scoring query plan: " << redact(Explain::getPlanSummary(candidates[i].root))
+ LOG(2) << "Scoring query plan: " << Explain::getPlanSummary(candidates[i].root)
<< " planHitEOF=" << statTrees[i]->common.isEOF;
double score = scoreTree(statTrees[i]);
View Lorry Controller Status