SERVER-36594 fix lint

madope · Aug 13, 2018 · 5948fb1 · 5948fb1
1 parent d394182
commit 5948fb1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/src/mongo/s/sharding_task_executor.cpp b/src/mongo/s/sharding_task_executor.cpp
@@ -159,9 +159,8 @@ StatusWith<TaskExecutor::CallbackHandle> ShardingTaskExecutor::scheduleRemoteCom
 
     auto clusterGLE = ClusterLastErrorInfo::get(request.opCtx->getClient());
 
-    auto shardingCb =
-        [ timeTracker, clusterGLE, cb, grid = Grid::get(request.opCtx), txnRouter ](
-            const TaskExecutor::RemoteCommandCallbackArgs& args) {
+    auto shardingCb = [ timeTracker, clusterGLE, cb, grid = Grid::get(request.opCtx), txnRouter ](
+        const TaskExecutor::RemoteCommandCallbackArgs& args) {
         ON_BLOCK_EXIT([&cb, &args]() { cb(args); });
 
         // Update replica set monitor info.

diff --git a/src/mongo/s/transaction/transaction_router.cpp b/src/mongo/s/transaction/transaction_router.cpp
@@ -56,9 +56,7 @@ class RouterSessionCatalog {
 
 private:
     stdx::mutex _mutex;
-    stdx::unordered_map<LogicalSessionId,
-                        std::shared_ptr<TransactionRouter>,
-                        LogicalSessionIdHash>
+    stdx::unordered_map<LogicalSessionId, std::shared_ptr<TransactionRouter>, LogicalSessionIdHash>
         _catalog;
 };
 
@@ -132,8 +130,8 @@ void appendReadConcernForTxn(BSONObjBuilder* bob, repl::ReadConcernArgs readConc
 }  // unnamed namespace
 
 TransactionRouter::Participant::Participant(bool isCoordinator,
-                                                 TxnNumber txnNumber,
-                                                 repl::ReadConcernArgs readConcernArgs)
+                                            TxnNumber txnNumber,
+                                            repl::ReadConcernArgs readConcernArgs)
     : _isCoordinator(isCoordinator), _txnNumber(txnNumber), _readConcernArgs(readConcernArgs) {}
 
 BSONObj TransactionRouter::Participant::attachTxnFieldsIfNeeded(BSONObj cmd) {
@@ -205,8 +203,7 @@ boost::optional<ShardId> TransactionRouter::getCoordinatorId() const {
     return _coordinatorId;
 }
 
-TransactionRouter::Participant& TransactionRouter::getOrCreateParticipant(
-    const ShardId& shard) {
+TransactionRouter::Participant& TransactionRouter::getOrCreateParticipant(const ShardId& shard) {
     auto iter = _participants.find(shard.toString());
 
     if (iter != _participants.end()) {
@@ -235,8 +232,8 @@ const LogicalSessionId& TransactionRouter::getSessionId() const {
 }
 
 void TransactionRouter::beginOrContinueTxn(OperationContext* opCtx,
-                                                TxnNumber txnNumber,
-                                                bool startTransaction) {
+                                           TxnNumber txnNumber,
+                                           bool startTransaction) {
     invariant(_isCheckedOut);
 
     if (startTransaction) {

diff --git a/src/mongo/s/transaction/transaction_router_test.cpp b/src/mongo/s/transaction/transaction_router_test.cpp
@@ -452,8 +452,7 @@ TEST_F(TransactionRouterTest, CannotUpconvertIfLevelOtherThanSnapshotWasGiven) {
     }
 }
 
-TEST_F(TransactionRouterTest,
-       CannotUpconvertIfLevelOtherThanSnapshotWasGivenWithAfterClusterTime) {
+TEST_F(TransactionRouterTest, CannotUpconvertIfLevelOtherThanSnapshotWasGivenWithAfterClusterTime) {
     auto readConcernLevels = {repl::ReadConcernLevel::kLocalReadConcern,
                               repl::ReadConcernLevel::kMajorityReadConcern,
                               repl::ReadConcernLevel::kLinearizableReadConcern,