From 308d81a6ec193e5c5a30e1e1e2b8f437d8467033 Mon Sep 17 00:00:00 2001 From: steviez Date: Tue, 8 Feb 2022 00:24:01 -0600 Subject: [PATCH] Add open_cf_descriptor methods for Seoncdary and ReadOnly AccessType (#604) --- src/db.rs | 44 ++++++++++++++++++++++++++++ tests/test_db.rs | 74 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 114 insertions(+), 4 deletions(-) diff --git a/src/db.rs b/src/db.rs index 4fdf809..3b3997f 100644 --- a/src/db.rs +++ b/src/db.rs @@ -403,6 +403,28 @@ impl DBWithThreadMode { ) } + /// Opens a database for ready only with the given database options and + /// column family descriptors. + pub fn open_cf_descriptors_read_only( + opts: &Options, + path: P, + cfs: I, + error_if_log_file_exist: bool, + ) -> Result + where + P: AsRef, + I: IntoIterator, + { + Self::open_cf_descriptors_internal( + opts, + path, + cfs, + &AccessType::ReadOnly { + error_if_log_file_exist, + }, + ) + } + /// Opens the database as a secondary with the given database options and column family names. pub fn open_cf_as_secondary( opts: &Options, @@ -429,6 +451,28 @@ impl DBWithThreadMode { ) } + /// Opens the database as a secondary with the given database options and + /// column family descriptors. + pub fn open_cf_descriptors_as_secondary( + opts: &Options, + path: P, + secondary_path: P, + cfs: I, + ) -> Result + where + P: AsRef, + I: IntoIterator, + { + Self::open_cf_descriptors_internal( + opts, + path, + cfs, + &AccessType::Secondary { + secondary_path: secondary_path.as_ref(), + }, + ) + } + /// Opens a database with the given database options and column family descriptors. pub fn open_cf_descriptors(opts: &Options, path: P, cfs: I) -> Result where diff --git a/tests/test_db.rs b/tests/test_db.rs index b7b48ab..b6b506a 100644 --- a/tests/test_db.rs +++ b/tests/test_db.rs @@ -20,10 +20,10 @@ use pretty_assertions::assert_eq; use rocksdb::{ perf::get_memory_usage_stats, BlockBasedOptions, BottommostLevelCompaction, Cache, - CompactOptions, CuckooTableOptions, DBAccess, DBCompactionStyle, DBWithThreadMode, Env, Error, - FifoCompactOptions, IteratorMode, MultiThreaded, Options, PerfContext, PerfMetric, ReadOptions, - SingleThreaded, SliceTransform, Snapshot, UniversalCompactOptions, - UniversalCompactionStopStyle, WriteBatch, DB, + ColumnFamilyDescriptor, CompactOptions, CuckooTableOptions, DBAccess, DBCompactionStyle, + DBWithThreadMode, Env, Error, FifoCompactOptions, IteratorMode, MultiThreaded, Options, + PerfContext, PerfMetric, ReadOptions, SingleThreaded, SliceTransform, Snapshot, + UniversalCompactOptions, UniversalCompactionStopStyle, WriteBatch, DB, }; use util::DBPath; @@ -513,6 +513,46 @@ fn test_open_as_secondary() { assert_eq!(get_byte_slice(&result), b"value2"); } +#[test] +fn test_open_cf_descriptors_as_secondary() { + let primary_path = DBPath::new("_rust_rocksdb_test_open_cf_descriptors_as_secondary_primary"); + let mut primary_opts = Options::default(); + primary_opts.create_if_missing(true); + primary_opts.create_missing_column_families(true); + let cfs = vec!["cf1"]; + let primary_db = DB::open_cf(&primary_opts, &primary_path, &cfs).unwrap(); + let primary_cf1 = primary_db.cf_handle("cf1").unwrap(); + primary_db.put_cf(&primary_cf1, b"k1", b"v1").unwrap(); + + let secondary_path = + DBPath::new("_rust_rocksdb_test_open_cf_descriptors_as_secondary_secondary"); + let mut secondary_opts = Options::default(); + secondary_opts.set_max_open_files(-1); + let cfs = cfs + .into_iter() + .map(|name| ColumnFamilyDescriptor::new(name, Options::default())); + let secondary_db = + DB::open_cf_descriptors_as_secondary(&secondary_opts, &primary_path, &secondary_path, cfs) + .unwrap(); + let secondary_cf1 = secondary_db.cf_handle("cf1").unwrap(); + assert_eq!( + secondary_db.get_cf(&secondary_cf1, b"k1").unwrap().unwrap(), + b"v1" + ); + assert!(secondary_db.put_cf(&secondary_cf1, b"k2", b"v2").is_err()); + + primary_db.put_cf(&primary_cf1, b"k1", b"v2").unwrap(); + assert_eq!( + secondary_db.get_cf(&secondary_cf1, b"k1").unwrap().unwrap(), + b"v1" + ); + assert!(secondary_db.try_catch_up_with_primary().is_ok()); + assert_eq!( + secondary_db.get_cf(&secondary_cf1, b"k1").unwrap().unwrap(), + b"v2" + ); +} + #[test] fn test_open_with_ttl() { let path = DBPath::new("_rust_rocksdb_test_open_with_ttl"); @@ -907,6 +947,32 @@ fn test_open_cf_for_read_only() { } } +#[test] +fn test_open_cf_descriptors_for_read_only() { + let path = DBPath::new("_rust_rocksdb_test_open_cf_descriptors_for_read_only"); + let cfs = vec!["cf1"]; + { + let mut opts = Options::default(); + opts.create_if_missing(true); + opts.create_missing_column_families(true); + let db = DB::open_cf(&opts, &path, &cfs).unwrap(); + let cf1 = db.cf_handle("cf1").unwrap(); + db.put_cf(&cf1, b"k1", b"v1").unwrap(); + } + { + let opts = Options::default(); + let error_if_log_file_exist = false; + let cfs = cfs + .into_iter() + .map(|name| ColumnFamilyDescriptor::new(name, Options::default())); + let db = + DB::open_cf_descriptors_read_only(&opts, &path, cfs, error_if_log_file_exist).unwrap(); + let cf1 = db.cf_handle("cf1").unwrap(); + assert_eq!(db.get_cf(&cf1, b"k1").unwrap().unwrap(), b"v1"); + assert!(db.put_cf(&cf1, b"k2", b"v2").is_err()); + } +} + #[test] fn delete_range_test() { let path = DBPath::new("_rust_rocksdb_delete_range_test");