Move IoBuf

bench-vortex/src/taxi_data.rs

@@ -3,9 +3,8 @@ use std::io::Write;
 use std::path::PathBuf;
 
 use futures::executor::block_on;
-use vortex::buffer::io_buf::IoBuf;
 use vortex::error::VortexError;
-use vortex::io::VortexWrite;
+use vortex::io::{IoBuf, VortexWrite};
 
 use crate::data_downloads::{data_vortex_uncompressed, download_data};
 use crate::reader::rewrite_parquet_as_vortex;

vortex-buffer/src/lib.rs

@@ -16,7 +16,6 @@ use arrow_buffer::{ArrowNativeType, Buffer as ArrowBuffer, MutableBuffer as Arro
 pub use string::*;
 
 mod flexbuffers;
-pub mod io_buf;
 mod string;
 
 /// Buffer is an owned, cheaply cloneable byte array.

vortex-buffer/src/io_buf.rs → vortex-io/src/io_buf.rs

@@ -3,8 +3,7 @@
 use std::ops::Range;
 
 use bytes::Bytes;
-
-use crate::Buffer;
+use vortex_buffer::Buffer;
 
 /// Trait for types that can provide a readonly byte buffer interface to I/O frameworks.
 ///

vortex-io/src/lib.rs

@@ -9,6 +9,7 @@
 
 pub use buf::*;
 pub use dispatcher::*;
+pub use io_buf::*;
 pub use limit::*;
 #[cfg(feature = "object_store")]
 pub use object_store::*;
@@ -23,6 +24,7 @@ mod buf;
 #[cfg(feature = "compio")]
 mod compio;
 mod dispatcher;
+mod io_buf;
 mod limit;
 #[cfg(feature = "object_store")]
 mod object_store;

vortex-io/src/object_store.rs

@@ -8,12 +8,11 @@ use bytes::Bytes;
 use futures_util::StreamExt;
 use object_store::path::Path;
 use object_store::{GetOptions, GetRange, GetResultPayload, ObjectStore, WriteMultipart};
-use vortex_buffer::io_buf::IoBuf;
 use vortex_buffer::Buffer;
 use vortex_error::{VortexExpect, VortexResult, VortexUnwrap};
 
 use crate::aligned::AlignedBytesMut;
-use crate::{VortexBufReader, VortexReadAt, VortexWrite, ALIGNMENT};
+use crate::{IoBuf, VortexBufReader, VortexReadAt, VortexWrite, ALIGNMENT};
 
 pub trait ObjectStoreExt {
     fn vortex_read(

vortex-io/src/tokio.rs

@@ -8,11 +8,10 @@ use std::sync::Arc;
 
 use bytes::Bytes;
 use tokio::io::{AsyncWrite, AsyncWriteExt};
-use vortex_buffer::io_buf::IoBuf;
 use vortex_error::VortexUnwrap;
 
 use crate::aligned::AlignedBytesMut;
-use crate::{VortexReadAt, VortexWrite, ALIGNMENT};
+use crate::{IoBuf, VortexReadAt, VortexWrite, ALIGNMENT};
 
 pub struct TokioAdapter<IO>(pub IO);
 

vortex-io/src/write.rs

@@ -1,7 +1,7 @@
 use std::future::{ready, Future};
 use std::io::{self, Cursor, Write};
 
-use vortex_buffer::io_buf::IoBuf;
+use crate::IoBuf;
 
 pub trait VortexWrite {
     fn write_all<B: IoBuf>(&mut self, buffer: B) -> impl Future<Output = io::Result<B>>;

vortex-ipc/src/messages/writer.rs

@@ -4,12 +4,11 @@ use std::io;
 use bytes::Bytes;
 use flatbuffers::FlatBufferBuilder;
 use vortex_array::ArrayData;
-use vortex_buffer::io_buf::IoBuf;
 use vortex_buffer::Buffer;
 use vortex_dtype::DType;
 use vortex_error::VortexUnwrap;
 use vortex_flatbuffers::{WriteFlatBuffer, WriteFlatBufferExt};
-use vortex_io::VortexWrite;
+use vortex_io::{IoBuf, VortexWrite};
 
 use crate::messages::IPCMessage;
 use crate::ALIGNMENT;