diff options
| author | Hana Pearlman <hana.pearlman@mongodb.com> | 2021-04-16 14:17:34 +0000 |
|---|---|---|
| committer | Hana Pearlman <hana.pearlman@mongodb.com> | 2021-04-16 14:17:34 +0000 |
| commit | f071c009b5b8e45e4c92fd72fc6d3f5370e5b971 (patch) | |
| tree | f39b4d2ae31a08b3266be54f287880492c1bce4f | |
| parent | a3d9c52375c4902f9c11755c68ff350fc8bcd6d6 (diff) | |
| download | mongo-f071c009b5b8e45e4c92fd72fc6d3f5370e5b971.tar.gz | |
Merge
| -rw-r--r-- | src/mongo/db/query/get_executor.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mongo/db/query/get_executor.cpp b/src/mongo/db/query/get_executor.cpp index 138bf322d71..36179df5791 100644 --- a/src/mongo/db/query/get_executor.cpp +++ b/src/mongo/db/query/get_executor.cpp @@ -221,12 +221,8 @@ IndexEntry indexEntryFromIndexCatalogEntry(OperationContext* opCtx, indexKeys.end(), std::inserter(projectedFields, projectedFields.begin())); -<<<<<<< HEAD multikeyPathSet = getWildcardMultikeyPathSet(wam, opCtx, projectedFields, &mkAccessStats); -======= - multikeyPathSet = getWildcardMultikeyPathSet(wam, opCtx, fields, &mkAccessStats); ->>>>>>> f37dc54f9f5b2e44aaeecb42f18ce990d680501f } else { multikeyPathSet = getWildcardMultikeyPathSet(wam, opCtx, &mkAccessStats); } |