diff options
| author | Tess Avitabile <tess.avitabile@mongodb.com> | 2016-08-17 12:11:32 -0400 |
|---|---|---|
| committer | Tess Avitabile <tess.avitabile@mongodb.com> | 2016-08-23 10:05:02 -0400 |
| commit | 01a1b877bc7d103646ecc8608a8df89d74de1324 (patch) | |
| tree | 7355fdfbca4f6d235bfe5fd414520c18c1a28c41 /src/mongo/s/shard_key_pattern.cpp | |
| parent | 5c115e6ad38cd81e96c05ff2be5af17baeaedd68 (diff) | |
| download | mongo-01a1b877bc7d103646ecc8608a8df89d74de1324.tar.gz | |
SERVER-24439 code cleanup for collation shard targeting
Diffstat (limited to 'src/mongo/s/shard_key_pattern.cpp')
| -rw-r--r-- | src/mongo/s/shard_key_pattern.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/s/shard_key_pattern.cpp b/src/mongo/s/shard_key_pattern.cpp index 3ec6bd8809e..1a8e77658e1 100644 --- a/src/mongo/s/shard_key_pattern.cpp +++ b/src/mongo/s/shard_key_pattern.cpp @@ -282,9 +282,9 @@ StatusWith<BSONObj> ShardKeyPattern::extractShardKeyFromQuery(OperationContext* return extractShardKeyFromQuery(*query); } -StatusWith<BSONObj> ShardKeyPattern::extractShardKeyFromQuery(const CanonicalQuery& query) const { +BSONObj ShardKeyPattern::extractShardKeyFromQuery(const CanonicalQuery& query) const { if (!isValid()) - return StatusWith<BSONObj>(BSONObj()); + return BSONObj(); // Extract equalities from query. EqualityMatches equalities; @@ -297,7 +297,7 @@ StatusWith<BSONObj> ShardKeyPattern::extractShardKeyFromQuery(const CanonicalQue // NOTE: Failure to extract equality matches just means we return no shard key - it's not // an error we propagate if (!eqStatus.isOK()) - return StatusWith<BSONObj>(BSONObj()); + return BSONObj(); // Extract key from equalities // NOTE: The method below is equivalent to constructing a BSONObj and running @@ -312,7 +312,7 @@ StatusWith<BSONObj> ShardKeyPattern::extractShardKeyFromQuery(const CanonicalQue BSONElement equalEl = findEqualityElement(equalities, patternPath); if (!isShardKeyElement(equalEl, false)) - return StatusWith<BSONObj>(BSONObj()); + return BSONObj(); if (isHashedPattern()) { keyBuilder.append( @@ -326,7 +326,7 @@ StatusWith<BSONObj> ShardKeyPattern::extractShardKeyFromQuery(const CanonicalQue } dassert(isShardKey(keyBuilder.asTempObj())); - return StatusWith<BSONObj>(keyBuilder.obj()); + return keyBuilder.obj(); } bool ShardKeyPattern::isUniqueIndexCompatible(const BSONObj& uniqueIndexPattern) const { |