check cache prior to offloading iterator seek
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
parent
f54a62dda0
commit
ad8cbcaac1
7 changed files with 96 additions and 5 deletions
|
@ -5,6 +5,7 @@ use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt};
|
|||
use rocksdb::Direction;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use super::stream_from::is_cached;
|
||||
use crate::{
|
||||
keyval::{result_deserialize_key, serialize_key, Key},
|
||||
stream,
|
||||
|
@ -54,6 +55,10 @@ where
|
|||
|
||||
let opts = super::iter_options_default();
|
||||
let state = stream::State::new(&self.db, &self.cf, opts);
|
||||
if is_cached(self, from) {
|
||||
return stream::Keys::<'_>::from(state.init_fwd(from.as_ref().into())).boxed();
|
||||
}
|
||||
|
||||
let seek = Seek {
|
||||
map: self.clone(),
|
||||
dir: Direction::Forward,
|
||||
|
|
|
@ -5,6 +5,7 @@ use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt};
|
|||
use rocksdb::Direction;
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use super::rev_stream_from::is_cached;
|
||||
use crate::{
|
||||
keyval::{result_deserialize_key, serialize_key, Key},
|
||||
stream,
|
||||
|
@ -62,6 +63,10 @@ where
|
|||
|
||||
let opts = super::iter_options_default();
|
||||
let state = stream::State::new(&self.db, &self.cf, opts);
|
||||
if is_cached(self, from) {
|
||||
return stream::KeysRev::<'_>::from(state.init_rev(from.as_ref().into())).boxed();
|
||||
}
|
||||
|
||||
let seek = Seek {
|
||||
map: self.clone(),
|
||||
dir: Direction::Reverse,
|
||||
|
|
|
@ -26,3 +26,20 @@ pub fn rev_raw_stream(&self) -> impl Stream<Item = Result<KeyVal<'_>>> + Send {
|
|||
let opts = super::iter_options_default();
|
||||
stream::ItemsRev::new(&self.db, &self.cf, opts).init(None)
|
||||
}
|
||||
|
||||
#[tracing::instrument(
|
||||
name = "cached",
|
||||
level = "trace",
|
||||
skip_all,
|
||||
fields(%map),
|
||||
)]
|
||||
pub(super) fn _is_cached<P>(map: &super::Map) -> bool
|
||||
where
|
||||
P: AsRef<[u8]> + ?Sized,
|
||||
{
|
||||
let opts = super::cache_read_options_default();
|
||||
let mut state = stream::State::new(&map.db, &map.cf, opts);
|
||||
|
||||
state.seek_rev();
|
||||
!state.is_incomplete()
|
||||
}
|
||||
|
|
|
@ -11,6 +11,7 @@ use serde::{Deserialize, Serialize};
|
|||
use crate::{
|
||||
keyval::{result_deserialize, serialize_key, KeyVal},
|
||||
stream,
|
||||
util::is_incomplete,
|
||||
};
|
||||
|
||||
/// Iterate key-value entries in the map starting from upper-bound.
|
||||
|
@ -83,6 +84,10 @@ where
|
|||
|
||||
let opts = super::iter_options_default();
|
||||
let state = stream::State::new(&self.db, &self.cf, opts);
|
||||
if is_cached(self, from) {
|
||||
return stream::ItemsRev::<'_>::from(state.init_rev(from.as_ref().into())).boxed();
|
||||
};
|
||||
|
||||
let seek = Seek {
|
||||
map: self.clone(),
|
||||
dir: Direction::Reverse,
|
||||
|
@ -99,3 +104,21 @@ where
|
|||
.try_flatten()
|
||||
.boxed()
|
||||
}
|
||||
|
||||
#[tracing::instrument(
|
||||
name = "cached",
|
||||
level = "trace",
|
||||
skip(map, from),
|
||||
fields(%map),
|
||||
)]
|
||||
pub(super) fn is_cached<P>(map: &Arc<super::Map>, from: &P) -> bool
|
||||
where
|
||||
P: AsRef<[u8]> + ?Sized,
|
||||
{
|
||||
let cache_opts = super::cache_read_options_default();
|
||||
let cache_status = stream::State::new(&map.db, &map.cf, cache_opts)
|
||||
.init_rev(from.as_ref().into())
|
||||
.status();
|
||||
|
||||
!matches!(cache_status, Some(e) if is_incomplete(&e))
|
||||
}
|
||||
|
|
|
@ -25,3 +25,20 @@ pub fn raw_stream(&self) -> impl Stream<Item = Result<KeyVal<'_>>> + Send {
|
|||
let opts = super::iter_options_default();
|
||||
stream::Items::new(&self.db, &self.cf, opts).init(None)
|
||||
}
|
||||
|
||||
#[tracing::instrument(
|
||||
name = "cached",
|
||||
level = "trace",
|
||||
skip_all,
|
||||
fields(%map),
|
||||
)]
|
||||
pub(super) fn _is_cached<P>(map: &super::Map) -> bool
|
||||
where
|
||||
P: AsRef<[u8]> + ?Sized,
|
||||
{
|
||||
let opts = super::cache_read_options_default();
|
||||
let mut state = stream::State::new(&map.db, &map.cf, opts);
|
||||
|
||||
state.seek_fwd();
|
||||
!state.is_incomplete()
|
||||
}
|
||||
|
|
|
@ -81,6 +81,10 @@ where
|
|||
|
||||
let opts = super::read_options_default();
|
||||
let state = stream::State::new(&self.db, &self.cf, opts);
|
||||
if is_cached(self, from) {
|
||||
return stream::Items::<'_>::from(state.init_fwd(from.as_ref().into())).boxed();
|
||||
};
|
||||
|
||||
let seek = Seek {
|
||||
map: self.clone(),
|
||||
dir: Direction::Forward,
|
||||
|
@ -97,3 +101,19 @@ where
|
|||
.try_flatten()
|
||||
.boxed()
|
||||
}
|
||||
|
||||
#[tracing::instrument(
|
||||
name = "cached",
|
||||
level = "trace",
|
||||
skip(map, from),
|
||||
fields(%map),
|
||||
)]
|
||||
pub(super) fn is_cached<P>(map: &Arc<super::Map>, from: &P) -> bool
|
||||
where
|
||||
P: AsRef<[u8]> + ?Sized,
|
||||
{
|
||||
let opts = super::cache_read_options_default();
|
||||
let state = stream::State::new(&map.db, &map.cf, opts).init_fwd(from.as_ref().into());
|
||||
|
||||
!state.is_incomplete()
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue