SERVER-45152 Clean up git merge to unit test further

1 files changed, 8 insertions, 12 deletions

diff --git a/src/mongo/db/query/index_bounds_builder_test.cpp b/src/mongo/db/query/index_bounds_builder_test.cpp
index 1c8633c15b2..392204f548c 100644
--- a/src/mongo/db/query/index_bounds_builder_test.cpp
+++ b/src/mongo/db/query/index_bounds_builder_test.cpp
@@ -46,9 +46,9 @@ using namespace mongo;
 
 namespace {
 
-using std::unique_ptr;
 using std::numeric_limits;
 using std::string;
+using std::unique_ptr;
 using std::vector;
 
 double numberMin = -numeric_limits<double>::max();
@@ -592,20 +592,16 @@ TEST(IndexBoundsBuilderTest, TranslateGtMinKey) {
 TEST(IndexBoundsBuilderTest, DontCrashOnNegationOfArrayInequality) {
     BSONObj keyPattern = BSON("a" << 1);
     auto testIndex = IndexEntry(keyPattern,
-                                IndexNames::nameToType(IndexNames::findPluginName(keyPattern)),
-                                true,  // multikey
-                                {},
-                                {},
-                                false,  // sparse
-                                false,  // unique
-                                IndexEntry::Identifier{"test_foo"},
-                                nullptr,  // filterExpr
-                                BSONObj(),
+                                true,  // mk
+                                false,
+                                false,
+                                "test_foo",
                                 nullptr,
-                                nullptr);
+                                BSONObj());
 
     BSONObj obj = fromjson("{a: {$not: {$lt: [\"here\", {}, false]}}}");
-    auto expr = MatchExpression::optimize(parseMatchExpression(obj));
+    auto expr =
+        MatchExpression::optimize(std::unique_ptr<MatchExpression>(parseMatchExpression(obj)));
     BSONElement elt = obj.firstElement();
     OrderedIntervalList oil;
     IndexBoundsBuilder::BoundsTightness tightness;