Revert "SERVER-33966 Removed Redundant Sort"r4.4.0

This reverts commit ed966606c2e5eb82f447c81986c64f8cfa0c74d7.

1 files changed, 8 insertions, 15 deletions

diff --git a/jstests/aggregation/mongos_merge.js b/jstests/aggregation/mongos_merge.js
index 633df86ab4b..e99dd77eb02 100644
--- a/jstests/aggregation/mongos_merge.js
+++ b/jstests/aggregation/mongos_merge.js
@@ -15,7 +15,6 @@
  *   requires_sharding,
  *   requires_spawning_own_processes,
  *   requires_profiling,
- *   requires_fcv_46,
  * ]
  */
 
@@ -346,6 +345,14 @@ function runTestCasesWhoseMergeLocationDependsOnAllowDiskUse(allowDiskUse) {
     // All test cases should merge on mongoD if allowDiskUse is true, mongoS otherwise.
     const assertMergeOnMongoX = (allowDiskUse ? assertMergeOnMongoD : assertMergeOnMongoS);
 
+    // Test that a blocking $sort is only merged on mongoS if 'allowDiskUse' is not set.
+    assertMergeOnMongoX({
+        testName: "agg_mongos_merge_blocking_sort_no_disk_use",
+        pipeline: [{$match: {_id: {$gte: -200, $lte: 200}}}, {$sort: {_id: -1}}, {$sort: {a: 1}}],
+        allowDiskUse: allowDiskUse,
+        expectedCount: 400
+    });
+
     // Test that $group is only merged on mongoS if 'allowDiskUse' is not set.
     assertMergeOnMongoX({
         testName: "agg_mongos_merge_group_allow_disk_use",
@@ -355,20 +362,6 @@ function runTestCasesWhoseMergeLocationDependsOnAllowDiskUse(allowDiskUse) {
         expectedCount: 299
     });
 
-    // Adjacent $sort stages will be coalesced and merge sort will occur on anyShard when disk use
-    // is allowed, and on mongos otherwise.
-    assertMergeOnMongoX({
-        testName: "agg_mongos_merge_blocking_sort_allow_disk_use",
-        pipeline: [
-            {$match: {_id: {$gte: -200, $lte: 200}}},
-            {$sort: {_id: 1}},
-            {$_internalSplitPipeline: {}},
-            {$sort: {a: 1}}
-        ],
-        allowDiskUse: allowDiskUse,
-        expectedCount: 400
-    });
-
     // Test that a blocking $sample is only merged on mongoS if 'allowDiskUse' is not set.
     assertMergeOnMongoX({
         testName: "agg_mongos_merge_blocking_sample_allow_disk_use",