diff options
| author | Siyuan Zhou <siyuan.zhou@mongodb.com> | 2019-05-12 18:46:02 -0400 |
|---|---|---|
| committer | Siyuan Zhou <siyuan.zhou@mongodb.com> | 2019-05-21 16:14:23 -0400 |
| commit | eeccd88d262c45392ec9a642f57415cba36463e2 (patch) | |
| tree | c02e32abc331732683c13cee88f2fdbd61953956 /src/mongo/db/repl/replication_recovery_test.cpp | |
| parent | 62906f2fae85fc734e52e7190799072717374cbb (diff) | |
| download | mongo-eeccd88d262c45392ec9a642f57415cba36463e2.tar.gz | |
SERVER-39809 Remove the prepare root field of oplog entry
Diffstat (limited to 'src/mongo/db/repl/replication_recovery_test.cpp')
| -rw-r--r-- | src/mongo/db/repl/replication_recovery_test.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/mongo/db/repl/replication_recovery_test.cpp b/src/mongo/db/repl/replication_recovery_test.cpp index e4372a3849a..dba35e6f823 100644 --- a/src/mongo/db/repl/replication_recovery_test.cpp +++ b/src/mongo/db/repl/replication_recovery_test.cpp @@ -240,8 +240,7 @@ repl::OplogEntry _makeOplogEntry(repl::OpTime opTime, boost::none, // statement id boost::none, // optime of previous write within same transaction boost::none, // pre-image optime - boost::none, // post-image optime - boost::none); // prepare + boost::none); // post-image optime } /** @@ -251,7 +250,6 @@ repl::OplogEntry _makeTransactionOplogEntry(repl::OpTime opTime, repl::OpTypeEnum opType, BSONObj object, repl::OpTime prevOpTime, - bool prepare, StmtId stmtId, OperationSessionInfo sessionInfo, Date_t wallTime) { @@ -266,9 +264,6 @@ repl::OplogEntry _makeTransactionOplogEntry(repl::OpTime opTime, builder.append("wall", wallTime); builder.append("stmtId", stmtId); builder.append("prevOpTime", prevOpTime.toBSON()); - if (prepare) { - builder.append("prepare", prepare); - } return uassertStatusOK(repl::OplogEntry::parse(builder.obj())); } @@ -911,7 +906,6 @@ TEST_F(ReplicationRecoveryTest, PrepareTransactionOplogEntryCorrectlyUpdatesConf repl::OpTypeEnum::kCommand, BSON("applyOps" << BSONArray() << "prepare" << true), OpTime(Timestamp(0, 0), -1), - true, // prepare 0, sessionInfo, lastDate); @@ -960,7 +954,6 @@ TEST_F(ReplicationRecoveryTest, AbortTransactionOplogEntryCorrectlyUpdatesConfig repl::OpTypeEnum::kCommand, BSON("applyOps" << BSONArray() << "prepare" << true), OpTime(Timestamp(0, 0), -1), - true, // prepare 0, sessionInfo, prepareDate); @@ -973,7 +966,6 @@ TEST_F(ReplicationRecoveryTest, AbortTransactionOplogEntryCorrectlyUpdatesConfig repl::OpTypeEnum::kCommand, BSON("abortTransaction" << 1), OpTime(Timestamp(2, 0), 1), - false, // prepare 1, sessionInfo, abortDate); @@ -1025,7 +1017,6 @@ DEATH_TEST_F(ReplicationRecoveryTest, repl::OpTypeEnum::kCommand, BSON("applyOps" << BSONArray() << "prepare" << true), OpTime(Timestamp(0, 0), -1), - true, // prepare 0, sessionInfo, lastDate); @@ -1065,7 +1056,6 @@ TEST_F(ReplicationRecoveryTest, CommitTransactionOplogEntryCorrectlyUpdatesConfi repl::OpTypeEnum::kCommand, BSON("applyOps" << txnOperations << "prepare" << true), OpTime(Timestamp(0, 0), -1), - true, // prepare 0, sessionInfo, prepareDate); @@ -1079,7 +1069,6 @@ TEST_F(ReplicationRecoveryTest, CommitTransactionOplogEntryCorrectlyUpdatesConfi repl::OpTypeEnum::kCommand, BSON("commitTransaction" << 1 << "commitTimestamp" << Timestamp(2, 1)), OpTime(Timestamp(2, 0), 1), - false, // prepare 1, sessionInfo, commitDate); @@ -1144,7 +1133,6 @@ TEST_F(ReplicationRecoveryTest, repl::OpTypeEnum::kCommand, BSON("applyOps" << txnOperations << "prepare" << true), OpTime(Timestamp(0, 0), -1), - true, // prepare 0, sessionInfo, prepareDate); @@ -1170,7 +1158,6 @@ TEST_F(ReplicationRecoveryTest, repl::OpTypeEnum::kCommand, BSON("commitTransaction" << 1 << "commitTimestamp" << Timestamp(2, 1)), OpTime(Timestamp(2, 0), 1), - false, // prepare 1, sessionInfo, commitDate); |