Skip to content

Commit 63047f4

Browse files
committed
Upgrade RocksDB to version 9.2.1
1 parent 969367e commit 63047f4

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

bookkeeper-dist/src/main/resources/LICENSE-all.bin.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ Apache Software License, Version 2.
271271
- lib/org.eclipse.jetty-jetty-servlet-9.4.53.v20231009.jar [22]
272272
- lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar [22]
273273
- lib/org.eclipse.jetty-jetty-util-ajax-9.4.53.v20231009.jar [22]
274-
- lib/org.rocksdb-rocksdbjni-7.10.2.jar [23]
274+
- lib/org.rocksdb-rocksdbjni-9.2.1.jar [23]
275275
- lib/com.beust-jcommander-1.82.jar [24]
276276
- lib/com.yahoo.datasketches-memory-0.8.3.jar [25]
277277
- lib/com.yahoo.datasketches-sketches-core-0.8.3.jar [25]
@@ -375,7 +375,7 @@ Apache Software License, Version 2.
375375
[20] Source available at https://github.com/apache/commons-lang/tree/LANG_3_6
376376
[21] Source available at https://github.com/apache/zookeeper/tree/release-3.8.0
377377
[22] Source available at https://github.com/eclipse/jetty.project/tree/jetty-9.4.48.v20220622
378-
[23] Source available at https://github.com/facebook/rocksdb/tree/v7.10.2
378+
[23] Source available at https://github.com/facebook/rocksdb/tree/v9.2.1
379379
[24] Source available at https://github.com/cbeust/jcommander/tree/1.82
380380
[25] Source available at https://github.com/DataSketches/sketches-core/tree/sketches-0.8.3
381381
[26] Source available at https://github.com/lz4/lz4-java/tree/1.3.0
@@ -635,7 +635,7 @@ This private header is also used by Apple's open source
635635
* http://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h
636636

637637
------------------------------------------------------------------------------------
638-
lib/org.rocksdb-rocksdbjni-7.10.2.jar is derived from leveldb, which is under the following license.
638+
lib/org.rocksdb-rocksdbjni-9.2.1.jar is derived from leveldb, which is under the following license.
639639

640640
Copyright (c) 2011 The LevelDB Authors. All rights reserved.
641641

bookkeeper-dist/src/main/resources/LICENSE-server.bin.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ Apache Software License, Version 2.
271271
- lib/org.eclipse.jetty-jetty-servlet-9.4.53.v20231009.jar [22]
272272
- lib/org.eclipse.jetty-jetty-util-9.4.53.v20231009.jar [22]
273273
- lib/org.eclipse.jetty-jetty-util-ajax-9.4.53.v20231009.jar [22]
274-
- lib/org.rocksdb-rocksdbjni-7.10.2.jar [23]
274+
- lib/org.rocksdb-rocksdbjni-9.2.1.jar [23]
275275
- lib/com.beust-jcommander-1.82.jar [24]
276276
- lib/com.yahoo.datasketches-memory-0.8.3.jar [25]
277277
- lib/com.yahoo.datasketches-sketches-core-0.8.3.jar [25]
@@ -371,7 +371,7 @@ Apache Software License, Version 2.
371371
[20] Source available at https://github.com/apache/commons-lang/tree/LANG_3_6
372372
[21] Source available at https://github.com/apache/zookeeper/tree/release-3.8.0
373373
[22] Source available at https://github.com/eclipse/jetty.project/tree/jetty-9.4.48.v20220622
374-
[23] Source available at https://github.com/facebook/rocksdb/tree/v7.10.2
374+
[23] Source available at https://github.com/facebook/rocksdb/tree/v9.2.1
375375
[24] Source available at https://github.com/cbeust/jcommander/tree/1.82
376376
[25] Source available at https://github.com/DataSketches/sketches-core/tree/sketches-0.8.3
377377
[26] Source available at https://github.com/lz4/lz4-java/tree/1.3.0
@@ -630,7 +630,7 @@ This private header is also used by Apple's open source
630630
* http://www.opensource.apple.com/source/configd/configd-453.19/dnsinfo/dnsinfo.h
631631

632632
------------------------------------------------------------------------------------
633-
lib/org.rocksdb-rocksdbjni-7.10.2.jar is derived from leveldb, which is under the following license.
633+
lib/org.rocksdb-rocksdbjni-9.2.1.jar is derived from leveldb, which is under the following license.
634634

635635
Copyright (c) 2011 The LevelDB Authors. All rights reserved.
636636

bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/KeyValueStorageRocksDB.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import org.rocksdb.ColumnFamilyDescriptor;
4848
import org.rocksdb.ColumnFamilyHandle;
4949
import org.rocksdb.CompressionType;
50+
import org.rocksdb.ConfigOptions;
5051
import org.rocksdb.DBOptions;
5152
import org.rocksdb.Env;
5253
import org.rocksdb.InfoLogLevel;
@@ -154,8 +155,10 @@ private RocksDB initializeRocksDBWithConfFile(String basePath, String subPath, D
154155
DBOptions dbOptions = new DBOptions();
155156
final List<ColumnFamilyDescriptor> cfDescs = new ArrayList<>();
156157
final List<ColumnFamilyHandle> cfHandles = new ArrayList<>();
157-
try {
158-
OptionsUtil.loadOptionsFromFile(dbFilePath, Env.getDefault(), dbOptions, cfDescs, false);
158+
try (final ConfigOptions cfgOpts = new ConfigOptions()
159+
.setIgnoreUnknownOptions(false)
160+
.setEnv(Env.getDefault())) {
161+
OptionsUtil.loadOptionsFromFile(cfgOpts, dbFilePath, dbOptions, cfDescs);
159162
// Configure file path
160163
String logPath = conf.getString(ROCKSDB_LOG_PATH, "");
161164
if (!logPath.isEmpty()) {

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
<protoc3.version>${protobuf.version}</protoc3.version>
167167
<protoc-gen-grpc-java.version>${grpc.version}</protoc-gen-grpc-java.version>
168168
<reflections.version>0.9.11</reflections.version>
169-
<rocksdb.version>7.10.2</rocksdb.version>
169+
<rocksdb.version>9.2.1</rocksdb.version>
170170
<shrinkwrap.version>3.3.0</shrinkwrap.version>
171171
<slf4j.version>2.0.12</slf4j.version>
172172
<snakeyaml.version>2.0</snakeyaml.version>

0 commit comments

Comments
 (0)