From bbb3fad23a3e41ead0fbf25c39d7300a14b2be7b Mon Sep 17 00:00:00 2001 From: Oleksandr Anyshchenko Date: Wed, 18 Oct 2023 22:56:33 +0100 Subject: Update RocksDB to 8.6.7 (#825) * Update RocksDB to 8.6.7 * comment docs --- .github/workflows/rust.yml | 2 +- Cargo.toml | 4 ++-- README.md | 2 +- librocksdb-sys/Cargo.toml | 6 +++--- librocksdb-sys/build_version.cc | 6 +++--- librocksdb-sys/rocksdb | 2 +- src/properties.rs | 14 +++++++------- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 45d690f..260c673 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -2,7 +2,7 @@ name: RocksDB CI on: [push, pull_request] env: - RUST_VERSION: 1.63.0 + RUST_VERSION: 1.66.0 jobs: fmt: diff --git a/Cargo.toml b/Cargo.toml index 0bb8a8b..f88d627 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "rocksdb" description = "Rust wrapper for Facebook's RocksDB embeddable database" version = "0.21.0" edition = "2018" -rust-version = "1.63" +rust-version = "1.66.0" authors = ["Tyler Neely ", "David Greenberg "] repository = "https://github.com/rust-rocksdb/rust-rocksdb" license = "Apache-2.0" @@ -36,7 +36,7 @@ serde1 = ["serde"] [dependencies] libc = "0.2" -librocksdb-sys = { path = "librocksdb-sys", version = "0.12.0" } +librocksdb-sys = { path = "librocksdb-sys", version = "0.13.0" } serde = { version = "1", features = [ "derive" ], optional = true } [dev-dependencies] diff --git a/README.md b/README.md index f18f0f9..f4ef392 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ rust-rocksdb [![documentation](https://docs.rs/rocksdb/badge.svg)](https://docs.rs/rocksdb) [![license](https://img.shields.io/crates/l/rocksdb.svg)](https://github.com/rust-rocksdb/rust-rocksdb/blob/master/LICENSE) [![Gitter chat](https://badges.gitter.im/rust-rocksdb/gitter.png)](https://gitter.im/rust-rocksdb/lobby) -![rust 1.63.0 required](https://img.shields.io/badge/rust-1.63.0-blue.svg?label=MSRV) +![rust 1.66.0 required](https://img.shields.io/badge/rust-1.66.0-blue.svg?label=MSRV) ![GitHub commits (since latest release)](https://img.shields.io/github/commits-since/rust-rocksdb/rust-rocksdb/latest.svg) diff --git a/librocksdb-sys/Cargo.toml b/librocksdb-sys/Cargo.toml index 174103f..1eaac75 100644 --- a/librocksdb-sys/Cargo.toml +++ b/librocksdb-sys/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "librocksdb-sys" -version = "0.12.0+8.5.3" +version = "0.13.0+8.6.7" edition = "2018" -rust-version = "1.63" +rust-version = "1.66.0" authors = ["Karl Hobley ", "Arkadiy Paronyan "] license = "MIT/Apache-2.0/BSD-3-Clause" description = "Native bindings to librocksdb" @@ -38,6 +38,6 @@ uuid = { version = "1.0", features = ["v4"] } [build-dependencies] cc = { version = "1.0", features = ["parallel"] } -bindgen = { version = "0.65", default-features = false, features = ["runtime"] } +bindgen = { version = "0.68", default-features = false, features = ["runtime"] } glob = "0.3" pkg-config = { version = "0.3", optional = true } diff --git a/librocksdb-sys/build_version.cc b/librocksdb-sys/build_version.cc index ffc616f..592e475 100644 --- a/librocksdb-sys/build_version.cc +++ b/librocksdb-sys/build_version.cc @@ -8,13 +8,13 @@ // The build script may replace these values with real values based // on whether or not GIT is available and the platform settings -static const std::string rocksdb_build_git_sha = "f32521662acf3352397d438b732144c7813bbbec"; -static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:v8.5.3"; +static const std::string rocksdb_build_git_sha = "cb7a5e02edeb883193eb5b4901d5943f58e9add9"; +static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:v8.6.7"; #define HAS_GIT_CHANGES 0 #if HAS_GIT_CHANGES == 0 // If HAS_GIT_CHANGES is 0, the GIT date is used. // Use the time the branch/tag was last modified -static const std::string rocksdb_build_date = "rocksdb_build_date:2023-09-01 20:58:39"; +static const std::string rocksdb_build_date = "rocksdb_build_date:2023-09-26 15:51:19"; #else // If HAS_GIT_CHANGES is > 0, the branch/tag has modifications. // Use the time the build was created. diff --git a/librocksdb-sys/rocksdb b/librocksdb-sys/rocksdb index f325216..cb7a5e0 160000 --- a/librocksdb-sys/rocksdb +++ b/librocksdb-sys/rocksdb @@ -1 +1 @@ -Subproject commit f32521662acf3352397d438b732144c7813bbbec +Subproject commit cb7a5e02edeb883193eb5b4901d5943f58e9add9 diff --git a/src/properties.rs b/src/properties.rs index f80ca2d..96ae641 100644 --- a/src/properties.rs +++ b/src/properties.rs @@ -12,18 +12,18 @@ macro_rules! property { }; } -/// "rocksdb.num-files-at-level" - returns string containing the number -/// of files at level , where is an ASCII representation of a +/// "rocksdb.num-files-at-level<`N`>" - returns string containing the number +/// of files at level <`N`>, where <`N`> is an ASCII representation of a /// level number (e.g., "0"). pub fn num_files_at_level(level: usize) -> PropertyName { unsafe { level_property("num-files-at-level", level) } } -/// "rocksdb.compression-ratio-at-level" - returns string containing the -/// compression ratio of data at level , where is an ASCII +/// "rocksdb.compression-ratio-at-level<`N`>" - returns string containing the +/// compression ratio of data at level <`N`>, where <`N`> is an ASCII /// representation of a level number (e.g., "0"). Here, compression /// ratio is defined as uncompressed data size / compressed file size. -/// Returns "-1.0" if no open files at level . +/// Returns "-1.0" if no open files at level <`N`>. pub fn compression_ratio_at_level(level: usize) -> PropertyName { unsafe { level_property("compression-ratio-at-level", level) } } @@ -42,7 +42,7 @@ pub const SSTABLES: &PropName = property!("sstables"); pub const CFSTATS: &PropName = property!("CFSTATS"); /// "rocksdb.cfstats-no-file-histogram" - returns a multi-line string with -/// general columm family stats per-level over db's lifetime ("L"), +/// general column family stats per-level over db's lifetime ("`L`"), /// aggregated over db's lifetime ("Sum"), and aggregated over the /// interval since the last retrieval ("Int"). /// It could also be used to return the stats in the format of the map. @@ -190,7 +190,7 @@ pub const ESTIMATE_PENDING_COMPACTION_BYTES: &PropName = /// of the aggregated table properties of the target column family. pub const AGGREGATED_TABLE_PROPERTIES: &PropName = property!("aggregated-table-properties"); -/// "rocksdb.aggregated-table-properties-at-level", same as the previous +/// "rocksdb.aggregated-table-properties-at-`level`", same as the previous /// one but only returns the aggregated table properties of the /// specified level "N" at the target column family. pub fn aggregated_table_properties_at_level(level: usize) -> PropertyName { -- cgit v1.2.3-70-g09d2