Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fluss-client/src/main/resources/META-INF/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions fluss-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@
the rocksdb should be provided as a kv plugin to used by client & server.
-->
<dependency>
<groupId>com.ververica</groupId>
<artifactId>frocksdbjni</artifactId>
<groupId>org.rocksdb</groupId>
<artifactId>rocksdbjni</artifactId>
</dependency>

<!-- test dependencies -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.rocksdb.RocksDBException;
import org.rocksdb.RocksIterator;
import org.rocksdb.RocksIteratorInterface;
import org.rocksdb.Snapshot;

import javax.annotation.Nonnull;

Expand Down Expand Up @@ -126,4 +127,10 @@ public byte[] value() {
public void close() {
iterator.close();
}

@Override
public void refresh(Snapshot snapshot) throws RocksDBException {
iterator.refresh(snapshot);
status();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
}
}
Expand Down
2 changes: 1 addition & 1 deletion fluss-server/src/main/resources/META-INF/NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
<paimon.version>1.0.1</paimon.version>

<fluss.hadoop.version>2.10.2</fluss.hadoop.version>
<frocksdb.version>6.20.3-ververica-2.0</frocksdb.version>
<rocksdb.version>10.2.1</rocksdb.version>
<slf4j.version>1.7.36</slf4j.version>
<log4j.version>2.17.1</log4j.version>
<jaxb.api.version>2.3.1</jaxb.api.version>
Expand Down Expand Up @@ -342,9 +342,9 @@
</dependency>

<dependency>
<groupId>com.ververica</groupId>
<artifactId>frocksdbjni</artifactId>
<version>${frocksdb.version}</version>
<groupId>org.rocksdb</groupId>
<artifactId>rocksdbjni</artifactId>
<version>${rocksdb.version}</version>
</dependency>

<dependency>
Expand Down