Skip to content

Commit 11cfd58

Browse files
zaidoon1zaidoon1
committed
upgrade to RocksDB 9.11.1
1 parent 42ed54a commit 11cfd58

File tree

5 files changed

+65
-48
lines changed

5 files changed

+65
-48
lines changed

‎Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ lto = ["rust-librocksdb-sys/lto"]
4040

4141
[dependencies]
4242
libc = "0.2"
43-
rust-librocksdb-sys = { path = "librocksdb-sys", version = "0.32.0", default-features = false, features = [
43+
rust-librocksdb-sys = { path = "librocksdb-sys", version = "0.33.0", default-features = false, features = [
4444
"static",
4545
] }
4646
serde = { version = "1", features = ["derive"], optional = true }

‎librocksdb-sys/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rust-librocksdb-sys"
3-
version = "0.32.0+9.10.0"
3+
version = "0.33.0+9.11.1"
44
edition = "2021"
55
rust-version = "1.75.0"
66
authors = [
@@ -64,7 +64,7 @@ uuid = { version = "1", features = ["v4"] }
6464

6565
[build-dependencies]
6666
cc = { version = "1.0", features = ["parallel"] }
67-
bindgen = { version = "0.69", default-features = false }
67+
bindgen = { version = "0.71", default-features = false }
6868
glob = "0.3"
6969
pkg-config = { version = "0.3", optional = true }
7070
libc = "0.2"

‎librocksdb-sys/build_version.cc

+58-44
Original file line numberDiff line numberDiff line change
@@ -8,70 +8,84 @@
88

99
// The build script may replace these values with real values based
1010
// on whether or not GIT is available and the platform settings
11-
static const std::string rocksdb_build_git_sha = "ae8fb3e5000e46d8d4c9dbf3a36019c0aaceebff";
12-
static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:v9.10.0";
11+
static const std::string rocksdb_build_git_sha = "68b2d941be2d273067aeb7e14ccd090d1512c426";
12+
static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:v9.11.1";
1313
#define HAS_GIT_CHANGES 0
1414
#if HAS_GIT_CHANGES == 0
1515
// If HAS_GIT_CHANGES is 0, the GIT date is used.
1616
// Use the time the branch/tag was last modified
17-
static const std::string rocksdb_build_date = "rocksdb_build_date:2024-12-16 12:45:14";
17+
static const std::string rocksdb_build_date = "rocksdb_build_date:2025-03-05 22:15:17";
1818
#else
1919
// If HAS_GIT_CHANGES is > 0, the branch/tag has modifications.
2020
// Use the time the build was created.
21-
static const std::string rocksdb_build_date = "rocksdb_build_date:2024-12-16 12:45:14";
21+
static const std::string rocksdb_build_date = "rocksdb_build_date:2025-03-05 22:15:17";
2222
#endif
2323

2424
std::unordered_map<std::string, ROCKSDB_NAMESPACE::RegistrarFunc> ROCKSDB_NAMESPACE::ObjectRegistry::builtins_ = {};
2525

26-
extern "C" bool RocksDbIOUringEnable() {
26+
extern "C" bool RocksDbIOUringEnable()
27+
{
2728
return true;
2829
}
2930

30-
namespace ROCKSDB_NAMESPACE {
31-
static void AddProperty(std::unordered_map<std::string, std::string> *props, const std::string& name) {
32-
size_t colon = name.find(":");
33-
if (colon != std::string::npos && colon > 0 && colon < name.length() - 1) {
34-
// If we found a "@:", then this property was a build-time substitution that failed. Skip it
35-
size_t at = name.find("@", colon);
36-
if (at != colon + 1) {
37-
// Everything before the colon is the name, after is the value
38-
(*props)[name.substr(0, colon)] = name.substr(colon + 1);
31+
namespace ROCKSDB_NAMESPACE
32+
{
33+
static void AddProperty(std::unordered_map<std::string, std::string> *props, const std::string &name)
34+
{
35+
size_t colon = name.find(":");
36+
if (colon != std::string::npos && colon > 0 && colon < name.length() - 1)
37+
{
38+
// If we found a "@:", then this property was a build-time substitution that failed. Skip it
39+
size_t at = name.find("@", colon);
40+
if (at != colon + 1)
41+
{
42+
// Everything before the colon is the name, after is the value
43+
(*props)[name.substr(0, colon)] = name.substr(colon + 1);
44+
}
3945
}
4046
}
41-
}
4247

43-
static std::unordered_map<std::string, std::string>* LoadPropertiesSet() {
44-
auto * properties = new std::unordered_map<std::string, std::string>();
45-
AddProperty(properties, rocksdb_build_git_sha);
46-
AddProperty(properties, rocksdb_build_git_tag);
47-
AddProperty(properties, rocksdb_build_date);
48-
return properties;
49-
}
48+
static std::unordered_map<std::string, std::string> *LoadPropertiesSet()
49+
{
50+
auto *properties = new std::unordered_map<std::string, std::string>();
51+
AddProperty(properties, rocksdb_build_git_sha);
52+
AddProperty(properties, rocksdb_build_git_tag);
53+
AddProperty(properties, rocksdb_build_date);
54+
return properties;
55+
}
5056

51-
const std::unordered_map<std::string, std::string>& GetRocksBuildProperties() {
52-
static std::unique_ptr<std::unordered_map<std::string, std::string>> props(LoadPropertiesSet());
53-
return *props;
54-
}
57+
const std::unordered_map<std::string, std::string> &GetRocksBuildProperties()
58+
{
59+
static std::unique_ptr<std::unordered_map<std::string, std::string>> props(LoadPropertiesSet());
60+
return *props;
61+
}
5562

56-
std::string GetRocksVersionAsString(bool with_patch) {
57-
std::string version = std::to_string(ROCKSDB_MAJOR) + "." + std::to_string(ROCKSDB_MINOR);
58-
if (with_patch) {
59-
return version + "." + std::to_string(ROCKSDB_PATCH);
60-
} else {
61-
return version;
62-
}
63-
}
63+
std::string GetRocksVersionAsString(bool with_patch)
64+
{
65+
std::string version = std::to_string(ROCKSDB_MAJOR) + "." + std::to_string(ROCKSDB_MINOR);
66+
if (with_patch)
67+
{
68+
return version + "." + std::to_string(ROCKSDB_PATCH);
69+
}
70+
else
71+
{
72+
return version;
73+
}
74+
}
6475

65-
std::string GetRocksBuildInfoAsString(const std::string& program, bool verbose) {
66-
std::string info = program + " (RocksDB) " + GetRocksVersionAsString(true);
67-
if (verbose) {
68-
for (const auto& it : GetRocksBuildProperties()) {
69-
info.append("\n ");
70-
info.append(it.first);
71-
info.append(": ");
72-
info.append(it.second);
76+
std::string GetRocksBuildInfoAsString(const std::string &program, bool verbose)
77+
{
78+
std::string info = program + " (RocksDB) " + GetRocksVersionAsString(true);
79+
if (verbose)
80+
{
81+
for (const auto &it : GetRocksBuildProperties())
82+
{
83+
info.append("\n ");
84+
info.append(it.first);
85+
info.append(": ");
86+
info.append(it.second);
87+
}
7388
}
89+
return info;
7490
}
75-
return info;
76-
}
7791
} // namespace ROCKSDB_NAMESPACE

‎librocksdb-sys/rocksdb

Submodule rocksdb updated 417 files

‎librocksdb-sys/rocksdb_lib_sources.txt

+3
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ table/block_fetcher.cc
197197
table/cuckoo/cuckoo_table_builder.cc
198198
table/cuckoo/cuckoo_table_factory.cc
199199
table/cuckoo/cuckoo_table_reader.cc
200+
table/external_table.cc
200201
table/format.cc
201202
table/get_context.cc
202203
table/iterator.cc
@@ -296,6 +297,8 @@ utilities/persistent_cache/block_cache_tier_file.cc
296297
utilities/persistent_cache/block_cache_tier_metadata.cc
297298
utilities/persistent_cache/persistent_cache_tier.cc
298299
utilities/persistent_cache/volatile_tier_impl.cc
300+
utilities/secondary_index/secondary_index_iterator.cc
301+
utilities/secondary_index/simple_secondary_index.cc
299302
utilities/simulator_cache/cache_simulator.cc
300303
utilities/simulator_cache/sim_cache.cc
301304
utilities/table_properties_collectors/compact_for_tiering_collector.cc

0 commit comments

Comments
 (0)