diff --git a/Cargo.lock b/Cargo.lock index 01736fe..b03c4b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -344,7 +344,7 @@ dependencies = [ "num_cpus 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", "page_size 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "prometheus 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rocksdb 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rocksdb 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)", @@ -762,7 +762,7 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.11.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.50 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1177,7 +1177,7 @@ dependencies = [ "checksum redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe5204c3a17e97dde73f285d49be585df59ed84b50a872baf416e73b62c3828" "checksum regex 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "53ee8cfdddb2e0291adfb9f13d31d3bbe0a03c9a402c01b1e24188d86c35b24f" "checksum regex-syntax 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8c2f35eedad5295fdf00a63d7d4b238135723f92b434ec06774dad15c7ab0861" -"checksum rocksdb 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f1651697fefd273bfb4fd69466cc2a9d20de557a0213b97233b22b5e95924b5e" +"checksum rocksdb 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3eca7dfb97566985090e6bc4a529af42d0adda683d346a024104ee1b1932e340" "checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a" "checksum rustc-demangle 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "adacaae16d02b6ec37fdc7acfcddf365978de76d1983d3ee22afc260e1ca9619" "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" diff --git a/Cargo.toml b/Cargo.toml index 864c09a..7eea697 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ lru = "0.1" num_cpus = "1.0" page_size = "0.4" prometheus = "0.5" -rocksdb = "0.11.0" +rocksdb = "0.12.1" rust-crypto = "0.2" serde = "1.0" serde_derive = "1.0" diff --git a/src/store.rs b/src/store.rs index baac0f4..cb50358 100644 --- a/src/store.rs +++ b/src/store.rs @@ -84,7 +84,7 @@ impl DBStore { pub fn compact(self) -> Self { info!("starting full compaction"); - self.db.compact_range(None, None); // would take a while + self.db.compact_range(None::<&[u8]>, None::<&[u8]>); // would take a while info!("finished full compaction"); self } @@ -98,13 +98,13 @@ impl DBStore { } } -pub struct ScanIterator { +pub struct ScanIterator<'a> { prefix: Vec, - iter: rocksdb::DBIterator, + iter: rocksdb::DBIterator<'a>, done: bool, } -impl Iterator for ScanIterator { +impl<'a> Iterator for ScanIterator<'a> { type Item = Row; fn next(&mut self) -> Option {