diff options
Diffstat (limited to 'src/mongo/db/op_observer_impl_test.cpp')
| -rw-r--r-- | src/mongo/db/op_observer_impl_test.cpp | 48 |
1 files changed, 34 insertions, 14 deletions
diff --git a/src/mongo/db/op_observer_impl_test.cpp b/src/mongo/db/op_observer_impl_test.cpp index 0fc2f08ae96..4ad6a6baed0 100644 --- a/src/mongo/db/op_observer_impl_test.cpp +++ b/src/mongo/db/op_observer_impl_test.cpp @@ -739,9 +739,13 @@ TEST_F(OpObserverTest, SingleStatementInsertTestIncludesTenantId) { auto oplogEntryObj = getSingleOplogEntry(opCtx.get()); const repl::OplogEntry& entry = assertGet(repl::OplogEntry::parse(oplogEntryObj)); - ASSERT(nss.tenantId().has_value()); + // TODO SERVER-67155 Check that (nss == entry.getNss()) and uncomment the + // line below once the OplogEntry deserializer passes "tid" to the NamespaceString + // constructor + ASSERT_EQ(NamespaceString(boost::none, nss.ns()), entry.getNss()); + // ASSERT(nss.tenantId().has_value()); + ASSERT_EQ(*nss.tenantId(), *entry.getTid()); - ASSERT_EQ(nss, entry.getNss()); ASSERT_EQ(uuid, *entry.getUuid()); } @@ -772,7 +776,9 @@ TEST_F(OpObserverTest, SingleStatementUpdateTestIncludesTenantId) { ASSERT(nss.tenantId().has_value()); ASSERT_EQ(*nss.tenantId(), *entry.getTid()); - ASSERT_EQ(nss, entry.getNss()); + // TODO SERVER-67155 Check that (nss == entry.getNss()) once the OplogEntry deserializer passes + // "tid" to the NamespaceString constructor + ASSERT_EQ(NamespaceString(boost::none, nss.ns()), entry.getNss()); ASSERT_EQ(uuid, *entry.getUuid()); } @@ -798,9 +804,11 @@ TEST_F(OpObserverTest, SingleStatementDeleteTestIncludesTenantId) { auto oplogEntryObj = getSingleOplogEntry(opCtx.get()); const repl::OplogEntry& entry = assertGet(repl::OplogEntry::parse(oplogEntryObj)); - ASSERT(nss.tenantId().has_value()); + // TODO SERVER-67155 Check that (nss == entry.getNss()) once the OplogEntry deserializer passes + // "tid" to the NamespaceString constructor + // ASSERT(nss.tenantId().has_value()); + ASSERT_EQ(NamespaceString(boost::none, nss.ns()), entry.getNss()); ASSERT_EQ(*nss.tenantId(), *entry.getTid()); - ASSERT_EQ(nss, entry.getNss()); ASSERT_EQ(uuid, *entry.getUuid()); } @@ -2953,9 +2961,13 @@ TEST_F(BatchedWriteOutputsTest, TestApplyOpsInsertDeleteUpdateIncludesTenantId) const auto innerEntry = innerEntries[0]; ASSERT(innerEntry.getCommandType() == OplogEntry::CommandType::kNotCommand); ASSERT(innerEntry.getOpType() == repl::OpTypeEnum::kInsert); - ASSERT(innerEntry.getNss() == _nssWithTid); - ASSERT(innerEntry.getNss().tenantId().has_value()); - ASSERT(*innerEntry.getNss().tenantId() == *_nssWithTid.tenantId()); + // TODO SERVER-67155 Check that (innerEntry.getNss() == _nssWithTid) and uncomment the + // 2 lines below once the OplogEntry deserializer passes "tid" to the NamespaceString + // constructor + ASSERT(innerEntry.getNss() == NamespaceString(boost::none, _nssWithTid.ns())); + // ASSERT(innerEntry.getNss().tenantId().has_value()); + // ASSERT(*innerEntry.getNss().tenantId() == *_nssWithTid.tenantId()); + ASSERT(innerEntry.getTid().has_value()); ASSERT(*innerEntry.getTid() == *_nssWithTid.tenantId()); ASSERT(0 == @@ -2967,9 +2979,13 @@ TEST_F(BatchedWriteOutputsTest, TestApplyOpsInsertDeleteUpdateIncludesTenantId) const auto innerEntry = innerEntries[1]; ASSERT(innerEntry.getCommandType() == OplogEntry::CommandType::kNotCommand); ASSERT(innerEntry.getOpType() == repl::OpTypeEnum::kDelete); - ASSERT(innerEntry.getNss() == _nssWithTid); - ASSERT(innerEntry.getNss().tenantId().has_value()); - ASSERT(*innerEntry.getNss().tenantId() == *_nssWithTid.tenantId()); + // TODO SERVER-67155 Check that (innerEntry.getNss() == _nssWithTid) and uncomment the + // 2 lines below once the OplogEntry deserializer passes "tid" to the NamespaceString + // constructor + ASSERT(innerEntry.getNss() == NamespaceString(boost::none, _nssWithTid.ns())); + // ASSERT(innerEntry.getNss().tenantId().has_value()); + // ASSERT(*innerEntry.getNss().tenantId() == *_nssWithTid.tenantId()); + ASSERT(innerEntry.getTid().has_value()); ASSERT(*innerEntry.getTid() == *_nssWithTid.tenantId()); ASSERT(0 == innerEntry.getObject().woCompare(BSON("_id" << 1))); @@ -2979,9 +2995,13 @@ TEST_F(BatchedWriteOutputsTest, TestApplyOpsInsertDeleteUpdateIncludesTenantId) const auto innerEntry = innerEntries[2]; ASSERT(innerEntry.getCommandType() == OplogEntry::CommandType::kNotCommand); ASSERT(innerEntry.getOpType() == repl::OpTypeEnum::kUpdate); - ASSERT(innerEntry.getNss() == _nssWithTid); - ASSERT(innerEntry.getNss().tenantId().has_value()); - ASSERT(*innerEntry.getNss().tenantId() == *_nssWithTid.tenantId()); + // TODO SERVER-67155 Check that (innerEntry.getNss() == _nssWithTid) and uncomment the + // 2 lines below once the OplogEntry deserializer passes "tid" to the NamespaceString + // constructor + ASSERT(innerEntry.getNss() == NamespaceString(boost::none, _nssWithTid.ns())); + // ASSERT(innerEntry.getNss().tenantId().has_value()); + // ASSERT(*innerEntry.getNss().tenantId() == *_nssWithTid.tenantId()); + ASSERT(innerEntry.getTid().has_value()); ASSERT(*innerEntry.getTid() == *_nssWithTid.tenantId()); ASSERT(0 == |