diff options
| author | Kevin Pulo <kevin.pulo@mongodb.com> | 2020-05-19 14:29:26 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-06-05 12:48:36 +0000 |
| commit | 7074dee1fbf6763c0d463c377c2e47d8ef2c4f6f (patch) | |
| tree | 80d364f790c795d16b77fb1efa1cc5e3788e1d9c /src/mongo/db/repl/oplog_fetcher_test.cpp | |
| parent | 5072922b32f94857098546366f17c93673154e72 (diff) | |
| download | mongo-7074dee1fbf6763c0d463c377c2e47d8ef2c4f6f.tar.gz | |
SERVER-47914 Move clusterTime from LogicalClock to VectorClock
Diffstat (limited to 'src/mongo/db/repl/oplog_fetcher_test.cpp')
| -rw-r--r-- | src/mongo/db/repl/oplog_fetcher_test.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/mongo/db/repl/oplog_fetcher_test.cpp b/src/mongo/db/repl/oplog_fetcher_test.cpp index bb22b7537fe..3987c4a6437 100644 --- a/src/mongo/db/repl/oplog_fetcher_test.cpp +++ b/src/mongo/db/repl/oplog_fetcher_test.cpp @@ -35,10 +35,10 @@ #include "mongo/db/repl/repl_server_parameters_gen.h" #include "mongo/db/repl/task_executor_mock.h" #include "mongo/db/service_context_test_fixture.h" +#include "mongo/db/signed_logical_time.h" #include "mongo/dbtests/mock/mock_dbclient_connection.h" #include "mongo/executor/thread_pool_task_executor_test_fixture.h" #include "mongo/rpc/metadata.h" -#include "mongo/rpc/metadata/logical_time_metadata.h" #include "mongo/rpc/metadata/oplog_query_metadata.h" #include "mongo/rpc/metadata/repl_set_metadata.h" #include "mongo/unittest/death_test.h" @@ -2208,13 +2208,22 @@ TEST_F(OplogFetcherTest, HandleLogicalTimeMetaDataAndAdvanceClusterTime) { auto oldClusterTime = LogicalClock::get(getGlobalServiceContext())->getClusterTime(); auto logicalTime = LogicalTime(Timestamp(123456, 78)); - auto logicalTimeMetadata = - rpc::LogicalTimeMetadata(SignedLogicalTime(logicalTime, TimeProofService::TimeProof(), 0)); + auto signedTime = SignedLogicalTime(logicalTime, TimeProofService::TimeProof(), 0); BSONObjBuilder bob; ASSERT_OK(replSetMetadata.writeToMetadata(&bob)); ASSERT_OK(oqMetadata.writeToMetadata(&bob)); - logicalTimeMetadata.writeToMetadata(&bob); + + BSONObjBuilder subObjBuilder(bob.subobjStart("$clusterTime")); + signedTime.getTime().asTimestamp().append(subObjBuilder.bb(), "clusterTime"); + + BSONObjBuilder signatureObjBuilder(subObjBuilder.subobjStart("signature")); + signedTime.getProof()->appendAsBinData(signatureObjBuilder, "hash"); + signatureObjBuilder.append("keyId", signedTime.getKeyId()); + signatureObjBuilder.doneFast(); + + subObjBuilder.doneFast(); + auto metadataObj = bob.obj(); // Process one batch with the logical time metadata. |