diff options
| author | Nathan Myers <nathan.myers@10gen.com> | 2017-02-07 14:41:07 -0500 |
|---|---|---|
| committer | Nathan Myers <nathan.myers@10gen.com> | 2017-02-07 14:41:07 -0500 |
| commit | e8ead9e1ce17ce7cb72c6d2ae9047e4dbb30357f (patch) | |
| tree | 859fa370d9dcd130b9f17b7d3839d6df5560272d | |
| parent | d045ca8b414d8a6312524548ff015ec0623e42a8 (diff) | |
| download | mongo-e8ead9e1ce17ce7cb72c6d2ae9047e4dbb30357f.tar.gz | |
SERVER-24368 Fix lint
| -rw-r--r-- | src/mongo/db/s/collection_range_deleter.cpp | 13 | ||||
| -rw-r--r-- | src/mongo/db/s/collection_range_deleter_test.cpp | 9 |
2 files changed, 13 insertions, 9 deletions
diff --git a/src/mongo/db/s/collection_range_deleter.cpp b/src/mongo/db/s/collection_range_deleter.cpp index a8491193cfe..24b2f37deb0 100644 --- a/src/mongo/db/s/collection_range_deleter.cpp +++ b/src/mongo/db/s/collection_range_deleter.cpp @@ -174,7 +174,11 @@ int CollectionRangeDeleter::_doDeletion(OperationContext* txn, int numDeleted = 0; do { - auto exec = InternalPlanner::indexScan(txn, collection, desc, min, max, + auto exec = InternalPlanner::indexScan(txn, + collection, + desc, + min, + max, BoundInclusion::kIncludeStartKeyOnly, PlanExecutor::YIELD_MANUAL, InternalPlanner::FORWARD, @@ -186,10 +190,9 @@ int CollectionRangeDeleter::_doDeletion(OperationContext* txn, } if (state == PlanExecutor::FAILURE || state == PlanExecutor::DEAD) { warning(LogComponent::kSharding) - << PlanExecutor::statestr(state) << " - cursor error while trying to delete " - << min << " to " << max << " in " << _nss << ": " - << WorkingSetCommon::toStatusString(obj) << ", stats: " - << Explain::getWinningPlanStats(exec.get()); + << PlanExecutor::statestr(state) << " - cursor error while trying to delete " << min + << " to " << max << " in " << _nss << ": " << WorkingSetCommon::toStatusString(obj) + << ", stats: " << Explain::getWinningPlanStats(exec.get()); break; } diff --git a/src/mongo/db/s/collection_range_deleter_test.cpp b/src/mongo/db/s/collection_range_deleter_test.cpp index 06f6d78e735..0df5477127e 100644 --- a/src/mongo/db/s/collection_range_deleter_test.cpp +++ b/src/mongo/db/s/collection_range_deleter_test.cpp @@ -75,7 +75,8 @@ void CollectionRangeDeleterTest::setUp() { AutoGetCollection autoColl(operationContext(), kNamespaceString, MODE_IX); auto collectionShardingState = CollectionShardingState::get(operationContext(), kNamespaceString); - collectionShardingState->refreshMetadata(operationContext(), + collectionShardingState->refreshMetadata( + operationContext(), stdx::make_unique<CollectionMetadata>(kKeyPattern, ChunkVersion(1, 1, OID::gen()))); _metadataManager = collectionShardingState->getMetadataManagerForTest(); } @@ -114,13 +115,13 @@ TEST_F(CollectionRangeDeleterTest, NoDataInGivenRangeToClean) { _dbDirectClient->insert(kNamespaceString.toString(), insertedDoc); ASSERT_BSONOBJ_EQ(insertedDoc, - _dbDirectClient->findOne(kNamespaceString.toString(), QUERY(kPattern << 25))); + _dbDirectClient->findOne(kNamespaceString.toString(), QUERY(kPattern << 25))); _metadataManager->addRangeToClean(ChunkRange(BSON(kPattern << 0), BSON(kPattern << 10))); ASSERT_FALSE(rangeDeleter.cleanupNextRange(operationContext(), 1)); ASSERT_BSONOBJ_EQ(insertedDoc, - _dbDirectClient->findOne(kNamespaceString.toString(), QUERY(kPattern << 25))); + _dbDirectClient->findOne(kNamespaceString.toString(), QUERY(kPattern << 25))); } // Tests the case that there is a single document within a range to clean. @@ -130,7 +131,7 @@ TEST_F(CollectionRangeDeleterTest, OneDocumentInOneRangeToClean) { _dbDirectClient->insert(kNamespaceString.toString(), BSON(kPattern << 5)); ASSERT_BSONOBJ_EQ(insertedDoc, - _dbDirectClient->findOne(kNamespaceString.toString(), QUERY(kPattern << 5))); + _dbDirectClient->findOne(kNamespaceString.toString(), QUERY(kPattern << 5))); _metadataManager->addRangeToClean(ChunkRange(BSON(kPattern << 0), BSON(kPattern << 10))); |