[core] Introduce RetryWaiter to simplify FileStoreCommitImpl

Author: JingsongLi

paimon-common/src/main/java/org/apache/paimon/utils/RetryWaiter.java

@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.paimon.utils;
+
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.TimeUnit;
+
+/** A waiter for retry. */
+public class RetryWaiter {
+
+    private final long minRetryWait;
+    private final long maxRetryWait;
+
+    public RetryWaiter(long minRetryWait, long maxRetryWait) {
+        this.minRetryWait = minRetryWait;
+        this.maxRetryWait = maxRetryWait;
+    }
+
+    public void retryWait(int retryCount) {
+        int retryWait = (int) Math.min(minRetryWait * Math.pow(2, retryCount), maxRetryWait);
+        ThreadLocalRandom random = ThreadLocalRandom.current();
+        retryWait += random.nextInt(Math.max(1, (int) (retryWait * 0.2)));
+        try {
+            TimeUnit.MILLISECONDS.sleep(retryWait);
+        } catch (InterruptedException ie) {
+            Thread.currentThread().interrupt();
+            throw new RuntimeException(ie);
+        }
+    }
+}

paimon-core/src/main/java/org/apache/paimon/operation/FileStoreCommitImpl.java

@@ -71,6 +71,7 @@
 import org.apache.paimon.utils.IOUtils;
 import org.apache.paimon.utils.InternalRowPartitionComputer;
 import org.apache.paimon.utils.Pair;
+import org.apache.paimon.utils.RetryWaiter;
 import org.apache.paimon.utils.SnapshotManager;
 
 import org.slf4j.Logger;
@@ -88,8 +89,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import static java.util.Collections.emptyList;
@@ -152,8 +151,7 @@ public class FileStoreCommitImpl implements FileStoreCommit {
     private final StatsFileHandler statsFileHandler;
     private final BucketMode bucketMode;
     private final long commitTimeout;
-    private final long commitMinRetryWait;
-    private final long commitMaxRetryWait;
+    private final RetryWaiter retryWaiter;
     private final int commitMaxRetries;
     private final InternalRowPartitionComputer partitionComputer;
     private final boolean rowTrackingEnabled;
@@ -223,8 +221,7 @@ public FileStoreCommitImpl(
         this.commitCallbacks = commitCallbacks;
         this.commitMaxRetries = commitMaxRetries;
         this.commitTimeout = commitTimeout;
-        this.commitMinRetryWait = commitMinRetryWait;
-        this.commitMaxRetryWait = commitMaxRetryWait;
+        this.retryWaiter = new RetryWaiter(commitMinRetryWait, commitMaxRetryWait);
         this.partitionComputer =
                 new InternalRowPartitionComputer(
                         options.partitionDefaultName(),
@@ -720,7 +717,7 @@ private int tryCommit(
                 throw new RuntimeException(message, retryResult.exception);
             }
 
-            commitRetryWait(retryCount);
+            retryWaiter.retryWait(retryCount);
             retryCount++;
         }
         return retryCount + 1;
@@ -1070,7 +1067,7 @@ public void compactManifest() {
                                 commitTimeout, retryCount));
             }
 
-            commitRetryWait(retryCount);
+            retryWaiter.retryWait(retryCount);
             retryCount++;
         }
     }
@@ -1155,19 +1152,6 @@ private boolean commitSnapshotImpl(Snapshot newSnapshot, List<PartitionEntry> de
         }
     }
 
-    private void commitRetryWait(int retryCount) {
-        int retryWait =
-                (int) Math.min(commitMinRetryWait * Math.pow(2, retryCount), commitMaxRetryWait);
-        ThreadLocalRandom random = ThreadLocalRandom.current();
-        retryWait += random.nextInt(Math.max(1, (int) (retryWait * 0.2)));
-        try {
-            TimeUnit.MILLISECONDS.sleep(retryWait);
-        } catch (InterruptedException ie) {
-            Thread.currentThread().interrupt();
-            throw new RuntimeException(ie);
-        }
-    }
-
     @Override
     public void close() {
         IOUtils.closeAllQuietly(commitCallbacks);