Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update RocksDB to 8.6.7 #825

Merged
merged 2 commits into from
Oct 18, 2023
Merged

Update RocksDB to 8.6.7 #825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2bc3ef
Update RocksDB to 8.6.7
aleksuss Oct 18, 2023
c6a7bc8
comment docs
aleksuss Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: RocksDB CI

on: [push, pull_request]
env:
RUST_VERSION: 1.63.0
RUST_VERSION: 1.66.0

jobs:
fmt:
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <t@jujit.su>", "David Greenberg <dsg123456789@gmail.com>"]
repository = "https://github.com/rust-rocksdb/rust-rocksdb"
license = "Apache-2.0"
Expand Down Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions librocksdb-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <karlhobley10@gmail.com>", "Arkadiy Paronyan <arkadiy@ethcore.io>"]
license = "MIT/Apache-2.0/BSD-3-Clause"
description = "Native bindings to librocksdb"
Expand Down Expand Up @@ -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 }
6 changes: 3 additions & 3 deletions librocksdb-sys/build_version.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion librocksdb-sys/rocksdb
Open in desktop
Submodule rocksdb updated 268 files
14 changes: 7 additions & 7 deletions src/properties.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@ macro_rules! property {
};
}

/// "rocksdb.num-files-at-level<N>" - returns string containing the number
/// of files at level <N>, where <N> 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<N>" - returns string containing the
/// compression ratio of data at level <N>, where <N> 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 <N>.
/// 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) }
}
Expand All @@ -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<n>"),
/// general column family stats per-level over db's lifetime ("`L<n>`"),
/// 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.
Expand Down Expand Up @@ -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<N>", same as the previous
/// "rocksdb.aggregated-table-properties-at-`level<N>`", 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 {
Expand Down