From 83d1fbcecb9d65c62aca6e8713e1b90c8bae9e0d Mon Sep 17 00:00:00 2001
From: zhaorongsheng <zhaorongsheng@bigo.sg>
Date: Sun, 19 Apr 2020 23:09:06 +0800
Subject: [PATCH] change nodurable cursor to active

---
 .../mledger/impl/ManagedLedgerImpl.java           |  3 ++-
 .../mledger/impl/NonDurableCursorImpl.java        | 15 ---------------
 .../mledger/impl/ManagedCursorTest.java           | 11 +++++++++++
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
index 2b192b91ddf8b..91333441fff91 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
@@ -858,6 +858,7 @@ public ManagedCursor newNonDurableCursor(Position startCursorPosition, String cu
 
         NonDurableCursorImpl cursor = new NonDurableCursorImpl(bookKeeper, config, this, cursorName,
                 (PositionImpl) startCursorPosition);
+        cursor.setActive();
 
         log.info("[{}] Opened new cursor: {}", name, cursor);
         synchronized (this) {
@@ -2894,7 +2895,7 @@ public void deactivateCursor(ManagedCursor cursor) {
     }
 
     public boolean isCursorActive(ManagedCursor cursor) {
-        return cursor.isDurable() && activeCursors.get(cursor.getName()) != null;
+        return activeCursors.get(cursor.getName()) != null;
     }
 
     private boolean currentLedgerIsFull() {
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorImpl.java
index bc57f79c58c07..a0720d4348cdb 100644
--- a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorImpl.java
+++ b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/NonDurableCursorImpl.java
@@ -92,21 +92,6 @@ protected void internalAsyncMarkDelete(final PositionImpl newPosition, Map<Strin
         callback.markDeleteComplete(ctx);
     }
 
-    @Override
-    public void setActive() {
-        /// No-Op
-    }
-
-    @Override
-    public boolean isActive() {
-        return false;
-    }
-
-    @Override
-    public void setInactive() {
-        /// No-Op
-    }
-
     @Override
     public void asyncClose(CloseCallback callback, Object ctx) {
         // No-Op
diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
index 75d0280ca52b7..7884533bc764c 100644
--- a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
+++ b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedCursorTest.java
@@ -3000,6 +3000,17 @@ void testAlwaysInactive() throws Exception {
         assertFalse(cursor.isActive());
     }
 
+    @Test
+    void testNonDurableCursorActive() throws Exception {
+        ManagedLedger ml = factory.open("testInactive");
+        ManagedCursor cursor = ml.newNonDurableCursor(PositionImpl.latest, "c1");
+
+        assertTrue(cursor.isActive());
+
+        cursor.setInactive();
+        assertFalse(cursor.isActive());
+    }
+
     @Test
     public void deleteMessagesCheckhMarkDelete() throws Exception {
         ManagedLedger ledger = factory.open("my_test_ledger");