summaryrefslogtreecommitdiff
path: root/src/mongo/dbtests
diff options
context:
space:
mode:
authorMathias Stearn <mathias@10gen.com>2013-10-16 15:12:50 -0400
committerMathias Stearn <mathias@10gen.com>2013-10-21 13:49:33 -0400
commita6335f74f438868867f6e28bbf3efe2d400351d1 (patch)
tree895676b3f9a9be1d2a3139f7690429ec59d7a35a /src/mongo/dbtests
parent615357b9f15f6a9104d4a82a21fdbe24e6630201 (diff)
downloadmongo-a6335f74f438868867f6e28bbf3efe2d400351d1.tar.gz
Rename SplittableDocumentSource::getRouterSource to getMergeSource
In 2.6 it won't run in mongos any more so it became a misnomer.
Diffstat (limited to 'src/mongo/dbtests')
-rw-r--r--src/mongo/dbtests/documentsourcetests.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/dbtests/documentsourcetests.cpp b/src/mongo/dbtests/documentsourcetests.cpp
index b2e70f3ba76..a1426db6855 100644
--- a/src/mongo/dbtests/documentsourcetests.cpp
+++ b/src/mongo/dbtests/documentsourcetests.cpp
@@ -664,7 +664,7 @@ namespace DocumentSourceTests {
SplittableDocumentSource *splittable =
dynamic_cast<SplittableDocumentSource*>( group() );
ASSERT( splittable );
- intrusive_ptr<DocumentSource> routerSource = splittable->getRouterSource();
+ intrusive_ptr<DocumentSource> routerSource = splittable->getMergeSource();
ASSERT_NOT_EQUALS( group(), routerSource.get() );
return routerSource;
}
@@ -1075,7 +1075,7 @@ namespace DocumentSourceTests {
ASSERT_EQUALS(arr[0].getDocument().toBson(), BSON("$sort" << BSON("a" << 1)));
ASSERT(sort()->getShardSource() == NULL);
- ASSERT(sort()->getRouterSource() != NULL);
+ ASSERT(sort()->getMergeSource() != NULL);
}
ASSERT_TRUE(sort()->coalesce(mkLimit(10)));
@@ -1091,7 +1091,7 @@ namespace DocumentSourceTests {
<< DOC("$limit" << sort()->getLimit())));
ASSERT(sort()->getShardSource() != NULL);
- ASSERT(sort()->getRouterSource() != NULL);
+ ASSERT(sort()->getMergeSource() != NULL);
}
intrusive_ptr<DocumentSource> mkLimit(int limit) {