SERVER-42560 Simplify passing of metadata between DocumentSource and PlanStage

1 files changed, 22 insertions, 22 deletions

diff --git a/src/mongo/db/query/projection_test.cpp b/src/mongo/db/query/projection_test.cpp
index b11b00bd270..c0044173cd4 100644
--- a/src/mongo/db/query/projection_test.cpp
+++ b/src/mongo/db/query/projection_test.cpp
@@ -217,12 +217,12 @@ TEST(QueryProjectionTest, InvalidPositionalProjectionDefaultPathMatchExpression)
 TEST(QueryProjectionTest, ProjectionDefaults) {
     auto proj = createProjection("{}", "{}");
 
-    ASSERT_FALSE(proj.wantSortKey());
+    ASSERT_FALSE(proj.metadataDeps()[DocumentMetadataFields::kSortKey]);
     ASSERT_TRUE(proj.requiresDocument());
     ASSERT_FALSE(proj.requiresMatchDetails());
-    ASSERT_FALSE(proj.wantGeoNearDistance());
-    ASSERT_FALSE(proj.wantGeoNearPoint());
-    ASSERT_FALSE(proj.wantTextScore());
+    ASSERT_FALSE(proj.metadataDeps()[DocumentMetadataFields::kGeoNearDist]);
+    ASSERT_FALSE(proj.metadataDeps()[DocumentMetadataFields::kGeoNearPoint]);
+    ASSERT_FALSE(proj.metadataDeps()[DocumentMetadataFields::kTextScore]);
 }
 
 TEST(QueryProjectionTest, SortKeyMetaProjectionInExclusionProjection) {
@@ -230,11 +230,11 @@ TEST(QueryProjectionTest, SortKeyMetaProjectionInExclusionProjection) {
     auto proj = createProjection("{}", "{foo: {$meta: 'sortKey'}}");
 
     ASSERT_BSONOBJ_EQ(proj.getProjObj(), fromjson("{foo: {$meta: 'sortKey'}}"));
-    ASSERT_TRUE(proj.wantSortKey());
+    ASSERT_TRUE(proj.metadataDeps()[DocumentMetadataFields::kSortKey]);
 
     ASSERT_FALSE(proj.requiresMatchDetails());
-    ASSERT_FALSE(proj.wantGeoNearDistance());
-    ASSERT_FALSE(proj.wantGeoNearPoint());
+    ASSERT_FALSE(proj.metadataDeps()[DocumentMetadataFields::kGeoNearDist]);
+    ASSERT_FALSE(proj.metadataDeps()[DocumentMetadataFields::kGeoNearPoint]);
     ASSERT_TRUE(proj.requiresDocument());
 }
 
@@ -242,11 +242,11 @@ TEST(QueryProjectionTest, SortKeyMetaProjectionInExclusionProjectionWithOtherFie
     auto proj = createProjection("{}", "{a: 0, foo: {$meta: 'sortKey'}}");
 
     ASSERT_BSONOBJ_EQ(proj.getProjObj(), fromjson("{a: 0, foo: {$meta: 'sortKey'}}"));
-    ASSERT_TRUE(proj.wantSortKey());
+    ASSERT_TRUE(proj.metadataDeps()[DocumentMetadataFields::kSortKey]);
 
     ASSERT_FALSE(proj.requiresMatchDetails());
-    ASSERT_FALSE(proj.wantGeoNearDistance());
-    ASSERT_FALSE(proj.wantGeoNearPoint());
+    ASSERT_FALSE(proj.metadataDeps()[DocumentMetadataFields::kGeoNearDist]);
+    ASSERT_FALSE(proj.metadataDeps()[DocumentMetadataFields::kGeoNearPoint]);
     ASSERT_TRUE(proj.requiresDocument());
 }
 
@@ -254,11 +254,11 @@ TEST(QueryProjectionTest, SortKeyMetaProjectionInInclusionProjection) {
     auto proj = createProjection("{}", "{a: 1, foo: {$meta: 'sortKey'}}");
 
     ASSERT_BSONOBJ_EQ(proj.getProjObj(), fromjson("{a: 1, foo: {$meta: 'sortKey'}}"));
-    ASSERT_TRUE(proj.wantSortKey());
+    ASSERT_TRUE(proj.metadataDeps()[DocumentMetadataFields::kSortKey]);
 
     ASSERT_FALSE(proj.requiresMatchDetails());
-    ASSERT_FALSE(proj.wantGeoNearDistance());
-    ASSERT_FALSE(proj.wantGeoNearPoint());
+    ASSERT_FALSE(proj.metadataDeps()[DocumentMetadataFields::kGeoNearDist]);
+    ASSERT_FALSE(proj.metadataDeps()[DocumentMetadataFields::kGeoNearPoint]);
     ASSERT_FALSE(proj.requiresDocument());
 }
 
@@ -266,12 +266,12 @@ TEST(QueryProjectionTest, SortKeyMetaProjectionDoesNotRequireDocument) {
     auto proj = createProjection("{}", "{a: 1, foo: {$meta: 'sortKey'}, _id: 0}");
 
     ASSERT_BSONOBJ_EQ(proj.getProjObj(), fromjson("{a: 1, foo: {$meta: 'sortKey'}, _id: 0}"));
-    ASSERT_TRUE(proj.wantSortKey());
+    ASSERT_TRUE(proj.metadataDeps()[DocumentMetadataFields::kSortKey]);
 
     ASSERT_FALSE(proj.requiresDocument());
     ASSERT_FALSE(proj.requiresMatchDetails());
-    ASSERT_FALSE(proj.wantGeoNearDistance());
-    ASSERT_FALSE(proj.wantGeoNearPoint());
+    ASSERT_FALSE(proj.metadataDeps()[DocumentMetadataFields::kGeoNearDist]);
+    ASSERT_FALSE(proj.metadataDeps()[DocumentMetadataFields::kGeoNearPoint]);
 }
 
 TEST(QueryProjectionTest, SortKeyMetaAndSlice) {
@@ -279,12 +279,12 @@ TEST(QueryProjectionTest, SortKeyMetaAndSlice) {
 
     ASSERT_BSONOBJ_EQ(proj.getProjObj(),
                       fromjson("{a: 1, foo: {$meta: 'sortKey'}, _id: 0, b: {$slice: 1}}"));
-    ASSERT_TRUE(proj.wantSortKey());
+    ASSERT_TRUE(proj.metadataDeps()[DocumentMetadataFields::kSortKey]);
     ASSERT_TRUE(proj.requiresDocument());
 
     ASSERT_FALSE(proj.requiresMatchDetails());
-    ASSERT_FALSE(proj.wantGeoNearDistance());
-    ASSERT_FALSE(proj.wantGeoNearPoint());
+    ASSERT_FALSE(proj.metadataDeps()[DocumentMetadataFields::kGeoNearDist]);
+    ASSERT_FALSE(proj.metadataDeps()[DocumentMetadataFields::kGeoNearPoint]);
 }
 
 TEST(QueryProjectionTest, SortKeyMetaAndElemMatch) {
@@ -293,12 +293,12 @@ TEST(QueryProjectionTest, SortKeyMetaAndElemMatch) {
 
     ASSERT_BSONOBJ_EQ(proj.getProjObj(),
                       fromjson("{a: 1, foo: {$meta: 'sortKey'}, _id: 0, b: {$elemMatch: {a: 1}}}"));
-    ASSERT_TRUE(proj.wantSortKey());
+    ASSERT_TRUE(proj.metadataDeps()[DocumentMetadataFields::kSortKey]);
     ASSERT_TRUE(proj.requiresDocument());
 
     ASSERT_FALSE(proj.requiresMatchDetails());
-    ASSERT_FALSE(proj.wantGeoNearDistance());
-    ASSERT_FALSE(proj.wantGeoNearPoint());
+    ASSERT_FALSE(proj.metadataDeps()[DocumentMetadataFields::kGeoNearDist]);
+    ASSERT_FALSE(proj.metadataDeps()[DocumentMetadataFields::kGeoNearPoint]);
 }
 
 //