(pulsar) branch master updated: [cleanup] [broker] fix return value of TransactionTimeoutTrackerImpl#addTransaction (#22020)

[xiangying]

This is an automated email from the ASF dual-hosted git repository.

xiangying pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 0dabc9754aa [cleanup] [broker] fix return value of 
TransactionTimeoutTrackerImpl#addTransaction (#22020)
0dabc9754aa is described below

commit 0dabc9754aa371b241fc3daec4df21bee3ff8ce2
Author: thetumbled <52550727+thetumb...@users.noreply.github.com>
AuthorDate: Tue Feb 6 18:40:04 2024 +0800

    [cleanup] [broker] fix return value of 
TransactionTimeoutTrackerImpl#addTransaction (#22020)
    
    ### Motivation
    According to the method signature, we should return true when the 
transaction is added to the tracker.
    ```
        /**
         * Add a txnID to the tracker.
         *
         * @param sequenceId
         *            the sequenceId
         * @param timeout
         *            the absolute timestamp for transaction timeout
         *
         * @return true if the transaction was added to the tracker or false if 
had timed out
         */
        CompletableFuture<Boolean> addTransaction(long sequenceId, long 
timeout);
    ```
    But actually, we return false for any cases.
    
    Update: Moreover, we do not use the return value anyway, it is useless. We 
have better remove it.
    
    ### Modifications
    
    ~~Return true when the transaction is added to the tracker.~~
    Remove the return value as it is useless.
---
 .../broker/transaction/timeout/TransactionTimeoutTrackerImpl.java   | 6 ++----
 .../pulsar/transaction/coordinator/TransactionTimeoutTracker.java   | 5 +----
 .../transaction/coordinator/MLTransactionMetadataStoreTest.java     | 3 +--
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/TransactionTimeoutTrackerImpl.java
 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/TransactionTimeoutTrackerImpl.java
index 7b3bf744a82..110d912385e 100644
--- 
a/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/TransactionTimeoutTrackerImpl.java
+++ 
b/pulsar-broker/src/main/java/org/apache/pulsar/broker/transaction/timeout/TransactionTimeoutTrackerImpl.java
@@ -22,7 +22,6 @@ import io.netty.util.Timeout;
 import io.netty.util.Timer;
 import io.netty.util.TimerTask;
 import java.time.Clock;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.pulsar.broker.TransactionMetadataStoreService;
@@ -57,10 +56,10 @@ public class TransactionTimeoutTrackerImpl implements 
TransactionTimeoutTracker,
     }
 
     @Override
-    public CompletableFuture<Boolean> addTransaction(long sequenceId, long 
timeout) {
+    public void addTransaction(long sequenceId, long timeout) {
         if (timeout < tickTimeMillis) {
             this.transactionMetadataStoreService.endTransactionForTimeout(new 
TxnID(tcId, sequenceId));
-            return CompletableFuture.completedFuture(false);
+            return;
         }
         synchronized (this){
             long nowTime = clock.millis();
@@ -79,7 +78,6 @@ public class TransactionTimeoutTrackerImpl implements 
TransactionTimeoutTracker,
                 nowTaskTimeoutTime = transactionTimeoutTime;
             }
         }
-        return CompletableFuture.completedFuture(false);
     }
 
     @Override
diff --git 
a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionTimeoutTracker.java
 
b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionTimeoutTracker.java
index 5e84b002f33..a681c4bad3e 100644
--- 
a/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionTimeoutTracker.java
+++ 
b/pulsar-transaction/coordinator/src/main/java/org/apache/pulsar/transaction/coordinator/TransactionTimeoutTracker.java
@@ -19,7 +19,6 @@
 package org.apache.pulsar.transaction.coordinator;
 
 import com.google.common.annotations.Beta;
-import java.util.concurrent.CompletableFuture;
 
 /**
  * Represent the tracker for the timeout of the transaction.
@@ -34,10 +33,8 @@ public interface TransactionTimeoutTracker extends 
AutoCloseable {
      *            the sequenceId
      * @param timeout
      *            the absolute timestamp for transaction timeout
-     *
-     * @return true if the transaction was added to the tracker or false if 
had timed out
      */
-    CompletableFuture<Boolean> addTransaction(long sequenceId, long timeout);
+    void addTransaction(long sequenceId, long timeout);
 
     /**
      * When replay the log, add the txnMeta to timer task queue.
diff --git 
a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/MLTransactionMetadataStoreTest.java
 
b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/MLTransactionMetadataStoreTest.java
index 1e10db9753a..6ee7b3bb128 100644
--- 
a/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/MLTransactionMetadataStoreTest.java
+++ 
b/pulsar-transaction/coordinator/src/test/java/org/apache/pulsar/transaction/coordinator/MLTransactionMetadataStoreTest.java
@@ -524,8 +524,7 @@ public class MLTransactionMetadataStoreTest extends 
MockedBookKeeperTestCase {
     public class TransactionTimeoutTrackerImpl implements 
TransactionTimeoutTracker {
 
         @Override
-        public CompletableFuture<Boolean> addTransaction(long sequenceId, long 
timeout) {
-            return null;
+        public void addTransaction(long sequenceId, long timeout) {
         }
 
         @Override