diff options
Diffstat (limited to 'src/mongo/db/query/parsed_projection.cpp')
| -rw-r--r-- | src/mongo/db/query/parsed_projection.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/mongo/db/query/parsed_projection.cpp b/src/mongo/db/query/parsed_projection.cpp index 91b0156f8f4..415087e7fb1 100644 --- a/src/mongo/db/query/parsed_projection.cpp +++ b/src/mongo/db/query/parsed_projection.cpp @@ -114,7 +114,7 @@ Status ParsedProjection::make(OperationContext* opCtx, "Cannot specify positional operator and $elemMatch."); } - if (mongoutils::str::contains(elem.fieldName(), '.')) { + if (str::contains(elem.fieldName(), '.')) { return Status(ErrorCodes::BadValue, "Cannot use $elemMatch projection on a nested field."); } @@ -149,7 +149,7 @@ Status ParsedProjection::make(OperationContext* opCtx, pp->_arrayFields.push_back(elem.fieldNameStringData()); } else if (e2.fieldNameStringData() == "$meta") { // Field for meta must be top level. We can relax this at some point. - if (mongoutils::str::contains(elem.fieldName(), '.')) { + if (str::contains(elem.fieldName(), '.')) { return Status(ErrorCodes::BadValue, "field for $meta cannot be nested"); } @@ -231,17 +231,17 @@ Status ParsedProjection::make(OperationContext* opCtx, "Cannot specify positional operator and $elemMatch."); } - std::string after = mongoutils::str::after(elem.fieldName(), ".$"); - if (mongoutils::str::contains(after, ".$")) { - mongoutils::str::stream ss; + std::string after = str::after(elem.fieldName(), ".$"); + if (str::contains(after, ".$")) { + str::stream ss; ss << "Positional projection '" << elem.fieldName() << "' contains " << "the positional operator more than once."; return Status(ErrorCodes::BadValue, ss); } - std::string matchfield = mongoutils::str::before(elem.fieldName(), '.'); + std::string matchfield = str::before(elem.fieldName(), '.'); if (query && !_hasPositionalOperatorMatch(query, matchfield)) { - mongoutils::str::stream ss; + str::stream ss; ss << "Positional projection '" << elem.fieldName() << "' does not " << "match the query document."; return Status(ErrorCodes::BadValue, ss); @@ -382,10 +382,8 @@ bool ParsedProjection::isFieldRetainedExactly(StringData path) const { // static bool ParsedProjection::_isPositionalOperator(const char* fieldName) { - return mongoutils::str::contains(fieldName, ".$") && - !mongoutils::str::contains(fieldName, ".$ref") && - !mongoutils::str::contains(fieldName, ".$id") && - !mongoutils::str::contains(fieldName, ".$db"); + return str::contains(fieldName, ".$") && !str::contains(fieldName, ".$ref") && + !str::contains(fieldName, ".$id") && !str::contains(fieldName, ".$db"); } // static @@ -406,7 +404,7 @@ bool ParsedProjection::_hasPositionalOperatorMatch(const MatchExpression* const if (!pathRawData) { return false; } - std::string pathPrefix = mongoutils::str::before(pathRawData, '.'); + std::string pathPrefix = str::before(pathRawData, '.'); return pathPrefix == matchfield; } return false; |