Update to RocksDB 9.0.0

maestro-org · Mar 25, 2024 · da8cf6e · da8cf6e
1 parent 0d8804a
commit da8cf6e
Show file tree

Hide file tree

Showing 6 changed files with 142 additions and 166 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -38,11 +38,11 @@ portable = ["librocksdb-sys/portable"]
 
 [dependencies]
 libc = "0.2"
-librocksdb-sys = { path = "librocksdb-sys", version = "0.16.0" }
+librocksdb-sys = { path = "librocksdb-sys", version = "0.17.0" }
 serde = { version = "1", features = [ "derive" ], optional = true }
 
 [dev-dependencies]
-trybuild = "1.0"
+trybuild = "<=1.0.89" # trybuild 1.0.90 needs MSRV 1.70
 tempfile = "3.1"
 pretty_assertions = "1.0"
 bincode = "1.3"

diff --git a/librocksdb-sys/Cargo.toml b/librocksdb-sys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "librocksdb-sys"
-version = "0.16.0+8.10.0"
+version = "0.17.0+9.0.0"
 edition = "2018"
 rust-version = "1.66.0"
 authors = ["Karl Hobley <[email protected]>", "Arkadiy Paronyan <[email protected]>"]

diff --git a/librocksdb-sys/build_version.cc b/librocksdb-sys/build_version.cc
@@ -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  = "54d628602706c0c718cf81f87202e0b8f6615faf";
-static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:v8.10.0";
+static const std::string rocksdb_build_git_sha  = "f4441966592636253fd5ab0bb9ed44fc2697fc53";
+static const std::string rocksdb_build_git_tag = "rocksdb_build_git_tag:v9.0.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:2023-12-15 13:01:14";
+static const std::string rocksdb_build_date = "rocksdb_build_date:2024-03-11 11:26:24";
 #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:2023-12-15 13:01:14";
+static const std::string rocksdb_build_date = "rocksdb_build_date:2024-03-11 11:26:24";
 #endif
 
 std::unordered_map<std::string, ROCKSDB_NAMESPACE::RegistrarFunc> ROCKSDB_NAMESPACE::ObjectRegistry::builtins_ = {};

diff --git a/librocksdb-sys/rocksdb b/librocksdb-sys/rocksdb
diff --git a/src/db_options.rs b/src/db_options.rs
@@ -2849,17 +2849,6 @@ impl Options {
         }
     }
 
-    /// Specifies the file access pattern once a compaction is started.
-    ///
-    /// It will be applied to all input files of a compaction.
-    ///
-    /// Default: Normal
-    pub fn set_access_hint_on_compaction_start(&mut self, pattern: AccessHint) {
-        unsafe {
-            ffi::rocksdb_options_set_access_hint_on_compaction_start(self.inner, pattern as c_int);
-        }
-    }
-
     /// Enable/disable adaptive mutex, which spins in the user space before resorting to kernel.
     ///
     /// This could reduce context switch when the mutex is not
@@ -3986,17 +3975,6 @@ pub enum DBRecoveryMode {
     SkipAnyCorruptedRecord = ffi::rocksdb_skip_any_corrupted_records_recovery as isize,
 }
 
-/// File access pattern once a compaction has started
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-#[cfg_attr(feature = "serde1", derive(serde::Serialize, serde::Deserialize))]
-#[repr(i32)]
-pub enum AccessHint {
-    None = 0,
-    Normal,
-    Sequential,
-    WillNeed,
-}
-
 pub struct FifoCompactOptions {
     pub(crate) inner: *mut ffi::rocksdb_fifo_compaction_options_t,
 }