From 69a44bc5d6e428218086f585037c3322747da45b Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 19 May 2026 08:42:39 +0200 Subject: [PATCH] SERVER-73120 Remove recordRemoteOpWaitTime from IDL (#53913) Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> GitOrigin-RevId: 799e5c20a85862f2a156bbecf59e7514a52212fc --- .../distinct_chunk_skipping.md | 3 -- .../distinct_scan_multi_chunk.md | 43 ------------------- .../distinct_chunk_skipping.md | 3 -- .../distinct_scan_multi_chunk.md | 43 ------------------- .../featureFlagSbeFull/group_targeting.md | 30 ------------- .../sort_group_targeting.md | 5 --- .../sbeDisabled/distinct_scan_multi_chunk.md | 43 ------------------- .../sbeDisabled/group_targeting.md | 30 ------------- .../sbeDisabled/sort_group_targeting.md | 5 --- .../sbeFull/distinct_scan_multi_chunk.md | 43 ------------------- .../sbeFull/group_targeting.md | 30 ------------- .../sbeFull/sort_group_targeting.md | 5 --- .../sbeIndividualFeatures/group_targeting.md | 30 ------------- .../distinct_scan_multi_chunk.md | 43 ------------------- .../sbeRestricted/group_targeting.md | 30 ------------- .../sbeRestricted/sort_group_targeting.md | 5 --- .../exec/async_results_merger_params.idl | 8 ---- .../exec/document_source_merge_cursors.cpp | 34 ++++++++++++--- .../document_source_merge_cursors_test.cpp | 32 +++++++++++++- 19 files changed, 58 insertions(+), 407 deletions(-) diff --git a/jstests/query_golden_sharding/expected_output/deferredGetExecutor/distinct_chunk_skipping.md b/jstests/query_golden_sharding/expected_output/deferredGetExecutor/distinct_chunk_skipping.md index 143343f6ca2..a179594ba2f 100644 --- a/jstests/query_golden_sharding/expected_output/deferredGetExecutor/distinct_chunk_skipping.md +++ b/jstests/query_golden_sharding/expected_output/deferredGetExecutor/distinct_chunk_skipping.md @@ -339,7 +339,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_chunk_skipping", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -591,7 +590,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_chunk_skipping", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -895,7 +893,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_chunk_skipping", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } diff --git a/jstests/query_golden_sharding/expected_output/deferredGetExecutor/distinct_scan_multi_chunk.md b/jstests/query_golden_sharding/expected_output/deferredGetExecutor/distinct_scan_multi_chunk.md index e434dda956e..a338cb986ac 100644 --- a/jstests/query_golden_sharding/expected_output/deferredGetExecutor/distinct_scan_multi_chunk.md +++ b/jstests/query_golden_sharding/expected_output/deferredGetExecutor/distinct_scan_multi_chunk.md @@ -1044,7 +1044,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1230,7 +1229,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1421,7 +1419,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1612,7 +1609,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1803,7 +1799,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2082,7 +2077,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2275,7 +2269,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2558,7 +2551,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2850,7 +2842,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3054,7 +3045,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3258,7 +3248,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3479,7 +3468,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -3704,7 +3692,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -3928,7 +3915,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -4153,7 +4139,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -4438,7 +4423,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -4707,7 +4691,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -4976,7 +4959,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5245,7 +5227,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5450,7 +5431,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5655,7 +5635,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5861,7 +5840,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6066,7 +6044,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6231,7 +6208,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6394,7 +6370,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6558,7 +6533,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6721,7 +6695,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6982,7 +6955,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7243,7 +7215,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7504,7 +7475,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7765,7 +7735,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7958,7 +7927,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8151,7 +8119,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8346,7 +8313,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8541,7 +8507,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8711,7 +8676,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8872,7 +8836,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9172,7 +9135,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9489,7 +9451,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9681,7 +9642,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9854,7 +9814,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -10113,7 +10072,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -10386,7 +10344,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } diff --git a/jstests/query_golden_sharding/expected_output/distinct_chunk_skipping.md b/jstests/query_golden_sharding/expected_output/distinct_chunk_skipping.md index 4ae8aa672ba..d09df9340ce 100644 --- a/jstests/query_golden_sharding/expected_output/distinct_chunk_skipping.md +++ b/jstests/query_golden_sharding/expected_output/distinct_chunk_skipping.md @@ -339,7 +339,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_chunk_skipping", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -591,7 +590,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_chunk_skipping", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -921,7 +919,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_chunk_skipping", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } diff --git a/jstests/query_golden_sharding/expected_output/featureFlagSbeFull/distinct_scan_multi_chunk.md b/jstests/query_golden_sharding/expected_output/featureFlagSbeFull/distinct_scan_multi_chunk.md index e9d3e35f62d..a755cc7e111 100644 --- a/jstests/query_golden_sharding/expected_output/featureFlagSbeFull/distinct_scan_multi_chunk.md +++ b/jstests/query_golden_sharding/expected_output/featureFlagSbeFull/distinct_scan_multi_chunk.md @@ -1044,7 +1044,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1230,7 +1229,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1421,7 +1419,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1612,7 +1609,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1803,7 +1799,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2078,7 +2073,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2271,7 +2265,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2550,7 +2543,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2838,7 +2830,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3042,7 +3033,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3246,7 +3236,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3467,7 +3456,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -3692,7 +3680,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -3916,7 +3903,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -4141,7 +4127,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -4426,7 +4411,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -4695,7 +4679,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -4964,7 +4947,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5233,7 +5215,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5438,7 +5419,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5643,7 +5623,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5849,7 +5828,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6054,7 +6032,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6219,7 +6196,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6382,7 +6358,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6546,7 +6521,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6709,7 +6683,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6970,7 +6943,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7231,7 +7203,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7492,7 +7463,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7753,7 +7723,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7946,7 +7915,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8139,7 +8107,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8334,7 +8301,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8529,7 +8495,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8699,7 +8664,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8860,7 +8824,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9160,7 +9123,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9477,7 +9439,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9669,7 +9630,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9842,7 +9802,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -10101,7 +10060,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -10374,7 +10332,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } diff --git a/jstests/query_golden_sharding/expected_output/featureFlagSbeFull/group_targeting.md b/jstests/query_golden_sharding/expected_output/featureFlagSbeFull/group_targeting.md index 37a9d027b83..97679c0dbcf 100644 --- a/jstests/query_golden_sharding/expected_output/featureFlagSbeFull/group_targeting.md +++ b/jstests/query_golden_sharding/expected_output/featureFlagSbeFull/group_targeting.md @@ -119,7 +119,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -301,7 +300,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "_id" : 1 @@ -417,7 +415,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -527,7 +524,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -618,7 +614,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -771,7 +766,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "_id" : 1 @@ -912,7 +906,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1047,7 +1040,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1223,7 +1215,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1397,7 +1388,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1506,7 +1496,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1625,7 +1614,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1744,7 +1732,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1845,7 +1832,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1953,7 +1939,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2064,7 +2049,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2191,7 +2175,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2286,7 +2269,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2429,7 +2411,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2527,7 +2508,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2674,7 +2654,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2783,7 +2762,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2885,7 +2863,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2997,7 +2974,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3129,7 +3105,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3278,7 +3253,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3390,7 +3364,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3523,7 +3496,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3640,7 +3612,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3804,7 +3775,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } diff --git a/jstests/query_golden_sharding/expected_output/featureFlagSbeFull/sort_group_targeting.md b/jstests/query_golden_sharding/expected_output/featureFlagSbeFull/sort_group_targeting.md index e29c677f869..16fd544fb55 100644 --- a/jstests/query_golden_sharding/expected_output/featureFlagSbeFull/sort_group_targeting.md +++ b/jstests/query_golden_sharding/expected_output/featureFlagSbeFull/sort_group_targeting.md @@ -118,7 +118,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -278,7 +277,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -444,7 +442,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -644,7 +641,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "shardKey" : 1 @@ -805,7 +801,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "shardKey" : 1 diff --git a/jstests/query_golden_sharding/expected_output/sbeDisabled/distinct_scan_multi_chunk.md b/jstests/query_golden_sharding/expected_output/sbeDisabled/distinct_scan_multi_chunk.md index a8650209684..dc32ef65f74 100644 --- a/jstests/query_golden_sharding/expected_output/sbeDisabled/distinct_scan_multi_chunk.md +++ b/jstests/query_golden_sharding/expected_output/sbeDisabled/distinct_scan_multi_chunk.md @@ -1044,7 +1044,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1230,7 +1229,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1421,7 +1419,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1612,7 +1609,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1803,7 +1799,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2094,7 +2089,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2287,7 +2281,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2588,7 +2581,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2898,7 +2890,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3102,7 +3093,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3306,7 +3296,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3527,7 +3516,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -3752,7 +3740,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -3976,7 +3963,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -4201,7 +4187,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -4486,7 +4471,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -4755,7 +4739,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5024,7 +5007,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5293,7 +5275,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5498,7 +5479,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5703,7 +5683,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5909,7 +5888,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6114,7 +6092,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6279,7 +6256,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6442,7 +6418,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6606,7 +6581,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6769,7 +6743,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7030,7 +7003,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7291,7 +7263,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7552,7 +7523,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7813,7 +7783,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8006,7 +7975,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8199,7 +8167,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8394,7 +8361,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8589,7 +8555,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8759,7 +8724,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8920,7 +8884,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9220,7 +9183,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9537,7 +9499,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9729,7 +9690,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9902,7 +9862,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -10161,7 +10120,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -10434,7 +10392,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } diff --git a/jstests/query_golden_sharding/expected_output/sbeDisabled/group_targeting.md b/jstests/query_golden_sharding/expected_output/sbeDisabled/group_targeting.md index 31c5bd1ce6b..dde3a152c69 100644 --- a/jstests/query_golden_sharding/expected_output/sbeDisabled/group_targeting.md +++ b/jstests/query_golden_sharding/expected_output/sbeDisabled/group_targeting.md @@ -119,7 +119,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -301,7 +300,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "_id" : 1 @@ -449,7 +447,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -571,7 +568,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -694,7 +690,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -887,7 +882,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "_id" : 1 @@ -1046,7 +1040,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1179,7 +1172,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1353,7 +1345,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1525,7 +1516,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1672,7 +1662,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1829,7 +1818,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1994,7 +1982,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2119,7 +2106,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2237,7 +2223,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2358,7 +2343,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2493,7 +2477,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2598,7 +2581,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2741,7 +2723,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2863,7 +2844,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3018,7 +2998,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3165,7 +3144,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3317,7 +3295,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3469,7 +3446,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3621,7 +3597,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3788,7 +3763,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3932,7 +3906,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -4087,7 +4060,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -4246,7 +4218,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -4444,7 +4415,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } diff --git a/jstests/query_golden_sharding/expected_output/sbeDisabled/sort_group_targeting.md b/jstests/query_golden_sharding/expected_output/sbeDisabled/sort_group_targeting.md index f221c9c5d6d..378bba5ef0c 100644 --- a/jstests/query_golden_sharding/expected_output/sbeDisabled/sort_group_targeting.md +++ b/jstests/query_golden_sharding/expected_output/sbeDisabled/sort_group_targeting.md @@ -118,7 +118,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -278,7 +277,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -444,7 +442,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -644,7 +641,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "shardKey" : 1 @@ -805,7 +801,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "shardKey" : 1 diff --git a/jstests/query_golden_sharding/expected_output/sbeFull/distinct_scan_multi_chunk.md b/jstests/query_golden_sharding/expected_output/sbeFull/distinct_scan_multi_chunk.md index e9d3e35f62d..a755cc7e111 100644 --- a/jstests/query_golden_sharding/expected_output/sbeFull/distinct_scan_multi_chunk.md +++ b/jstests/query_golden_sharding/expected_output/sbeFull/distinct_scan_multi_chunk.md @@ -1044,7 +1044,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1230,7 +1229,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1421,7 +1419,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1612,7 +1609,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1803,7 +1799,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2078,7 +2073,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2271,7 +2265,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2550,7 +2543,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2838,7 +2830,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3042,7 +3033,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3246,7 +3236,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3467,7 +3456,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -3692,7 +3680,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -3916,7 +3903,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -4141,7 +4127,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -4426,7 +4411,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -4695,7 +4679,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -4964,7 +4947,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5233,7 +5215,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5438,7 +5419,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5643,7 +5623,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5849,7 +5828,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6054,7 +6032,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6219,7 +6196,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6382,7 +6358,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6546,7 +6521,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6709,7 +6683,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6970,7 +6943,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7231,7 +7203,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7492,7 +7463,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7753,7 +7723,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7946,7 +7915,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8139,7 +8107,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8334,7 +8301,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8529,7 +8495,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8699,7 +8664,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8860,7 +8824,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9160,7 +9123,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9477,7 +9439,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9669,7 +9630,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9842,7 +9802,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -10101,7 +10060,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -10374,7 +10332,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } diff --git a/jstests/query_golden_sharding/expected_output/sbeFull/group_targeting.md b/jstests/query_golden_sharding/expected_output/sbeFull/group_targeting.md index 37a9d027b83..97679c0dbcf 100644 --- a/jstests/query_golden_sharding/expected_output/sbeFull/group_targeting.md +++ b/jstests/query_golden_sharding/expected_output/sbeFull/group_targeting.md @@ -119,7 +119,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -301,7 +300,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "_id" : 1 @@ -417,7 +415,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -527,7 +524,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -618,7 +614,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -771,7 +766,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "_id" : 1 @@ -912,7 +906,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1047,7 +1040,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1223,7 +1215,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1397,7 +1388,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1506,7 +1496,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1625,7 +1614,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1744,7 +1732,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1845,7 +1832,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1953,7 +1939,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2064,7 +2049,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2191,7 +2175,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2286,7 +2269,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2429,7 +2411,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2527,7 +2508,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2674,7 +2654,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2783,7 +2762,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2885,7 +2863,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2997,7 +2974,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3129,7 +3105,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3278,7 +3253,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3390,7 +3364,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3523,7 +3496,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3640,7 +3612,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3804,7 +3775,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } diff --git a/jstests/query_golden_sharding/expected_output/sbeFull/sort_group_targeting.md b/jstests/query_golden_sharding/expected_output/sbeFull/sort_group_targeting.md index e29c677f869..16fd544fb55 100644 --- a/jstests/query_golden_sharding/expected_output/sbeFull/sort_group_targeting.md +++ b/jstests/query_golden_sharding/expected_output/sbeFull/sort_group_targeting.md @@ -118,7 +118,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -278,7 +277,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -444,7 +442,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -644,7 +641,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "shardKey" : 1 @@ -805,7 +801,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "shardKey" : 1 diff --git a/jstests/query_golden_sharding/expected_output/sbeIndividualFeatures/group_targeting.md b/jstests/query_golden_sharding/expected_output/sbeIndividualFeatures/group_targeting.md index d9a1b0cddc4..7edf0403664 100644 --- a/jstests/query_golden_sharding/expected_output/sbeIndividualFeatures/group_targeting.md +++ b/jstests/query_golden_sharding/expected_output/sbeIndividualFeatures/group_targeting.md @@ -119,7 +119,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -301,7 +300,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "_id" : 1 @@ -417,7 +415,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -527,7 +524,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -618,7 +614,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -771,7 +766,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "_id" : 1 @@ -912,7 +906,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1045,7 +1038,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1219,7 +1211,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1391,7 +1382,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1500,7 +1490,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1619,7 +1608,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1738,7 +1726,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1839,7 +1826,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1947,7 +1933,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2058,7 +2043,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2185,7 +2169,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2280,7 +2263,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2423,7 +2405,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2521,7 +2502,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2668,7 +2648,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2777,7 +2756,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2879,7 +2857,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2991,7 +2968,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3123,7 +3099,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3272,7 +3247,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3384,7 +3358,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3517,7 +3490,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3634,7 +3606,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3798,7 +3769,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } diff --git a/jstests/query_golden_sharding/expected_output/sbeRestricted/distinct_scan_multi_chunk.md b/jstests/query_golden_sharding/expected_output/sbeRestricted/distinct_scan_multi_chunk.md index 29f4f62e90b..47f53f6a2ad 100644 --- a/jstests/query_golden_sharding/expected_output/sbeRestricted/distinct_scan_multi_chunk.md +++ b/jstests/query_golden_sharding/expected_output/sbeRestricted/distinct_scan_multi_chunk.md @@ -1044,7 +1044,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1230,7 +1229,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1421,7 +1419,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1612,7 +1609,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1803,7 +1799,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2078,7 +2073,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2271,7 +2265,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2550,7 +2543,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2838,7 +2830,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3042,7 +3033,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3246,7 +3236,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3467,7 +3456,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -3692,7 +3680,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -3916,7 +3903,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -4141,7 +4127,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "notShardKey" : 1, @@ -4426,7 +4411,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -4695,7 +4679,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -4964,7 +4947,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5233,7 +5215,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5438,7 +5419,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5643,7 +5623,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -5849,7 +5828,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6054,7 +6032,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6219,7 +6196,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6382,7 +6358,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6546,7 +6521,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6709,7 +6683,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -6970,7 +6943,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7231,7 +7203,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7492,7 +7463,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7753,7 +7723,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -7946,7 +7915,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8139,7 +8107,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8334,7 +8301,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8529,7 +8495,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8699,7 +8664,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -8860,7 +8824,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9160,7 +9123,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9477,7 +9439,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9669,7 +9630,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -9842,7 +9802,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -10101,7 +10060,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -10374,7 +10332,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.distinct_scan_multi_chunk", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } diff --git a/jstests/query_golden_sharding/expected_output/sbeRestricted/group_targeting.md b/jstests/query_golden_sharding/expected_output/sbeRestricted/group_targeting.md index cfaf256dce2..686d7dd6e11 100644 --- a/jstests/query_golden_sharding/expected_output/sbeRestricted/group_targeting.md +++ b/jstests/query_golden_sharding/expected_output/sbeRestricted/group_targeting.md @@ -119,7 +119,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -301,7 +300,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "_id" : 1 @@ -417,7 +415,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -527,7 +524,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -618,7 +614,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -769,7 +764,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "_id" : 1 @@ -910,7 +904,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1043,7 +1036,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1217,7 +1209,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1389,7 +1380,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1498,7 +1488,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1617,7 +1606,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1736,7 +1724,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1837,7 +1824,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -1945,7 +1931,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2056,7 +2041,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2191,7 +2175,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2286,7 +2269,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2429,7 +2411,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2527,7 +2508,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2682,7 +2662,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2791,7 +2770,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -2893,7 +2871,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3005,7 +2982,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3137,7 +3113,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3286,7 +3261,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3398,7 +3372,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3531,7 +3504,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3648,7 +3620,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -3846,7 +3817,6 @@ Note: If we have duplicate _ids in the output, that signals a bug here. "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.group_targeting_compound", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } diff --git a/jstests/query_golden_sharding/expected_output/sbeRestricted/sort_group_targeting.md b/jstests/query_golden_sharding/expected_output/sbeRestricted/sort_group_targeting.md index f221c9c5d6d..378bba5ef0c 100644 --- a/jstests/query_golden_sharding/expected_output/sbeRestricted/sort_group_targeting.md +++ b/jstests/query_golden_sharding/expected_output/sbeRestricted/sort_group_targeting.md @@ -118,7 +118,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -278,7 +277,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -444,7 +442,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "tailableMode" : "normal" } @@ -644,7 +641,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "shardKey" : 1 @@ -805,7 +801,6 @@ "allowPartialResults" : false, "compareWholeSortKey" : false, "nss" : "test.sort_group_targeting", - "recordRemoteOpWaitTime" : false, "requestQueryStatsFromRemotes" : false, "sort" : { "shardKey" : 1 diff --git a/src/mongo/s/query/exec/async_results_merger_params.idl b/src/mongo/s/query/exec/async_results_merger_params.idl index 350d1be081b..3cf970d8d8c 100644 --- a/src/mongo/s/query/exec/async_results_merger_params.idl +++ b/src/mongo/s/query/exec/async_results_merger_params.idl @@ -115,14 +115,6 @@ structs: default: false description: If set, error responses are ignored. query_shape: parameter - recordRemoteOpWaitTime: - type: bool - default: false - query_shape: parameter - description: >- - This parameter is not used anymore but should stay for a while for backward - compatibility. - TODO SERVER-73120 Remove this parameter when releasing 8.0. requestQueryStatsFromRemotes: type: bool default: false diff --git a/src/mongo/s/query/exec/document_source_merge_cursors.cpp b/src/mongo/s/query/exec/document_source_merge_cursors.cpp index 43fa338e096..32b9c55c749 100644 --- a/src/mongo/s/query/exec/document_source_merge_cursors.cpp +++ b/src/mongo/s/query/exec/document_source_merge_cursors.cpp @@ -166,12 +166,34 @@ boost::intrusive_ptr DocumentSourceMergeCursors::createFromBson( uassert(17026, "$mergeCursors stage expected an object as argument", elem.type() == BSONType::object); - auto armParams = AsyncResultsMergerParams::parseOwned( - elem.embeddedObject().getOwned(), - IDLParserContext(kStageName, - auth::ValidatedTenancyScope::get(expCtx->getOperationContext()), - expCtx->getNamespaceString().tenantId(), - SerializationContext::stateDefault())); + + auto armParams = [&]() { + // Check if the stage definition contains the 'recordRemoteOpWaitTime' field. + // The 'recordRemoteOpWaitTime' field has no meaning since version 6.2 and has been removed + // from the IDL for 9.0. The field is still present in the BSON serialization output of + // '$mergeCursors' stages in versions < 9.0. + // In order to safely parse the stage definition from both older versions, check if the + // field is present and remove it if necessary. The field will not be present in stage + // definitions created by 9.0 or higher, so the necessity to rewrite here should be rare. + // TODO SERVER-126134: remove the check and the rewrite once 9.0 is last LTS. + constexpr StringData kRecordRemoteOpWaitTimeFieldName = "recordRemoteOpWaitTime"_sd; + BSONObj toParse; + if (elem.embeddedObject().hasElement(kRecordRemoteOpWaitTimeFieldName)) { + // 'recordRemoteOpWaitTime' is present, so remove it before parsing the stage + // definition. + toParse = elem.embeddedObject().removeField(kRecordRemoteOpWaitTimeFieldName); + } else { + // 'recordRemoteOpWaitTime' is not present, so use the provided stage definition as is + // for parsing. + toParse = elem.embeddedObject().getOwned(); + } + return AsyncResultsMergerParams::parseOwned( + std::move(toParse), + IDLParserContext(kStageName, + auth::ValidatedTenancyScope::get(expCtx->getOperationContext()), + expCtx->getNamespaceString().tenantId(), + SerializationContext::stateDefault())); + }(); return new DocumentSourceMergeCursors(expCtx, std::move(armParams)); } diff --git a/src/mongo/s/query/exec/document_source_merge_cursors_test.cpp b/src/mongo/s/query/exec/document_source_merge_cursors_test.cpp index a3edd847254..0bdad32109c 100644 --- a/src/mongo/s/query/exec/document_source_merge_cursors_test.cpp +++ b/src/mongo/s/query/exec/document_source_merge_cursors_test.cpp @@ -600,7 +600,6 @@ TEST_F(DocumentSourceMergeCursorsShapeTest, QueryShape) { "compareWholeSortKey": "?bool", "nss": "HASH", "allowPartialResults": false, - "recordRemoteOpWaitTime": false, "requestQueryStatsFromRemotes": false, "remotes": [] } @@ -621,7 +620,6 @@ TEST_F(DocumentSourceMergeCursorsShapeTest, RepresentativeShapeIsReparseable) { ], "nss": "test.mergeCursors", "allowPartialResults": false, - "recordRemoteOpWaitTime": false, "requestQueryStatsFromRemotes": false } })"); @@ -645,4 +643,34 @@ TEST_F(DocumentSourceMergeCursorsShapeTest, RepresentativeShapeIsReparseable) { auto newRepresentativeShape = newSerialization[0].getDocument().toBson(); ASSERT_BSONOBJ_EQ(representativeShape, newRepresentativeShape); } + +TEST_F(DocumentSourceMergeCursorsShapeTest, CanBeParsedDespiteRecordRemoteOpWaitTimeBeingSet) { + auto spec = fromjson(R"({ + "$mergeCursors": { + "compareWholeSortKey": true, + "remotes": [ + { + "shardId": "FakeShard1", + "hostAndPort": "FakeShard1Host:12345", + "cursorResponse": {ok: 1, cursor: {id: NumberLong(11111), ns: "test.mergeCursors", firstBatch: []}} + } + ], + "nss": "test.mergeCursors", + "recordRemoteOpWaitTime": true + } + })"); + auto stage = DocumentSourceMergeCursors::createFromBson(spec.firstElement(), getExpCtx()); + + // There is no need for closing remote cursors within this unit-test. + dynamic_cast(stage.get())->dismissCursorOwnership(); + + auto opts = SerializationOptions::kRepresentativeQueryShapeSerializeOptions; + std::vector newSerialization; + stage->serializeToArray(newSerialization, opts); + auto newRepresentativeShape = newSerialization[0].getDocument().toBson(); + ASSERT_TRUE(newRepresentativeShape["$mergeCursors"].isABSONObj()); + ASSERT_FALSE(newRepresentativeShape["$mergeCursors"].embeddedObject().hasField( + "recordRemoteOpWaitTime")); +} + } // namespace mongo