SERVER-28040 Fix maxTimeMS/readPref/readConcern for sharded view query

2 files changed, 45 insertions, 0 deletions

diff --git a/src/mongo/db/views/resolved_view.cpp b/src/mongo/db/views/resolved_view.cpp
index 3376c05570d..fa0564113f8 100644
--- a/src/mongo/db/views/resolved_view.cpp
+++ b/src/mongo/db/views/resolved_view.cpp
@@ -85,6 +85,9 @@ AggregationRequest ResolvedView::asExpandedViewAggregation(
 
     expandedRequest.setHint(request.getHint());
     expandedRequest.setComment(request.getComment());
+    expandedRequest.setMaxTimeMS(request.getMaxTimeMS());
+    expandedRequest.setReadConcern(request.getReadConcern());
+    expandedRequest.setUnwrappedReadPref(request.getUnwrappedReadPref());
     expandedRequest.setBypassDocumentValidation(request.shouldBypassDocumentValidation());
     expandedRequest.setAllowDiskUse(request.shouldAllowDiskUse());
     expandedRequest.setCollation(request.getCollation());
diff --git a/src/mongo/db/views/resolved_view_test.cpp b/src/mongo/db/views/resolved_view_test.cpp
index cd34a8e6cf4..05c47d3fd51 100644
--- a/src/mongo/db/views/resolved_view_test.cpp
+++ b/src/mongo/db/views/resolved_view_test.cpp
@@ -113,6 +113,48 @@ TEST(ResolvedViewTest, ExpandingAggRequestPreservesAllowDiskUse) {
     ASSERT_TRUE(result.shouldAllowDiskUse());
 }
 
+TEST(ResolvedViewTest, ExpandingAggRequestPreservesHint) {
+    const ResolvedView resolvedView{backingNss, emptyPipeline};
+    AggregationRequest aggRequest(viewNss, {});
+    aggRequest.setHint(BSON("a" << 1));
+
+    auto result = resolvedView.asExpandedViewAggregation(aggRequest);
+    ASSERT_BSONOBJ_EQ(result.getHint(), BSON("a" << 1));
+}
+
+TEST(ResolvedViewTest, ExpandingAggRequestPreservesReadPreference) {
+    const ResolvedView resolvedView{backingNss, emptyPipeline};
+    AggregationRequest aggRequest(viewNss, {});
+    aggRequest.setUnwrappedReadPref(BSON("$readPreference"
+                                         << "nearest"));
+
+    auto result = resolvedView.asExpandedViewAggregation(aggRequest);
+    ASSERT_BSONOBJ_EQ(result.getUnwrappedReadPref(),
+                      BSON("$readPreference"
+                           << "nearest"));
+}
+
+TEST(ResolvedViewTest, ExpandingAggRequestPreservesReadConcern) {
+    const ResolvedView resolvedView{backingNss, emptyPipeline};
+    AggregationRequest aggRequest(viewNss, {});
+    aggRequest.setReadConcern(BSON("level"
+                                   << "linearizable"));
+
+    auto result = resolvedView.asExpandedViewAggregation(aggRequest);
+    ASSERT_BSONOBJ_EQ(result.getReadConcern(),
+                      BSON("level"
+                           << "linearizable"));
+}
+
+TEST(ResolvedViewTest, ExpandingAggRequestPreservesMaxTimeMS) {
+    const ResolvedView resolvedView{backingNss, emptyPipeline};
+    AggregationRequest aggRequest(viewNss, {});
+    aggRequest.setMaxTimeMS(100u);
+
+    auto result = resolvedView.asExpandedViewAggregation(aggRequest);
+    ASSERT_EQ(result.getMaxTimeMS(), 100u);
+}
+
 TEST(ResolvedViewTest, ExpandingAggRequestPreservesCollation) {
     const ResolvedView resolvedView{backingNss, emptyPipeline};
     AggregationRequest aggRequest(viewNss, {});