Merge branch 'master' into jenniferpeshansky/SERVER-70854jenniferpeshansky/SERVER-70854

1 files changed, 0 insertions, 17 deletions

diff --git a/src/mongo/db/query/optimizer/opt_phase_manager.cpp b/src/mongo/db/query/optimizer/opt_phase_manager.cpp
index 4c4fd0deed3..a00e30aa499 100644
--- a/src/mongo/db/query/optimizer/opt_phase_manager.cpp
+++ b/src/mongo/db/query/optimizer/opt_phase_manager.cpp
@@ -30,7 +30,6 @@
 #include "mongo/db/query/optimizer/opt_phase_manager.h"
 
 #include "mongo/db/query/optimizer/cascades/ce_heuristic.h"
-#include "mongo/db/query/optimizer/cascades/cost_derivation.h"
 #include "mongo/db/query/optimizer/cascades/logical_props_derivation.h"
 #include "mongo/db/query/optimizer/rewrites/const_eval.h"
 #include "mongo/db/query/optimizer/rewrites/path.h"
@@ -49,22 +48,6 @@ OptPhaseManager::PhaseSet OptPhaseManager::_allRewrites = {OptPhase::ConstEvalPr
 
 OptPhaseManager::OptPhaseManager(OptPhaseManager::PhaseSet phaseSet,
                                  PrefixId& prefixId,
-                                 Metadata metadata,
-                                 DebugInfo debugInfo,
-                                 QueryHints queryHints)
-    : OptPhaseManager(std::move(phaseSet),
-                      prefixId,
-                      false /*requireRID*/,
-                      std::move(metadata),
-                      std::make_unique<HeuristicCE>(),
-                      std::make_unique<DefaultCosting>(),
-                      {} /*pathToInterval*/,
-                      ConstEval::constFold,
-                      std::move(debugInfo),
-                      std::move(queryHints)) {}
-
-OptPhaseManager::OptPhaseManager(OptPhaseManager::PhaseSet phaseSet,
-                                 PrefixId& prefixId,
                                  const bool requireRID,
                                  Metadata metadata,
                                  std::unique_ptr<CEInterface> ceDerivation,