summaryrefslogtreecommitdiff
path: root/src/mongo/s/write_ops
diff options
context:
space:
mode:
authorBlake Oler <blake.oler@mongodb.com>2019-06-20 11:50:28 -0400
committerBlake Oler <blake.oler@mongodb.com>2019-06-27 17:31:09 -0400
commitc11b97788fcc91288deac647ddcc11625607d256 (patch)
tree3c95e51b7ed04c7a7aa94e6ef56a30ec293e0d9e /src/mongo/s/write_ops
parentd960519275aba7e6611294903cd2b5156710a73b (diff)
downloadmongo-c11b97788fcc91288deac647ddcc11625607d256.tar.gz
SERVER-41676 Convert TransactionRouter to use observer pattern to synchronize internal data
with external observers
Diffstat (limited to 'src/mongo/s/write_ops')
-rw-r--r--src/mongo/s/write_ops/batch_write_exec_test.cpp4
-rw-r--r--src/mongo/s/write_ops/batch_write_op.cpp2
-rw-r--r--src/mongo/s/write_ops/batch_write_op_test.cpp2
-rw-r--r--src/mongo/s/write_ops/write_op.cpp2
-rw-r--r--src/mongo/s/write_ops/write_op_test.cpp2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/mongo/s/write_ops/batch_write_exec_test.cpp b/src/mongo/s/write_ops/batch_write_exec_test.cpp
index d0c2434c13c..b171341c64c 100644
--- a/src/mongo/s/write_ops/batch_write_exec_test.cpp
+++ b/src/mongo/s/write_ops/batch_write_exec_test.cpp
@@ -640,9 +640,9 @@ public:
_scopedSession.emplace(operationContext());
auto txnRouter = TransactionRouter::get(operationContext());
- txnRouter->beginOrContinueTxn(
+ txnRouter.beginOrContinueTxn(
operationContext(), kTxnNumber, TransactionRouter::TransactionActions::kStart);
- txnRouter->setDefaultAtClusterTime(operationContext());
+ txnRouter.setDefaultAtClusterTime(operationContext());
}
void tearDown() override {
diff --git a/src/mongo/s/write_ops/batch_write_op.cpp b/src/mongo/s/write_ops/batch_write_op.cpp
index 5efce61128d..cc1d18e2f30 100644
--- a/src/mongo/s/write_ops/batch_write_op.cpp
+++ b/src/mongo/s/write_ops/batch_write_op.cpp
@@ -248,7 +248,7 @@ BatchWriteOp::BatchWriteOp(OperationContext* opCtx, const BatchedCommandRequest&
: _opCtx(opCtx),
_clientRequest(clientRequest),
_batchTxnNum(_opCtx->getTxnNumber()),
- _inTransaction(TransactionRouter::get(opCtx) != nullptr) {
+ _inTransaction(bool(TransactionRouter::get(opCtx))) {
_writeOps.reserve(_clientRequest.sizeWriteOps());
for (size_t i = 0; i < _clientRequest.sizeWriteOps(); ++i) {
diff --git a/src/mongo/s/write_ops/batch_write_op_test.cpp b/src/mongo/s/write_ops/batch_write_op_test.cpp
index 49b586fc58a..38c874eee90 100644
--- a/src/mongo/s/write_ops/batch_write_op_test.cpp
+++ b/src/mongo/s/write_ops/batch_write_op_test.cpp
@@ -1562,7 +1562,7 @@ public:
_scopedSession.emplace(operationContext());
auto txnRouter = TransactionRouter::get(operationContext());
- txnRouter->beginOrContinueTxn(
+ txnRouter.beginOrContinueTxn(
operationContext(), kTxnNumber, TransactionRouter::TransactionActions::kStart);
}
diff --git a/src/mongo/s/write_ops/write_op.cpp b/src/mongo/s/write_ops/write_op.cpp
index 97e5b1d1795..fad332f928c 100644
--- a/src/mongo/s/write_ops/write_op.cpp
+++ b/src/mongo/s/write_ops/write_op.cpp
@@ -76,7 +76,7 @@ Status WriteOp::targetWrites(OperationContext* opCtx,
//
// NOTE: Index inserts are currently specially targeted only at the current collection to avoid
// creating collections everywhere.
- const bool inTransaction = TransactionRouter::get(opCtx) != nullptr;
+ const bool inTransaction = bool(TransactionRouter::get(opCtx));
if (swEndpoints.isOK() && swEndpoints.getValue().size() > 1u && !inTransaction) {
swEndpoints = targeter.targetAllShards(opCtx);
}
diff --git a/src/mongo/s/write_ops/write_op_test.cpp b/src/mongo/s/write_ops/write_op_test.cpp
index 3110a74c909..4911ee13f97 100644
--- a/src/mongo/s/write_ops/write_op_test.cpp
+++ b/src/mongo/s/write_ops/write_op_test.cpp
@@ -337,7 +337,7 @@ TEST_F(WriteOpTransactionTests, TargetMultiAllShardsAndErrorSingleChildOp) {
opCtx()->setTxnNumber(kTxnNumber);
auto txnRouter = TransactionRouter::get(opCtx());
- txnRouter->beginOrContinueTxn(
+ txnRouter.beginOrContinueTxn(
opCtx(), kTxnNumber, TransactionRouter::TransactionActions::kStart);
// Do multi-target write op