summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNicholas Zolnierz <nicholas.zolnierz@mongodb.com>2019-10-23 19:11:39 +0000
committerevergreen <evergreen@mongodb.com>2019-10-23 19:11:39 +0000
commitde524442c2ab683d31c942c6d0b3e84a6a2a3c65 (patch)
treef368495496f84f0bda98e129463e09ce73cd285d /src
parentb11ca51de9765599b84e68156aedb26e27ef9b02 (diff)
downloadmongo-de524442c2ab683d31c942c6d0b3e84a6a2a3c65.tar.gz
SERVER-43303 Re introduce mapReduce fsm tests in sharded suites
Diffstat (limited to 'src')
-rw-r--r--src/mongo/db/commands/map_reduce_agg_test.cpp2
-rw-r--r--src/mongo/db/commands/mr_common.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/commands/map_reduce_agg_test.cpp b/src/mongo/db/commands/map_reduce_agg_test.cpp
index 1f79f718038..ada484ac475 100644
--- a/src/mongo/db/commands/map_reduce_agg_test.cpp
+++ b/src/mongo/db/commands/map_reduce_agg_test.cpp
@@ -98,7 +98,7 @@ TEST(MapReduceAggTest, testSortWithoutLimit) {
auto iter = sources.begin();
ASSERT(typeid(DocumentSourceSort) == typeid(**iter));
auto& sort = dynamic_cast<DocumentSourceSort&>(**iter++);
- ASSERT_EQ(-1ll, *sort.getLimit());
+ ASSERT(sort.getLimit() == boost::none);
ASSERT(typeid(DocumentSourceSingleDocumentTransformation) == typeid(**iter++));
ASSERT(typeid(DocumentSourceUnwind) == typeid(**iter++));
ASSERT(typeid(DocumentSourceGroup) == typeid(**iter));
diff --git a/src/mongo/db/commands/mr_common.cpp b/src/mongo/db/commands/mr_common.cpp
index e1595bea415..68ce716f0f5 100644
--- a/src/mongo/db/commands/mr_common.cpp
+++ b/src/mongo/db/commands/mr_common.cpp
@@ -68,7 +68,7 @@ using namespace std::string_literals;
auto translateSort(boost::intrusive_ptr<ExpressionContext> expCtx,
const BSONObj& sort,
const boost::optional<std::int64_t>& limit) {
- return DocumentSourceSort::create(expCtx, sort, limit.get_value_or(-1));
+ return DocumentSourceSort::create(expCtx, sort, limit.get_value_or(0));
}
auto translateMap(boost::intrusive_ptr<ExpressionContext> expCtx, std::string code) {