Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 0 insertions, 66 deletions

diff --git a/src/mongo/dbtests/cursor_manager_test.cpp b/src/mongo/dbtests/cursor_manager_test.cpp
index 52d543e9157..1cc8ee1f535 100644
--- a/src/mongo/dbtests/cursor_manager_test.cpp
+++ b/src/mongo/dbtests/cursor_manager_test.cpp
@@ -708,33 +708,6 @@ TEST_F(CursorManagerTestCustomOpCtx, MultipleCursorsMultipleOperationKeys) {
     ASSERT(cursors.find(cursor2) != cursors.end());
 }
 
-TEST_F(CursorManagerTestCustomOpCtx, MultipleCursorsSameOperationKey) {
-    auto opKey = UUID::gen();
-
-    auto opCtx = _queryServiceContext->makeOperationContext();
-    opCtx->setOperationKey(opKey);
-    auto cursor1 = makeCursor(opCtx.get()).getCursor()->cursorid();
-    auto cursor2 = makeCursor(opCtx.get()).getCursor()->cursorid();
-
-    // Retrieve cursors for operation key - should be both cursors.
-    auto cursors = useCursorManager()->getCursorsForOpKeys({opKey});
-    ASSERT_EQ(cursors.size(), size_t(2));
-    ASSERT(cursors.find(cursor1) != cursors.end());
-    ASSERT(cursors.find(cursor2) != cursors.end());
-
-    // Now delete first one. The other should remain.
-    ASSERT_OK(useCursorManager()->killCursor(opCtx.get(), cursor1));
-    cursors = useCursorManager()->getCursorsForOpKeys({opKey});
-    ASSERT_EQ(cursors.size(), size_t(1));
-    ASSERT(cursors.find(cursor1) == cursors.end());
-    ASSERT(cursors.find(cursor2) != cursors.end());
-
-    // Now delete the other. None should remain.
-    ASSERT_OK(useCursorManager()->killCursor(opCtx.get(), cursor2));
-    cursors = useCursorManager()->getCursorsForOpKeys({opKey});
-    ASSERT_EQ(cursors.size(), size_t(0));
-}
-
 TEST_F(CursorManagerTestCustomOpCtx, TimedOutCursorShouldNotBeReturnedForOpKeyLookup) {
     auto opKey = UUID::gen();
     auto opCtx = _queryServiceContext->makeOperationContext();
@@ -780,44 +753,5 @@ TEST_F(CursorManagerTestCustomOpCtx, CursorsMarkedAsKilledAreReturnedForOpKeyLoo
     auto cursors = useCursorManager()->getCursorsForOpKeys({opKey});
     ASSERT_EQ(cursors.size(), size_t(1));
 }
-
-TEST_F(CursorManagerTestCustomOpCtx,
-       GetCursorIdsForNamespaceReturnsSingleEntryForMatchingNamespace) {
-    auto opCtx = _queryServiceContext->makeOperationContext();
-    auto pinned = makeCursor(opCtx.get());
-    auto cursorId = pinned.getCursor()->cursorid();
-    auto cursorsForNamespace = useCursorManager()->getCursorIdsForNamespace(kTestNss);
-    ASSERT_EQUALS(cursorsForNamespace.size(), 1ull);
-    ASSERT_EQUALS(cursorsForNamespace[0], cursorId);
-}
-
-TEST_F(CursorManagerTestCustomOpCtx,
-       GetCursorIdsForNamespaceReturnsMultipleEntriesForMatchingNamespace) {
-    auto opCtx = _queryServiceContext->makeOperationContext();
-    auto pinned1 = makeCursor(opCtx.get());
-    auto pinned2 = makeCursor(opCtx.get());
-    auto cursorId1 = pinned1.getCursor()->cursorid();
-    auto cursorId2 = pinned2.getCursor()->cursorid();
-    auto cursorsForNamespace = useCursorManager()->getCursorIdsForNamespace(kTestNss);
-    ASSERT_EQUALS(cursorsForNamespace.size(), 2ull);
-    // The results for cursorsForNamespace won't necessarily be the same as the order of insertion.
-    std::set<CursorId> cursorsForNamespaceSet(cursorsForNamespace.begin(),
-                                              cursorsForNamespace.end());
-
-    ASSERT_EQUALS(cursorsForNamespaceSet.count(cursorId1), 1ull);
-    ASSERT_EQUALS(cursorsForNamespaceSet.count(cursorId2), 1ull);
-}
-
-TEST_F(CursorManagerTestCustomOpCtx,
-       GetCursorIdsForNamespaceDoesNotReturnEntriesForNonMatchingNamespace) {
-    auto opCtx = _queryServiceContext->makeOperationContext();
-    // Add a cursor for kTestNss.
-    auto pinned = makeCursor(opCtx.get());
-    // Get cursors for a different NamespaceString.
-    auto cursorsForNamespace =
-        useCursorManager()->getCursorIdsForNamespace(NamespaceString("somerandom.nss"));
-    ASSERT_EQUALS(cursorsForNamespace.size(), 0ull);
-}
-
 }  // namespace
 }  // namespace mongo