derive specific ReadOptions for iterators

Signed-off-by: Jason Volk <jason@zemos.net>

src/database/map.rs

@@ -116,18 +116,24 @@ fn open(db: &Arc<Engine>, name: &str) -> Result<Arc<ColumnFamily>> {
 }
 
 #[inline]
-fn cache_read_options_default() -> ReadOptions {
+pub(crate) fn iter_options_default() -> ReadOptions {
+	let mut read_options = read_options_default();
+	read_options
+}
+
+#[inline]
+pub(crate) fn cache_read_options_default() -> ReadOptions {
 	let mut read_options = read_options_default();
 	read_options.set_read_tier(ReadTier::BlockCache);
 	read_options
 }
 
 #[inline]
-fn read_options_default() -> ReadOptions {
+pub(crate) fn read_options_default() -> ReadOptions {
 	let mut read_options = ReadOptions::default();
 	read_options.set_total_order_seek(true);
 	read_options
 }
 
 #[inline]
-fn write_options_default() -> WriteOptions { WriteOptions::default() }
+pub(crate) fn write_options_default() -> WriteOptions { WriteOptions::default() }

src/database/map/keys.rs

@@ -15,6 +15,6 @@ where
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn raw_keys(&self) -> impl Stream<Item = Result<Key<'_>>> + Send {
-	let opts = super::read_options_default();
+	let opts = super::iter_options_default();
 	stream::Keys::new(&self.db, &self.cf, opts).init(None)
 }

src/database/map/keys_from.rs

@@ -46,7 +46,7 @@ where
 {
 	use crate::pool::Seek;
 
-	let opts = super::read_options_default();
+	let opts = super::iter_options_default();
 	let state = stream::State::new(&self.db, &self.cf, opts);
 	let seek = Seek {
 		map: self.clone(),

src/database/map/rev_keys.rs

@@ -15,6 +15,6 @@ where
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn rev_raw_keys(&self) -> impl Stream<Item = Result<Key<'_>>> + Send {
-	let opts = super::read_options_default();
+	let opts = super::iter_options_default();
 	stream::KeysRev::new(&self.db, &self.cf, opts).init(None)
 }

src/database/map/rev_keys_from.rs

@@ -48,7 +48,7 @@ where
 {
 	use crate::pool::Seek;
 
-	let opts = super::read_options_default();
+	let opts = super::iter_options_default();
 	let state = stream::State::new(&self.db, &self.cf, opts);
 	let seek = Seek {
 		map: self.clone(),

src/database/map/rev_stream.rs

@@ -23,6 +23,6 @@ where
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn rev_raw_stream(&self) -> impl Stream<Item = Result<KeyVal<'_>>> + Send {
-	let opts = super::read_options_default();
+	let opts = super::iter_options_default();
 	stream::ItemsRev::new(&self.db, &self.cf, opts).init(None)
 }

src/database/map/rev_stream_from.rs

@@ -73,7 +73,7 @@ where
 {
 	use crate::pool::Seek;
 
-	let opts = super::read_options_default();
+	let opts = super::iter_options_default();
 	let state = stream::State::new(&self.db, &self.cf, opts);
 	let seek = Seek {
 		map: self.clone(),

src/database/map/stream.rs

@@ -22,6 +22,6 @@ where
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), fields(%self), level = "trace")]
 pub fn raw_stream(&self) -> impl Stream<Item = Result<KeyVal<'_>>> + Send {
-	let opts = super::read_options_default();
+	let opts = super::iter_options_default();
 	stream::Items::new(&self.db, &self.cf, opts).init(None)
 }