chore: rename ArrayBufferReader to ArrayMessageReader and move messages around (#1254)

Author: robert3005

vortex-serde/src/dtype_reader.rs

@@ -2,7 +2,7 @@ use vortex_dtype::DType;
 use vortex_error::VortexResult;
 
 use crate::io::VortexRead;
-use crate::message_reader::MessageReader;
+use crate::messages::reader::MessageReader;
 
 /// Reader for serialized dtype messages
 pub struct DTypeReader<R: VortexRead> {

vortex-serde/src/layouts/read/layouts/chunked.rs

@@ -167,7 +167,7 @@ mod tests {
     };
     use crate::layouts::read::mask::RowMask;
     use crate::layouts::{write, LayoutDeserializer, LayoutMessageCache, RowFilter, Scan};
-    use crate::message_writer::MessageWriter;
+    use crate::messages::writer::MessageWriter;
     use crate::stream_writer::ByteRange;
 
     async fn layout_and_bytes(

vortex-serde/src/layouts/read/layouts/flat.rs

@@ -12,7 +12,7 @@ use crate::layouts::{
     BatchRead, LayoutDeserializer, LayoutId, LayoutReader, LayoutSpec, Message, Scan,
     FLAT_LAYOUT_ID,
 };
-use crate::message_reader::ArrayBufferReader;
+use crate::messages::reader::ArrayMessageReader;
 use crate::stream_writer::ByteRange;
 
 #[derive(Debug)]
@@ -78,7 +78,7 @@ impl FlatLayout {
     }
 
     fn array_from_bytes(&self, mut buf: Bytes) -> VortexResult<Array> {
-        let mut array_reader = ArrayBufferReader::new();
+        let mut array_reader = ArrayMessageReader::new();
         let mut read_buf = Bytes::new();
         while let Some(u) = array_reader.read(read_buf)? {
             read_buf = buf.split_to(u);
@@ -132,7 +132,7 @@ mod tests {
     use crate::layouts::read::layouts::flat::FlatLayout;
     use crate::layouts::read::layouts::test_read::{filter_read_layout, read_layout};
     use crate::layouts::{LayoutMessageCache, RowFilter, Scan};
-    use crate::message_writer::MessageWriter;
+    use crate::messages::writer::MessageWriter;
     use crate::stream_writer::ByteRange;
 
     async fn read_only_layout(

vortex-serde/src/layouts/read/layouts/inline_dtype.rs

@@ -13,7 +13,7 @@ use crate::layouts::{
     BatchRead, LayoutDeserializer, LayoutId, LayoutPartId, LayoutReader, LayoutSpec, Message, Scan,
     INLINE_SCHEMA_LAYOUT_ID,
 };
-use crate::message_reader::FLATBUFFER_SIZE_LENGTH;
+use crate::messages::reader::FLATBUFFER_SIZE_LENGTH;
 use crate::stream_writer::ByteRange;
 
 #[derive(Debug)]

vortex-serde/src/lib.rs

@@ -1,14 +1,12 @@
 #![doc(html_logo_url = "/vortex/docs/_static/vortex_spiral_logo.svg")]
 
-use message_reader::*;
-use message_writer::*;
+use messages::reader::*;
+use messages::writer::*;
 
 pub mod chunked_reader;
 mod dtype_reader;
 pub mod io;
 pub mod layouts;
-mod message_reader;
-mod message_writer;
 mod messages;
 pub mod stream_reader;
 pub mod stream_writer;

vortex-serde/src/messages.rs vortex-serde/src/messages/mod.rsvortex-serde/src/messages.rs renamed to vortex-serde/src/messages/mod.rs

@@ -10,6 +10,9 @@ use vortex_flatbuffers::{message as fb, FlatBufferRoot, WriteFlatBuffer};
 
 use crate::ALIGNMENT;
 
+pub mod reader;
+pub mod writer;
+
 pub enum IPCMessage<'a> {
     Schema(IPCSchema<'a>),
     Batch(IPCBatch<'a>),

vortex-serde/src/message_reader.rs vortex-serde/src/messages/reader.rsvortex-serde/src/message_reader.rs renamed to vortex-serde/src/messages/reader.rs

@@ -115,7 +115,7 @@ impl<R: VortexRead> MessageReader<R> {
         };
 
         let mut array_reader =
-            ArrayBufferReader::from_fb_bytes(Buffer::from(self.message.clone().freeze()));
+            ArrayMessageReader::from_fb_bytes(Buffer::from(self.message.clone().freeze()));
 
         // Issue a single read to grab all buffers
         let mut all_buffers = BytesMut::with_capacity(all_buffers_size);
@@ -216,19 +216,19 @@ pub enum ReadState {
     Finished,
 }
 
-pub struct ArrayBufferReader {
+pub struct ArrayMessageReader {
     state: ReadState,
     fb_msg: Option<Buffer>,
     buffers: Vec<Buffer>,
 }
 
-impl Default for ArrayBufferReader {
+impl Default for ArrayMessageReader {
     fn default() -> Self {
         Self::new()
     }
 }
 
-impl ArrayBufferReader {
+impl ArrayMessageReader {
     pub fn new() -> Self {
         Self {
             state: ReadState::Init,