diff options
| author | Andy Schwerin <schwerin@10gen.com> | 2014-01-15 19:25:58 -0500 |
|---|---|---|
| committer | Andy Schwerin <schwerin@10gen.com> | 2014-01-17 11:27:34 -0500 |
| commit | 1fa665f79dcc84eacbfe1f0a0cebcd75a93d4aa4 (patch) | |
| tree | 89777c4f9cc18e9f10653e6b8e4d2ad1b2af412c /src/mongo/db/matcher | |
| parent | 3930732761638a6bbc10f66e4ee80009c8c403e0 (diff) | |
| download | mongo-1fa665f79dcc84eacbfe1f0a0cebcd75a93d4aa4.tar.gz | |
SERVER-10159 In receivedUpdate, parse CanonicalQuery outside DB Write lock.
Diffstat (limited to 'src/mongo/db/matcher')
| -rw-r--r-- | src/mongo/db/matcher/expression_parser_text.cpp | 1 | ||||
| -rw-r--r-- | src/mongo/db/matcher/expression_where.cpp | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/matcher/expression_parser_text.cpp b/src/mongo/db/matcher/expression_parser_text.cpp index 156442e4d16..3b2b6bd6ea0 100644 --- a/src/mongo/db/matcher/expression_parser_text.cpp +++ b/src/mongo/db/matcher/expression_parser_text.cpp @@ -29,7 +29,6 @@ */ #include "mongo/base/init.h" -#include "mongo/db/client.h" #include "mongo/db/fts/fts_language.h" #include "mongo/db/jsobj.h" #include "mongo/db/matcher/expression_parser.h" diff --git a/src/mongo/db/matcher/expression_where.cpp b/src/mongo/db/matcher/expression_where.cpp index 6a1bad81c91..8f02a748467 100644 --- a/src/mongo/db/matcher/expression_where.cpp +++ b/src/mongo/db/matcher/expression_where.cpp @@ -161,7 +161,8 @@ namespace mongo { Client::Context* context = cc().getContext(); if ( !context ) - return StatusWithMatchExpression( ErrorCodes::BadValue, "no context in $where parsing" ); + return StatusWithMatchExpression( ErrorCodes::NoClientContext, + "no context in $where parsing" ); const char* ns = context->ns(); if ( !ns ) |