SERVER-43749 Modernize mapReduce tests in core

14 files changed, 22 insertions, 42 deletions

diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
index 35069ac7c3b..55a20cee7f2 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough.yml
@@ -51,8 +51,6 @@ selector:
   - jstests/core/stages_delete.js # Uses stageDebug command for deletes.
   # Tests that fail for Causal Consistency as they have statements that do not support
   # non-local read concern.
-  - jstests/core/geo_mapreduce.js
-  - jstests/core/geo_mapreduce2.js
   - jstests/core/geo_big_polygon3.js
   - jstests/core/mr*.js
   - jstests/core/collation.js
diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
index bf21865b3be..c13ffe4142e 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_passthrough_auth.yml
@@ -63,8 +63,6 @@ selector:
   - jstests/core/stages_delete.js # Uses stageDebug command for deletes.
   # Tests that fail for Causal Consistency as they have statements that do not support
   # non-local read concern.
-  - jstests/core/geo_mapreduce.js
-  - jstests/core/geo_mapreduce2.js
   - jstests/core/geo_big_polygon3.js
   - jstests/core/mr*.js
   - jstests/core/collation.js
diff --git a/buildscripts/resmokeconfig/suites/core_map_reduce_agg.yaml b/buildscripts/resmokeconfig/suites/core_map_reduce_agg.yaml
index d7aee4d28ea..34f9f15fb35 100644
--- a/buildscripts/resmokeconfig/suites/core_map_reduce_agg.yaml
+++ b/buildscripts/resmokeconfig/suites/core_map_reduce_agg.yaml
@@ -7,14 +7,12 @@ selector:
   - jstests/core/commands_namespace_parsing.js
   - jstests/core/map_reduce_validation.js
   - jstests/core/mr_preserve_indexes.js
-  - jstests/core/mr_merge2.js
+  - jstests/core/mr_merge.js
   - jstests/core/mr_mutable_properties.js
-  - jstests/core/mr_outreduce.js
-  - jstests/core/mr_outreduce2.js
+  - jstests/core/mr_reduce.js
   - jstests/core/mr_sort.js
   - jstests/core/mr_stored.js
   - jstests/core/mr_tolerates_js_exception.js
-  - jstests/core/mr_undef.js
   - jstests/core/mr_use_this_object.js
   - jstests/core/mr_scope.js
   - jstests/core/profile_mapreduce.js
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml
index bc6291f3fda..df1d2b5e692 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_100ms_refresh_jscore_passthrough.yml
@@ -81,9 +81,8 @@ selector:
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
   - jstests/core/explain_count.js
-  # TODO: Remove after fixing SERVER-14324. mapReduce behaves unpredictably when the out collection
-  # is sharded on anything other than {_id: 1}.
-  - jstests/core/mr_undef.js
+  # TODO: Remove after implementing SERVER-42677. Legacy mapReduce behaves unpredictably when the
+  # out collection is sharded on anything other than {_id: 1}.
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
   - jstests/core/expr_index_use.js
   - jstests/core/index_multikey.js
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml
index 690a2bd9a4f..deae692c9d3 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_10sec_refresh_jscore_passthrough.yml
@@ -81,9 +81,8 @@ selector:
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
   - jstests/core/explain_count.js
-  # TODO: Remove after fixing SERVER-14324. mapReduce behaves unpredictably when the out collection
-  # is sharded on anything other than {_id: 1}.
-  - jstests/core/mr_undef.js
+  # TODO: Remove after implementing SERVER-42677. Legacy mapReduce behaves unpredictably when the
+  # out collection is sharded on anything other than {_id: 1}.
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
   - jstests/core/expr_index_use.js
   - jstests/core/index_multikey.js
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml
index b3e3966a394..e9095451da0 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_1sec_refresh_jscore_passthrough.yml
@@ -81,9 +81,8 @@ selector:
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
   - jstests/core/explain_count.js
-  # TODO: Remove after fixing SERVER-14324. mapReduce behaves unpredictably when the out collection
-  # is sharded on anything other than {_id: 1}.
-  - jstests/core/mr_undef.js
+  # TODO: Remove after implementing SERVER-42677. Legacy mapReduce behaves unpredictably when the
+  # out collection is sharded on anything other than {_id: 1}.
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
   - jstests/core/expr_index_use.js
   - jstests/core/index_multikey.js
diff --git a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml
index dbd0948dac7..34bfad07835 100644
--- a/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/logical_session_cache_sharding_default_refresh_jscore_passthrough.yml
@@ -81,9 +81,8 @@ selector:
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
   - jstests/core/explain_count.js
-  # TODO: Remove after fixing SERVER-14324. mapReduce behaves unpredictably when the out collection
-  # is sharded on anything other than {_id: 1}.
-  - jstests/core/mr_undef.js
+  # TODO: Remove after implementing SERVER-42677. Legacy mapReduce behaves unpredictably when the
+  # out collection is sharded on anything other than {_id: 1}.
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
   - jstests/core/expr_index_use.js
   - jstests/core/index_multikey.js
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
index 2543d348ccd..cf7102b299c 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
@@ -76,9 +76,8 @@ selector:
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
   - jstests/core/explain_count.js
