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.

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

chore: upgrade to rocksdb v9.4.0 #2

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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
4 changes: 2 additions & 2 deletions .github/workflows/rocksdb.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
with:
profile: minimal
components: rustfmt, clippy
toolchain: 1.75.0
toolchain: 1.79.0
- name: Install liburing
run: sudo apt-get install liburing2 liburing-dev clang
- name: Cargo fmt
Expand All @@ -30,7 +30,7 @@ jobs:
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: 1.75.0
toolchain: 1.79.0
- name: Install liburing
run: sudo apt-get install liburing2 liburing-dev clang libsnappy-dev
- name: Cargo test
Expand Down
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tvl-rocksdb"
version = "0.1.0"
version = "0.1.1"
edition = "2021"
description = "Rust binding of RocksDB's C++ API"
authors = ["Khalani Dev"]
Expand All @@ -9,8 +9,8 @@ license = "MIT"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
autocxx = "0.26.0"
tvl-librocksdb-sys = { path = "librocksdb-sys", version = "8.11.3"}
autocxx = "0.27.0"
tvl-librocksdb-sys = { path = "librocksdb-sys", version = "9.4.0"}
moveit = "0.6.0"

[dev-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions librocksdb-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tvl-librocksdb-sys"
version = "8.11.3"
version = "9.4.0"
edition = "2021"
description = "Bindings to RocksDB used by the cozo crate"
authors = ["Khalani Dev", "Guanhao Yin", "Ziyang Hu"]
Expand All @@ -14,7 +14,7 @@ miette = "7.2.0"
libc = "0.2"
lz4-sys = { version = "1.9", optional = true }
zstd-sys = { version = "2.0", features = ["zdict_builder"], optional = true }
autocxx = "0.26.0"
autocxx = "0.27.0"

[features]
default = ["snappy"]
Expand All @@ -27,4 +27,4 @@ zstd = ["zstd-sys"]
cxx-build = "1.0.69"
pkg-config = { version = "0.3.25", optional = true }
cc = { version = "1.0", features = ["parallel"] }
autocxx-build = "0.26"
autocxx-build = "0.27"
8 changes: 4 additions & 4 deletions librocksdb-sys/build_version.cc
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@

// 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 = "c2467b141e840fdba5b3a1810763043e56449fb9";
static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:v8.11.3";
static const std::string rocksdb_build_git_sha = "5f003e4a22d2e48e37c98d9620241237cd30dd24";
static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:v9.4.0";
#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:2024-03-11 08:49:59";
static const std::string rocksdb_build_date = "rocksdb_build_date:2024-07-28 08:49:59";
#else
// If HAS_GIT_CHANGES is > 0, the branch/tag has modifications.
// Use the time the build was created.
static const std::string rocksdb_build_date = "rocksdb_build_date:2024-03-12 08:49:59";
static const std::string rocksdb_build_date = "rocksdb_build_date:2024-05-15 08:49:59";
#endif

#ifndef ROCKSDB_LITE
Expand Down
2 changes: 1 addition & 1 deletion librocksdb-sys/rocksdb
Submodule rocksdb updated 789 files
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
profile = "default"
channel = "1.75.0"
channel = "1.79.0"
1 change: 0 additions & 1 deletion src/db.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ impl TransactionDb {
value: &[u8],
) -> Result<()> {
let cf = self.inner.get_cf(col);
assert!(!cf.is_null());
moveit! {
let status = unsafe { self.inner.put(options, cf, &key.into(), &value.into()) };
}
Expand Down
Loading