Flatten arrow_buffer (#3883)

apache · Mar 17, 2023 · 7f5f6b8 · 7f5f6b8
1 parent b9090ae
commit 7f5f6b8
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 13 deletions.
diff --git a/arrow-array/src/array/byte_array.rs b/arrow-array/src/array/byte_array.rs
@@ -21,7 +21,7 @@ use crate::iterator::ArrayIter;
 use crate::types::bytes::ByteArrayNativeType;
 use crate::types::ByteArrayType;
 use crate::{Array, ArrayAccessor, OffsetSizeTrait};
-use arrow_buffer::buffer::OffsetBuffer;
+use arrow_buffer::OffsetBuffer;
 use arrow_buffer::{ArrowNativeType, Buffer};
 use arrow_data::ArrayData;
 use arrow_schema::DataType;

diff --git a/arrow-array/src/array/list_array.rs b/arrow-array/src/array/list_array.rs
@@ -20,8 +20,8 @@ use crate::builder::{GenericListBuilder, PrimitiveBuilder};
 use crate::{
     iterator::GenericListArrayIter, Array, ArrayAccessor, ArrayRef, ArrowPrimitiveType,
 };
-use arrow_buffer::buffer::OffsetBuffer;
 use arrow_buffer::ArrowNativeType;
+use arrow_buffer::OffsetBuffer;
 use arrow_data::ArrayData;
 use arrow_schema::{ArrowError, DataType, Field};
 use num::Integer;

diff --git a/arrow-array/src/array/map_array.rs b/arrow-array/src/array/map_array.rs
@@ -17,7 +17,7 @@
 
 use crate::array::{get_offsets, print_long_array};
 use crate::{make_array, Array, ArrayRef, StringArray, StructArray};
-use arrow_buffer::buffer::OffsetBuffer;
+use arrow_buffer::OffsetBuffer;
 use arrow_buffer::{ArrowNativeType, Buffer, ToByteSlice};
 use arrow_data::ArrayData;
 use arrow_schema::{ArrowError, DataType, Field};

diff --git a/arrow-array/src/array/mod.rs b/arrow-array/src/array/mod.rs
@@ -20,8 +20,7 @@
 mod binary_array;
 
 use crate::types::*;
-use arrow_buffer::buffer::{OffsetBuffer, ScalarBuffer};
-use arrow_buffer::ArrowNativeType;
+use arrow_buffer::{ArrowNativeType, OffsetBuffer, ScalarBuffer};
 use arrow_data::ArrayData;
 use arrow_schema::{DataType, IntervalUnit, TimeUnit};
 use std::any::Any;

diff --git a/arrow-array/src/array/primitive_array.rs b/arrow-array/src/array/primitive_array.rs
@@ -25,8 +25,7 @@ use crate::timezone::Tz;
 use crate::trusted_len::trusted_len_unzip;
 use crate::{types::*, ArrowNativeTypeOp};
 use crate::{Array, ArrayAccessor};
-use arrow_buffer::buffer::ScalarBuffer;
-use arrow_buffer::{i256, ArrowNativeType, Buffer};
+use arrow_buffer::{i256, ArrowNativeType, Buffer, ScalarBuffer};
 use arrow_data::bit_iterator::try_for_each_valid_idx;
 use arrow_data::ArrayData;
 use arrow_schema::{ArrowError, DataType};

diff --git a/arrow-array/src/array/run_array.rs b/arrow-array/src/array/run_array.rs
@@ -17,8 +17,7 @@
 
 use std::any::Any;
 
-use arrow_buffer::buffer::RunEndBuffer;
-use arrow_buffer::ArrowNativeType;
+use arrow_buffer::{ArrowNativeType, RunEndBuffer};
 use arrow_data::{ArrayData, ArrayDataBuilder};
 use arrow_schema::{ArrowError, DataType, Field};
 

diff --git a/arrow-array/src/array/struct_array.rs b/arrow-array/src/array/struct_array.rs
@@ -16,8 +16,7 @@
 // under the License.
 
 use crate::{make_array, Array, ArrayRef};
-use arrow_buffer::buffer::buffer_bin_or;
-use arrow_buffer::Buffer;
+use arrow_buffer::{buffer_bin_or, Buffer};
 use arrow_data::ArrayData;
 use arrow_schema::{ArrowError, DataType, Field};
 use std::{any::Any, ops::Index};

diff --git a/arrow-array/src/lib.rs b/arrow-array/src/lib.rs
@@ -152,7 +152,7 @@
 //!
 //! [Arrow specification]: https://arrow.apache.org/docs/format/Columnar.html
 //! [`&dyn Array`]: Array
-//! [`NullBuffer`]: arrow_buffer::buffer::NullBuffer
+//! [`NullBuffer`]: arrow_buffer::NullBuffer
 //! [`Buffer`]: arrow_buffer::Buffer
 //! [`compute`]: https://docs.rs/arrow/latest/arrow/compute/index.html
 //! [`json`]: https://docs.rs/arrow/latest/arrow/json/index.html

diff --git a/arrow-buffer/src/lib.rs b/arrow-buffer/src/lib.rs
@@ -19,7 +19,7 @@
 
 pub mod alloc;
 pub mod buffer;
-pub use buffer::{Buffer, MutableBuffer};
+pub use buffer::*;
 
 mod bigint;
 mod bytes;