Revert "[kv] Upgrade rocksdb to community version 10.2.1 (#1338)" (#1374)

This reverts commit 780a32f.

Co-authored-by: ocean.wy <[email protected]>

Author: platinumhamburg

fluss-client/src/main/resources/META-INF/NOTICE

@@ -7,9 +7,9 @@ The Apache Software Foundation (http://www.apache.org/).
 This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
 
 - com.google.code.findbugs:jsr305:1.3.9
+- com.ververica:frocksdbjni:6.20.3-ververica-2.0
 - org.apache.commons:commons-lang3:3.18.0
 - org.apache.commons:commons-math3:3.6.1
-- org.rocksdb:rocksdbjni:10.2.1
 - org.lz4:lz4-java:1.8.0
 
 This project bundles the following dependencies under the MIT (https://opensource.org/licenses/MIT)

fluss-common/pom.xml

@@ -80,8 +80,8 @@
         the rocksdb should be provided as a kv plugin to used by client & server.
          -->
         <dependency>
-            <groupId>org.rocksdb</groupId>
-            <artifactId>rocksdbjni</artifactId>
+            <groupId>com.ververica</groupId>
+            <artifactId>frocksdbjni</artifactId>
         </dependency>
 
         <!-- test dependencies -->

fluss-common/src/main/java/com/alibaba/fluss/rocksdb/RocksIteratorWrapper.java

@@ -20,7 +20,6 @@
 import org.rocksdb.RocksDBException;
 import org.rocksdb.RocksIterator;
 import org.rocksdb.RocksIteratorInterface;
-import org.rocksdb.Snapshot;
 
 import javax.annotation.Nonnull;
 
@@ -127,10 +126,4 @@ public byte[] value() {
     public void close() {
         iterator.close();
     }
-
-    @Override
-    public void refresh(Snapshot snapshot) throws RocksDBException {
-        iterator.refresh(snapshot);
-        status();
-    }
 }

fluss-server/src/main/java/com/alibaba/fluss/server/kv/snapshot/RocksIncrementalSnapshot.java

@@ -58,9 +58,6 @@ public class RocksIncrementalSnapshot implements AutoCloseable {
     /** File suffix of sstable files. */
     public static final String SST_FILE_SUFFIX = ".sst";
 
-    /** File suffix of wal files. */
-    public static final String WAL_FILE_SUFFIX = ".log";
-
     /** RocksDB instance from the backend. */
     @Nonnull protected RocksDB db;
 
@@ -296,8 +293,7 @@ private void createUploadFilePaths(
                     } else {
                         sstFilePaths.add(filePath); // re-upload
                     }
-                } else if (!fileName.endsWith(WAL_FILE_SUFFIX)) {
-                    // the wal files are always empty and should be ignored
+                } else {
                     miscFilePaths.add(filePath);
                 }
             }

fluss-server/src/main/resources/META-INF/NOTICE

@@ -9,11 +9,11 @@ This project bundles the following dependencies under the Apache Software Licens
 - com.github.ben-manes.caffeine:caffeine:2.9.3
 - com.google.code.findbugs:jsr305:1.3.9
 - com.google.errorprone:error_prone_annotations:2.10.0
+- com.ververica:frocksdbjni:6.20.3-ververica-2.0
 - commons-cli:commons-cli:1.5.0
 - org.apache.commons:commons-lang3:3.18.0
 - org.apache.commons:commons-math3:3.6.1
 - org.lz4:lz4-java:1.8.0
-- org.rocksdb:rocksdbjni:10.2.1
 - org.xerial.snappy:snappy-java:1.1.10.4
 
 This project bundles the following dependencies under the MIT (https://opensource.org/licenses/MIT)

fluss-server/src/test/java/com/alibaba/fluss/server/kv/rocksdb/RocksDBOperationsUtilsTest.java

@@ -21,7 +21,6 @@
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-import org.rocksdb.ColumnFamilyDescriptor;
 import org.rocksdb.DBOptions;
 import org.rocksdb.RocksDB;
 import org.rocksdb.RocksDBException;
@@ -49,9 +48,7 @@ void testOpenDBFail(@TempDir Path temporaryFolder) throws Exception {
                                 RocksDB rocks =
                                         RocksDBOperationUtils.openDB(
                                                 rocksDir.getAbsolutePath(),
-                                                Collections.singletonList(
-                                                        new ColumnFamilyDescriptor(
-                                                                RocksDB.DEFAULT_COLUMN_FAMILY)),
+                                                Collections.emptyList(),
                                                 Collections.emptyList(),
                                                 dbOptions,
                                                 false);

pom.xml

@@ -101,7 +101,7 @@
         <paimon.version>1.0.1</paimon.version>
 
         <fluss.hadoop.version>2.10.2</fluss.hadoop.version>
-        <rocksdb.version>10.2.1</rocksdb.version>
+        <frocksdb.version>6.20.3-ververica-2.0</frocksdb.version>
         <slf4j.version>1.7.36</slf4j.version>
         <log4j.version>2.17.1</log4j.version>
         <jaxb.api.version>2.3.1</jaxb.api.version>
@@ -342,9 +342,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.rocksdb</groupId>
-                <artifactId>rocksdbjni</artifactId>
-                <version>${rocksdb.version}</version>
+                <groupId>com.ververica</groupId>
+                <artifactId>frocksdbjni</artifactId>
+                <version>${frocksdb.version}</version>
             </dependency>
 
             <dependency>