-  # TODO: Remove after fixing SERVER-14324. mapReduce behaves unpredictably when the out collection
-  # is sharded on anything other than {_id: 1}.
-  - jstests/core/mr_undef.js
+  # TODO: Remove after implementing SERVER-42677. Legacy mapReduce behaves unpredictably when the
+  # out collection is sharded on anything other than {_id: 1}.
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
   - jstests/core/expr_index_use.js
   - jstests/core/index_multikey.js
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
index 42576d1e2d6..b18dffb9ae9 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
@@ -76,9 +76,8 @@ selector:
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
   - jstests/core/explain_count.js
-  # TODO: Remove after fixing SERVER-14324. mapReduce behaves unpredictably when the out collection
-  # is sharded on anything other than {_id: 1}.
-  - jstests/core/mr_undef.js
+  # TODO: Remove after implementing SERVER-42677. Legacy mapReduce behaves unpredictably when the
+  # out collection is sharded on anything other than {_id: 1}.
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
   - jstests/core/expr_index_use.js
   - jstests/core/index_multikey.js
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
index a683683967b..12fce0cf58f 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
@@ -76,9 +76,8 @@ selector:
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
   - jstests/core/explain_count.js
-  # TODO: Remove after fixing SERVER-14324. mapReduce behaves unpredictably when the out collection
-  # is sharded on anything other than {_id: 1}.
-  - jstests/core/mr_undef.js
+  # TODO: Remove after implementing SERVER-42677. Legacy mapReduce behaves unpredictably when the
+  # out collection is sharded on anything other than {_id: 1}.
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
   - jstests/core/expr_index_use.js
   - jstests/core/index_multikey.js
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
index 7c2cf72f810..a71ae52e23e 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
@@ -76,9 +76,8 @@ selector:
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
   - jstests/core/explain_count.js
-  # TODO: Remove after fixing SERVER-14324. mapReduce behaves unpredictably when the out collection
-  # is sharded on anything other than {_id: 1}.
-  - jstests/core/mr_undef.js
+  # TODO: Remove after implementing SERVER-42677. Legacy mapReduce behaves unpredictably when the
+  # out collection is sharded on anything other than {_id: 1}.
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
   - jstests/core/expr_index_use.js
   - jstests/core/index_multikey.js
@@ -157,7 +156,6 @@ selector:
   # txn_passthrough_cmd_massage.js ineffective for preventing 2 phase drops
   # from contesting db/coll locks.
   - jstests/core/function_string_representations.js
-  - jstests/core/geo_mapreduce2.js
   - jstests/core/mr*.js
   - jstests/core/or4.js
 
diff --git a/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml b/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
index f546198a39e..a7825009894 100644
--- a/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
+++ b/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
@@ -76,9 +76,8 @@ selector:
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
   - jstests/core/explain_count.js
-  # TODO: Remove after fixing SERVER-14324. mapReduce behaves unpredictably when the out collection
-  # is sharded on anything other than {_id: 1}.
-  - jstests/core/mr_undef.js
+  # TODO: Remove after implementing SERVER-42677. Legacy mapReduce behaves unpredictably when the
+  # out collection is sharded on anything other than {_id: 1}.
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
   - jstests/core/expr_index_use.js
   - jstests/core/index_multikey.js
diff --git a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
index 19d8d1feb7c..2f964f507c9 100644
--- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_passthrough.yml
@@ -65,7 +65,6 @@ selector:
   - jstests/core/mr_correctness.js
   - jstests/core/mr_fail_invalid_js.js
   - jstests/core/mr_scope.js
-  - jstests/core/mr_undef.js
   # TODO: SERVER-30052
   - jstests/core/queryoptimizer3.js
   # TODO: SERVER-27269: mongos can't establish cursor if view has $collStats and views another view.
@@ -75,8 +74,6 @@ selector:
   - jstests/core/stages_delete.js # Uses stageDebug command for deletes.
   # Tests that fail for Causal Consistency as they have statements that do not support
   # non-local read concern.
-  - jstests/core/geo_mapreduce.js
-  - jstests/core/geo_mapreduce2.js
   - jstests/core/geo_big_polygon3.js
   - jstests/core/mr*.js
   - jstests/core/collation.js
diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
index 3f482a91acc..03e971ca184 100644
--- a/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_collections_jscore_passthrough.yml
@@ -76,9 +76,8 @@ selector:
   # TODO: Remove after fixing SERVER-32563. The implementation of explain for the count command is
   # incorrect on sharded collections.
   - jstests/core/explain_count.js
-  # TODO: Remove after fixing SERVER-14324. mapReduce behaves unpredictably when the out collection
-  # is sharded on anything other than {_id: 1}.
-  - jstests/core/mr_undef.js
+  # TODO: Remove after implementing SERVER-42677. Legacy mapReduce behaves unpredictably when the
+  # out collection is sharded on anything other than {_id: 1}.
   # TODO SERVER-32311: These tests use plan stage helpers which can't handle sharded explain output.
   - jstests/core/expr_index_use.js
   - jstests/core/index_multikey.js