summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandolph Tan <randolph@10gen.com>2018-08-13 15:08:56 -0400
committerRandolph Tan <randolph@10gen.com>2018-08-13 15:37:28 -0400
commit5948fb10a2255f3e7074dad4c08deafce1a4056b (patch)
tree5ecae40852be1db8e52c78a845db2acee11310e6
parentd3941824b4473898bf987c7db381a84879d33c27 (diff)
downloadmongo-5948fb10a2255f3e7074dad4c08deafce1a4056b.tar.gz
SERVER-36594 fix lint
-rw-r--r--src/mongo/s/sharding_task_executor.cpp5
-rw-r--r--src/mongo/s/transaction/transaction_router.cpp15
-rw-r--r--src/mongo/s/transaction/transaction_router_test.cpp3
3 files changed, 9 insertions, 14 deletions
diff --git a/src/mongo/s/sharding_task_executor.cpp b/src/mongo/s/sharding_task_executor.cpp
index 03cc19b517f..cc61e210fe6 100644
--- 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
index b466633741c..a3b81646e29 100644
--- a/src/mongo/s/transaction/transaction_router.cpp
+++ b/src/mongo/s/transaction/transaction_router.cpp
@@ -56,9 +56,7 @@ public:
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
index 82170c832d3..0c5170b1899 100644
--- 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,