summaryrefslogtreecommitdiff
path: root/jstests/core
diff options
context:
space:
mode:
authorNicholas Zolnierz <nicholas.zolnierz@mongodb.com>2019-09-13 19:42:25 +0000
committerevergreen <evergreen@mongodb.com>2019-09-13 19:42:25 +0000
commitabfc416116f6d5df1aea9bfe9e1d74c5b465c3a9 (patch)
treed42c1b6467377a3da107070d899910945bf6e620 /jstests/core
parent9d07c9c18090bcbeaf40eaebf584de5d1b17a74f (diff)
downloadmongo-abfc416116f6d5df1aea9bfe9e1d74c5b465c3a9.tar.gz
Revert "SERVER-42903 Enable execution of translated M/R pipeline"
This reverts commit f0c5f3000d83f806272c010002f8c64513a09330.
Diffstat (limited to 'jstests/core')
-rw-r--r--jstests/core/map_reduce_validation.js18
-rw-r--r--jstests/core/mr5.js4
-rw-r--r--jstests/core/mr_index.js4
-rw-r--r--jstests/core/mr_merge2.js4
-rw-r--r--jstests/core/mr_mutable_properties.js4
-rw-r--r--jstests/core/mr_sort.js4
-rw-r--r--jstests/core/mr_tolerates_js_exception.js4
-rw-r--r--jstests/core/mr_undef.js4
8 files changed, 0 insertions, 46 deletions
diff --git a/jstests/core/map_reduce_validation.js b/jstests/core/map_reduce_validation.js
index 233aa62a7bb..051c5ef11f8 100644
--- a/jstests/core/map_reduce_validation.js
+++ b/jstests/core/map_reduce_validation.js
@@ -6,8 +6,6 @@
(function() {
"use strict";
-load('jstests/libs/fixture_helpers.js'); // For 'FixtureHelpers'
-
const source = db.mr_validation;
source.drop();
assert.commandWorked(source.insert({x: 1}));
@@ -89,20 +87,4 @@ assert.commandFailed(db.runCommand({
reduce: reduceFunc,
out: {merge: "foo", db: /test/}
}));
-
-// Test that mapReduce fails when run against a view.
-assert.commandWorked(db.createView("sourceView", source.getName(), [{$project: {_id: 0}}]));
-assert.commandFailedWithCode(
- db.runCommand({mapReduce: "sourceView", map: mapFunc, reduce: reduceFunc, out: "foo"}),
- ErrorCodes.CommandNotSupportedOnView);
-
-// The new implementation is not supported in a sharded cluster yet, so avoid running it in the
-// passthrough suites.
-if (!FixtureHelpers.isMongos(db)) {
- assert.commandWorked(db.adminCommand({setParameter: 1, internalQueryUseAggMapReduce: true}));
- assert.commandFailedWithCode(
- db.runCommand({mapReduce: "sourceView", map: mapFunc, reduce: reduceFunc, out: "foo"}),
- ErrorCodes.CommandNotSupportedOnView);
- assert.commandWorked(db.adminCommand({setParameter: 1, internalQueryUseAggMapReduce: false}));
-}
}());
diff --git a/jstests/core/mr5.js b/jstests/core/mr5.js
index 42c6c0d4341..a27661ee66c 100644
--- a/jstests/core/mr5.js
+++ b/jstests/core/mr5.js
@@ -13,8 +13,6 @@ load("jstests/aggregation/extras/utils.js"); // For resultsEq.
const t = db.mr5;
t.drop();
-assert.commandWorked(db.adminCommand({setParameter: 1, internalQueryUseAggMapReduce: true}));
-
assert.commandWorked(t.insert({"partner": 1, "visits": 9}));
assert.commandWorked(t.insert({"partner": 2, "visits": 9}));
assert.commandWorked(t.insert({"partner": 1, "visits": 11}));
@@ -67,6 +65,4 @@ assert(resultsEq([9, 11, 30], resultAsObj["1"].stats));
assert(resultsEq([9, 41, 41], resultAsObj["2"].stats));
res.drop();
-
-assert.commandWorked(db.adminCommand({setParameter: 1, internalQueryUseAggMapReduce: false}));
}());
diff --git a/jstests/core/mr_index.js b/jstests/core/mr_index.js
index 35240275d9a..9b71a6b38e7 100644
--- a/jstests/core/mr_index.js
+++ b/jstests/core/mr_index.js
@@ -5,8 +5,6 @@
// uses_map_reduce_with_temp_collections,
// ]
-assert.commandWorked(db.adminCommand({setParameter: 1, internalQueryUseAggMapReduce: true}));
-
t = db.mr_index;
t.drop();
@@ -45,5 +43,3 @@ res = t.mapReduce(m, r, {out: outName});
assert.eq(3, ex().executionStats.nReturned, "B1");
res.drop();
-
-assert.commandWorked(db.adminCommand({setParameter: 1, internalQueryUseAggMapReduce: false}));
diff --git a/jstests/core/mr_merge2.js b/jstests/core/mr_merge2.js
index f83435e4e17..11f0e4490bc 100644
--- a/jstests/core/mr_merge2.js
+++ b/jstests/core/mr_merge2.js
@@ -8,8 +8,6 @@
// uses_map_reduce_with_temp_collections,
// ]
-assert.commandWorked(db.adminCommand({setParameter: 1, internalQueryUseAggMapReduce: true}));
-
t = db.mr_merge2;
t.drop();
@@ -56,5 +54,3 @@ res = t.mapReduce(m, r, outOptions);
expected["4"]++;
expected["5"] = 1;
assert.eq(tos(expected), tos(res.convertToSingleObject()), "B");
-
-assert.commandWorked(db.adminCommand({setParameter: 1, internalQueryUseAggMapReduce: false}));
diff --git a/jstests/core/mr_mutable_properties.js b/jstests/core/mr_mutable_properties.js
index cfd3a360a83..25087a63a8e 100644
--- a/jstests/core/mr_mutable_properties.js
+++ b/jstests/core/mr_mutable_properties.js
@@ -8,8 +8,6 @@
// Test argument and receiver (aka 'this') objects and their children can be mutated
// in Map, Reduce and Finalize functions
-assert.commandWorked(db.adminCommand({setParameter: 1, internalQueryUseAggMapReduce: true}));
-
var collection = db.mrMutableReceiver;
collection.drop();
collection.insert({a: 1});
@@ -74,5 +72,3 @@ assert.eq(mr.results[0].value.food[5].cream, 1);
mr.results[0].value.food.forEach(function(val) {
assert.eq(val.mod, 1);
});
-
-assert.commandWorked(db.adminCommand({setParameter: 1, internalQueryUseAggMapReduce: false}));
diff --git a/jstests/core/mr_sort.js b/jstests/core/mr_sort.js
index d29af5163ac..b0bd74fa1c5 100644
--- a/jstests/core/mr_sort.js
+++ b/jstests/core/mr_sort.js
@@ -8,8 +8,6 @@
// uses_map_reduce_with_temp_collections,
// ]
-assert.commandWorked(db.adminCommand({setParameter: 1, internalQueryUseAggMapReduce: true}));
-
t = db.mr_sort;
t.drop();
@@ -48,5 +46,3 @@ res = t.mapReduce(m, r, {out: "mr_sort_out", sort: {x: 1}, limit: 2});
x = res.convertToSingleObject();
res.drop();
assert.eq({"a": 3}, x, "A3");
-
-assert.commandWorked(db.adminCommand({setParameter: 1, internalQueryUseAggMapReduce: false}));
diff --git a/jstests/core/mr_tolerates_js_exception.js b/jstests/core/mr_tolerates_js_exception.js
index aa28285d3cb..e291639cb92 100644
--- a/jstests/core/mr_tolerates_js_exception.js
+++ b/jstests/core/mr_tolerates_js_exception.js
@@ -12,8 +12,6 @@
(function() {
"use strict";
-assert.commandWorked(db.adminCommand({setParameter: 1, internalQueryUseAggMapReduce: true}));
-
let coll = db.mr_tolerates_js_exception;
coll.drop();
for (let i = 0; i < 100; i++) {
@@ -69,6 +67,4 @@ assert(!cmdOutput.hasOwnProperty("stack"),
() => "mapReduce shouldn't return JavaScript stacktrace separately: " + tojson(cmdOutput));
assert(!cmdOutput.hasOwnProperty("originalError"),
() => "mapReduce shouldn't return wrapped version of the error: " + tojson(cmdOutput));
-
-assert.commandWorked(db.adminCommand({setParameter: 1, internalQueryUseAggMapReduce: false}));
}());
diff --git a/jstests/core/mr_undef.js b/jstests/core/mr_undef.js
index cddf86edf6d..f2ad1c135a4 100644
--- a/jstests/core/mr_undef.js
+++ b/jstests/core/mr_undef.js
@@ -5,8 +5,6 @@
// uses_map_reduce_with_temp_collections,
// ]
-assert.commandWorked(db.adminCommand({setParameter: 1, internalQueryUseAggMapReduce: true}));
-
t = db.mr_undef;
t.drop();
@@ -34,5 +32,3 @@ assert.eq(1, out.find({_id: {$type: 10}}).itcount(), "A2");
x = out.findOne();
assert.eq(x, out.findOne({_id: x["_id"]}), "A3");
-
-assert.commandWorked(db.adminCommand({setParameter: 1, internalQueryUseAggMapReduce: false}));