rebase merge conflict

Author: platinumhamburg

fluss-server/src/main/java/org/apache/fluss/server/kv/KvTablet.java

@@ -67,9 +67,8 @@
 import org.apache.fluss.types.RowType;
 import org.apache.fluss.utils.BytesUtils;
 import org.apache.fluss.utils.FileUtils;
-import org.apache.fluss.utils.FlussPaths;
-import org.apache.fluss.utils.types.Tuple2;
 
+import org.rocksdb.RateLimiter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -161,69 +160,6 @@ private KvTablet(
         this.changelogImage = changelogImage;
     }
 
-    public static KvTablet create(
-            LogTablet logTablet,
-            File kvTabletDir,
-            Configuration serverConf,
-            TabletServerMetricGroup serverMetricGroup,
-            BufferAllocator arrowBufferAllocator,
-            MemorySegmentPool memorySegmentPool,
-            KvFormat kvFormat,
-            RowMerger rowMerger,
-            ArrowCompressionInfo arrowCompressionInfo,
-            SchemaGetter schemaGetter,
-            ChangelogImage changelogImage)
-            throws IOException {
-        Tuple2<PhysicalTablePath, TableBucket> tablePathAndBucket =
-                FlussPaths.parseTabletDir(kvTabletDir);
-        return create(
-                tablePathAndBucket.f0,
-                tablePathAndBucket.f1,
-                logTablet,
-                kvTabletDir,
-                serverConf,
-                serverMetricGroup,
-                arrowBufferAllocator,
-                memorySegmentPool,
-                kvFormat,
-                rowMerger,
-                arrowCompressionInfo,
-                schemaGetter,
-                changelogImage,
-                null);
-    }
-
-    public static KvTablet create(
-            PhysicalTablePath tablePath,
-            TableBucket tableBucket,
-            LogTablet logTablet,
-            File kvTabletDir,
-            Configuration serverConf,
-            TabletServerMetricGroup serverMetricGroup,
-            BufferAllocator arrowBufferAllocator,
-            MemorySegmentPool memorySegmentPool,
-            KvFormat kvFormat,
-            RowMerger rowMerger,
-            ArrowCompressionInfo arrowCompressionInfo,
-            SchemaGetter schemaGetter,
-            ChangelogImage changelogImage)
-            throws IOException {
-        return create(
-                tablePath,
-                tableBucket,
-                logTablet,
-                kvTabletDir,
-                serverConf,
-                serverMetricGroup,
-                arrowBufferAllocator,
-                memorySegmentPool,
-                kvFormat,
-                rowMerger,
-                arrowCompressionInfo,
-                schemaGetter,
-                null);
-    }
-
     public static KvTablet create(
             PhysicalTablePath tablePath,
             TableBucket tableBucket,
@@ -238,7 +174,7 @@ public static KvTablet create(
             ArrowCompressionInfo arrowCompressionInfo,
             SchemaGetter schemaGetter,
             ChangelogImage changelogImage,
-            @Nullable org.rocksdb.RateLimiter sharedRateLimiter)
+            RateLimiter sharedRateLimiter)
             throws IOException {
         RocksDBKv kv = buildRocksDBKv(serverConf, kvTabletDir, sharedRateLimiter);
         return new KvTablet(
@@ -260,9 +196,7 @@ public static KvTablet create(
     }
 
     private static RocksDBKv buildRocksDBKv(
-            Configuration configuration,
-            File kvDir,
-            org.rocksdb.RateLimiter sharedRateLimiter)
+            Configuration configuration, File kvDir, RateLimiter sharedRateLimiter)
             throws IOException {
         RocksDBResourceContainer rocksDBResourceContainer =
                 new RocksDBResourceContainer(configuration, kvDir, false, sharedRateLimiter);

fluss-server/src/main/java/org/apache/fluss/server/kv/rocksdb/RocksDBResourceContainer.java

@@ -75,7 +75,7 @@ public class RocksDBResourceContainer implements AutoCloseable {
     private final boolean enableStatistics;
 
     /** The shared rate limiter for all RocksDB instances. */
-    @Nullable private final RateLimiter sharedRateLimiter;
+    private final RateLimiter sharedRateLimiter;
 
     /** The handles to be closed when the container is closed. */
     private final ArrayList<AutoCloseable> handlesToClose;
@@ -100,7 +100,7 @@ public RocksDBResourceContainer(
             ReadableConfig configuration,
             @Nullable File instanceBasePath,
             boolean enableStatistics,
-            @Nullable RateLimiter sharedRateLimiter) {
+            RateLimiter sharedRateLimiter) {
         this.configuration = configuration;
 
         this.instanceRocksDBPath =

fluss-server/src/test/java/org/apache/fluss/server/kv/KvTabletTest.java

@@ -191,7 +191,8 @@ private KvTablet createKvTablet(
                 rowMerger,
                 DEFAULT_COMPRESSION,
                 schemaGetter,
-                tableConf.getChangelogImage());
+                tableConf.getChangelogImage(),
+                null);
     }
 
     @Test