diff --git a/src/fastfield/bytes/writer.rs b/src/fastfield/bytes/writer.rs index aa16a45e7..84f42cd05 100644 --- a/src/fastfield/bytes/writer.rs +++ b/src/fastfield/bytes/writer.rs @@ -1,4 +1,4 @@ -use std::io; +use std::io::{self, Write}; use fastfield_codecs::VecColumn; diff --git a/src/fastfield/serializer/mod.rs b/src/fastfield/serializer/mod.rs index 307c9e060..adf830d5e 100644 --- a/src/fastfield/serializer/mod.rs +++ b/src/fastfield/serializer/mod.rs @@ -1,6 +1,5 @@ use std::io::{self, Write}; -use common::CountingWriter; pub use fastfield_codecs::{Column, FastFieldStats}; use fastfield_codecs::{FastFieldCodecType, MonotonicallyMappableToU64, ALL_CODEC_TYPES}; @@ -71,15 +70,13 @@ impl CompositeFastFieldSerializer { Ok(()) } - /// Start serializing a new [u8] fast field. + /// Start serializing a new [u8] fast field. Use the returned writer to write data into the + /// bytes field. To associate the bytes with documents a seperate index must be created on + /// index 0. See bytes/writer.rs::serialize for an example. /// /// The bytes will be stored as is, no compression will be applied. - pub fn new_bytes_fast_field( - &mut self, - field: Field, - ) -> FastBytesFieldSerializer<'_, CountingWriter> { - let field_write = self.composite_write.for_field_with_idx(field, 1); - FastBytesFieldSerializer { write: field_write } + pub fn new_bytes_fast_field(&mut self, field: Field) -> impl Write + '_ { + self.composite_write.for_field_with_idx(field, 1) } /// Closes the serializer @@ -89,17 +86,3 @@ impl CompositeFastFieldSerializer { self.composite_write.close() } } - -pub struct FastBytesFieldSerializer<'a, W: Write> { - write: &'a mut W, -} - -impl<'a, W: Write> FastBytesFieldSerializer<'a, W> { - pub fn write_all(&mut self, vals: &[u8]) -> io::Result<()> { - self.write.write_all(vals) - } - - pub fn flush(&mut self) -> io::Result<()> { - self.write.flush() - } -} diff --git a/src/indexer/merger.rs b/src/indexer/merger.rs index 335b3ea88..827f421c6 100644 --- a/src/indexer/merger.rs +++ b/src/indexer/merger.rs @@ -1,5 +1,6 @@ use std::cmp; use std::collections::HashMap; +use std::io::Write; use std::sync::Arc; use fastfield_codecs::VecColumn;