diff --git a/fluss-client/src/main/resources/META-INF/NOTICE b/fluss-client/src/main/resources/META-INF/NOTICE
index fd48d55f48..71a0064736 100644
--- a/fluss-client/src/main/resources/META-INF/NOTICE
+++ b/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)
diff --git a/fluss-common/pom.xml b/fluss-common/pom.xml
index 181246794b..ef119eebde 100644
--- a/fluss-common/pom.xml
+++ b/fluss-common/pom.xml
@@ -80,8 +80,8 @@
the rocksdb should be provided as a kv plugin to used by client & server.
-->
- com.ververica
- frocksdbjni
+ org.rocksdb
+ rocksdbjni
diff --git a/fluss-common/src/main/java/com/alibaba/fluss/rocksdb/RocksIteratorWrapper.java b/fluss-common/src/main/java/com/alibaba/fluss/rocksdb/RocksIteratorWrapper.java
index 56ef668e34..1c046b059e 100644
--- a/fluss-common/src/main/java/com/alibaba/fluss/rocksdb/RocksIteratorWrapper.java
+++ b/fluss-common/src/main/java/com/alibaba/fluss/rocksdb/RocksIteratorWrapper.java
@@ -20,6 +20,7 @@
import org.rocksdb.RocksDBException;
import org.rocksdb.RocksIterator;
import org.rocksdb.RocksIteratorInterface;
+import org.rocksdb.Snapshot;
import javax.annotation.Nonnull;
@@ -126,4 +127,10 @@ public byte[] value() {
public void close() {
iterator.close();
}
+
+ @Override
+ public void refresh(Snapshot snapshot) throws RocksDBException {
+ iterator.refresh(snapshot);
+ status();
+ }
}
diff --git a/fluss-server/src/main/java/com/alibaba/fluss/server/kv/snapshot/RocksIncrementalSnapshot.java b/fluss-server/src/main/java/com/alibaba/fluss/server/kv/snapshot/RocksIncrementalSnapshot.java
index 344249871e..aab646e3d1 100644
--- a/fluss-server/src/main/java/com/alibaba/fluss/server/kv/snapshot/RocksIncrementalSnapshot.java
+++ b/fluss-server/src/main/java/com/alibaba/fluss/server/kv/snapshot/RocksIncrementalSnapshot.java
@@ -58,6 +58,9 @@ 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;
@@ -293,7 +296,8 @@ private void createUploadFilePaths(
} else {
sstFilePaths.add(filePath); // re-upload
}
- } else {
+ } else if (!fileName.endsWith(WAL_FILE_SUFFIX)) {
+ // the wal files are always empty and should be ignored
miscFilePaths.add(filePath);
}
}
diff --git a/fluss-server/src/main/resources/META-INF/NOTICE b/fluss-server/src/main/resources/META-INF/NOTICE
index fb2b8a3157..3eed516215 100644
--- a/fluss-server/src/main/resources/META-INF/NOTICE
+++ b/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)
diff --git a/fluss-server/src/test/java/com/alibaba/fluss/server/kv/rocksdb/RocksDBOperationsUtilsTest.java b/fluss-server/src/test/java/com/alibaba/fluss/server/kv/rocksdb/RocksDBOperationsUtilsTest.java
index c6522751b5..230a9a31e1 100644
--- a/fluss-server/src/test/java/com/alibaba/fluss/server/kv/rocksdb/RocksDBOperationsUtilsTest.java
+++ b/fluss-server/src/test/java/com/alibaba/fluss/server/kv/rocksdb/RocksDBOperationsUtilsTest.java
@@ -21,6 +21,7 @@
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;
@@ -48,7 +49,9 @@ void testOpenDBFail(@TempDir Path temporaryFolder) throws Exception {
RocksDB rocks =
RocksDBOperationUtils.openDB(
rocksDir.getAbsolutePath(),
- Collections.emptyList(),
+ Collections.singletonList(
+ new ColumnFamilyDescriptor(
+ RocksDB.DEFAULT_COLUMN_FAMILY)),
Collections.emptyList(),
dbOptions,
false);
diff --git a/pom.xml b/pom.xml
index 188c9cb254..af64238f4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
1.0.1
2.10.2
- 6.20.3-ververica-2.0
+ 10.2.1
1.7.36
2.17.1
2.3.1
@@ -342,9 +342,9 @@
- com.ververica
- frocksdbjni
- ${frocksdb.version}
+ org.rocksdb
+ rocksdbjni
+ ${rocksdb.version}