diff options
author | Mathias Stearn <mathias@10gen.com> | 2013-07-26 18:21:00 -0400 |
---|---|---|
committer | Mathias Stearn <mathias@10gen.com> | 2013-08-08 16:04:30 -0400 |
commit | 8e93f578191525c7dd96d3e5ab85c66b4802df55 (patch) | |
tree | 18907cbdadc1001703a6c2f0d1df56a94cda34f0 /src/mongo/db/pipeline/expression_context.cpp | |
parent | 17b3f0fa4e42735c2d233984bf61fab87b49dde3 (diff) | |
download | mongo-8e93f578191525c7dd96d3e5ab85c66b4802df55.tar.gz |
Make doingMerge a property of DocumentSourceGroup rather than ExpressionContext
Prep for sharded $out (SERVER-10097). Will need to be able to send a
merging $group to a shard.
Diffstat (limited to 'src/mongo/db/pipeline/expression_context.cpp')
-rw-r--r-- | src/mongo/db/pipeline/expression_context.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mongo/db/pipeline/expression_context.cpp b/src/mongo/db/pipeline/expression_context.cpp index 2868db1936e..3b5009cc2d5 100644 --- a/src/mongo/db/pipeline/expression_context.cpp +++ b/src/mongo/db/pipeline/expression_context.cpp @@ -26,8 +26,7 @@ namespace mongo { } inline ExpressionContext::ExpressionContext(InterruptStatus *pS, const NamespaceString& ns) - : doingMerge(false) - , inShard(false) + : inShard(false) , inRouter(false) , extSortAllowed(false) , intCheckCounter(1) @@ -47,7 +46,6 @@ namespace mongo { ExpressionContext* ExpressionContext::clone() { ExpressionContext* newContext = create(pStatus, getNs()); - newContext->setDoingMerge(getDoingMerge()); newContext->setInShard(getInShard()); newContext->setInRouter(getInRouter()); newContext->setExtSortAllowed(getExtSortAllowed()); |