summaryrefslogtreecommitdiff
path: root/src/mongo/db/exec/subplan.cpp
diff options
context:
space:
mode:
authorJustin Seyster <justin.seyster@mongodb.com>2017-09-28 21:54:20 -0400
committerJustin Seyster <justin.seyster@mongodb.com>2017-09-28 21:54:20 -0400
commite3bb43cfa8ac0d04ba28ffd3b09a53785feabb31 (patch)
treeec22edf29d746877baa697f80bc10d0b40ebb616 /src/mongo/db/exec/subplan.cpp
parent3cf4e0593c394dd7eb45d8000d76b5dc73a3f425 (diff)
downloadmongo-e3bb43cfa8ac0d04ba28ffd3b09a53785feabb31.tar.gz
Revert "SERVER-30991 Introduce MatchExpression::optimize()."
This reverts commit 3cf4e0593c394dd7eb45d8000d76b5dc73a3f425. Reverting because of a Clang compile error.
Diffstat (limited to 'src/mongo/db/exec/subplan.cpp')
-rw-r--r--src/mongo/db/exec/subplan.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/db/exec/subplan.cpp b/src/mongo/db/exec/subplan.cpp
index f8b30a6a7a3..021bf3efd5a 100644
--- a/src/mongo/db/exec/subplan.cpp
+++ b/src/mongo/db/exec/subplan.cpp
@@ -161,7 +161,7 @@ std::unique_ptr<MatchExpression> SubplanStage::rewriteToRootedOr(
}
// Normalize and sort the resulting match expression.
- orChild = MatchExpression::optimize(std::move(orChild));
+ orChild = std::unique_ptr<MatchExpression>(CanonicalQuery::normalizeTree(orChild.release()));
CanonicalQuery::sortTree(orChild.get());
return orChild;