Added offset module

jorgecarleitao · Dec 2, 2022 · 9ea25f0 · 9ea25f0
1 parent 1fa497f
commit 9ea25f0
Show file tree

Hide file tree

Showing 93 changed files with 162 additions and 90 deletions.
diff --git a/src/array/binary/ffi.rs b/src/array/binary/ffi.rs
@@ -1,7 +1,8 @@
 use crate::{
-    array::{FromFfi, Offset, ToFfi},
+    array::{FromFfi, ToFfi},
     bitmap::align,
     ffi,
+    offset::Offset,
 };
 
 use crate::error::Result;

diff --git a/src/array/binary/fmt.rs b/src/array/binary/fmt.rs
@@ -1,7 +1,8 @@
 use std::fmt::{Debug, Formatter, Result, Write};
 
+use crate::offset::Offset;
+
 use super::super::fmt::write_vec;
-use super::super::Offset;
 use super::BinaryArray;
 
 pub fn write_value<O: Offset, W: Write>(array: &BinaryArray<O>, index: usize, f: &mut W) -> Result {

diff --git a/src/array/binary/from.rs b/src/array/binary/from.rs
@@ -1,6 +1,6 @@
 use std::iter::FromIterator;
 
-use crate::array::Offset;
+use crate::offset::Offset;
 
 use super::{BinaryArray, MutableBinaryArray};
 

diff --git a/src/array/binary/iterator.rs b/src/array/binary/iterator.rs
@@ -1,6 +1,7 @@
 use crate::{
-    array::{ArrayAccessor, ArrayValuesIter, Offset},
+    array::{ArrayAccessor, ArrayValuesIter},
     bitmap::utils::{BitmapIter, ZipValidity},
+    offset::Offset,
 };
 
 use super::{BinaryArray, MutableBinaryValuesArray};

diff --git a/src/array/binary/mod.rs b/src/array/binary/mod.rs
@@ -6,14 +6,15 @@ use crate::{
     buffer::Buffer,
     datatypes::DataType,
     error::Error,
+    offset::Offset,
     trusted_len::TrustedLen,
 };
 
 use either::Either;
 
 use super::{
     specification::{try_check_offsets, try_check_offsets_bounds},
-    Array, GenericBinaryArray, Offset,
+    Array, GenericBinaryArray,
 };
 
 mod ffi;

diff --git a/src/array/binary/mutable.rs b/src/array/binary/mutable.rs
@@ -1,13 +1,14 @@
 use std::{iter::FromIterator, sync::Arc};
 
 use crate::{
-    array::{Array, MutableArray, Offset, TryExtend, TryExtendFromSelf, TryPush},
+    array::{Array, MutableArray, TryExtend, TryExtendFromSelf, TryPush},
     bitmap::{
         utils::{BitmapIter, ZipValidity},
         Bitmap, MutableBitmap,
     },
     datatypes::DataType,
     error::{Error, Result},
+    offset::Offset,
     trusted_len::TrustedLen,
 };
 

diff --git a/src/array/binary/mutable_values.rs b/src/array/binary/mutable_values.rs
@@ -3,12 +3,12 @@ use std::{iter::FromIterator, sync::Arc};
 use crate::{
     array::{
         specification::{check_offsets_minimal, try_check_offsets},
-        Array, ArrayAccessor, ArrayValuesIter, MutableArray, Offset, TryExtend, TryExtendFromSelf,
-        TryPush,
+        Array, ArrayAccessor, ArrayValuesIter, MutableArray, TryExtend, TryExtendFromSelf, TryPush,
     },
     bitmap::MutableBitmap,
     datatypes::DataType,
     error::{Error, Result},
+    offset::Offset,
     trusted_len::TrustedLen,
 };
 

diff --git a/src/array/equal/binary.rs b/src/array/equal/binary.rs
@@ -1,4 +1,5 @@
-use crate::array::{BinaryArray, Offset};
+use crate::array::BinaryArray;
+use crate::offset::Offset;
 
 pub(super) fn equal<O: Offset>(lhs: &BinaryArray<O>, rhs: &BinaryArray<O>) -> bool {
     lhs.data_type() == rhs.data_type() && lhs.len() == rhs.len() && lhs.iter().eq(rhs.iter())

diff --git a/src/array/equal/list.rs b/src/array/equal/list.rs
@@ -1,4 +1,5 @@
-use crate::array::{Array, ListArray, Offset};
+use crate::array::{Array, ListArray};
+use crate::offset::Offset;
 
 pub(super) fn equal<O: Offset>(lhs: &ListArray<O>, rhs: &ListArray<O>) -> bool {
     lhs.data_type() == rhs.data_type() && lhs.len() == rhs.len() && lhs.iter().eq(rhs.iter())

diff --git a/src/array/equal/mod.rs b/src/array/equal/mod.rs
@@ -1,3 +1,4 @@
+use crate::offset::Offset;
 use crate::types::NativeType;
 
 use super::*;

diff --git a/src/array/equal/utf8.rs b/src/array/equal/utf8.rs
@@ -1,4 +1,5 @@
-use crate::array::{Offset, Utf8Array};
+use crate::array::Utf8Array;
+use crate::offset::Offset;
 
 pub(super) fn equal<O: Offset>(lhs: &Utf8Array<O>, rhs: &Utf8Array<O>) -> bool {
     lhs.data_type() == rhs.data_type() && lhs.len() == rhs.len() && lhs.iter().eq(rhs.iter())

diff --git a/src/array/growable/binary.rs b/src/array/growable/binary.rs
@@ -1,9 +1,10 @@
 use std::sync::Arc;
 
 use crate::{
-    array::{Array, BinaryArray, Offset},
+    array::{Array, BinaryArray},
     bitmap::MutableBitmap,
     datatypes::DataType,
+    offset::Offset,
 };
 
 use super::{

diff --git a/src/array/growable/list.rs b/src/array/growable/list.rs
@@ -1,8 +1,9 @@
 use std::sync::Arc;
 
 use crate::{
-    array::{Array, ListArray, Offset},
+    array::{Array, ListArray},
     bitmap::MutableBitmap,
+    offset::Offset,
 };
 
 use super::{

diff --git a/src/array/growable/utf8.rs b/src/array/growable/utf8.rs
@@ -1,7 +1,8 @@
 use std::sync::Arc;
 
 use crate::{
-    array::{Array, Offset, Utf8Array},
+    array::{Array, Utf8Array},
+    offset::Offset,
     bitmap::MutableBitmap,
 };
 

diff --git a/src/array/growable/utils.rs b/src/array/growable/utils.rs
@@ -1,7 +1,4 @@
-use crate::{
-    array::{Array, Offset},
-    bitmap::MutableBitmap,
-};
+use crate::{array::Array, bitmap::MutableBitmap, offset::Offset};
 
 pub(super) fn extend_offsets<T: Offset>(buffer: &mut Vec<T>, last_offset: &mut T, offsets: &[T]) {
     buffer.reserve(offsets.len() - 1);

diff --git a/src/array/list/ffi.rs b/src/array/list/ffi.rs
@@ -1,6 +1,8 @@
 use crate::{array::FromFfi, bitmap::align, error::Result, ffi};
 
-use super::super::{ffi::ToFfi, Array, Offset};
+use crate::offset::Offset;
+
+use super::super::{ffi::ToFfi, Array};
 use super::ListArray;
 
 unsafe impl<O: Offset> ToFfi for ListArray<O> {

diff --git a/src/array/list/fmt.rs b/src/array/list/fmt.rs
@@ -1,6 +1,6 @@
 use std::fmt::{Debug, Formatter, Result, Write};
 
-use crate::array::Offset;
+use crate::offset::Offset;
 
 use super::super::fmt::{get_display, write_vec};
 use super::ListArray;

diff --git a/src/array/list/iterator.rs b/src/array/list/iterator.rs
@@ -1,6 +1,6 @@
-use crate::array::Offset;
 use crate::array::{Array, ArrayAccessor, ArrayValuesIter};
 use crate::bitmap::utils::{BitmapIter, ZipValidity};
+use crate::offset::Offset;
 
 use super::ListArray;
 

diff --git a/src/array/list/mod.rs b/src/array/list/mod.rs
@@ -3,13 +3,14 @@ use crate::{
     buffer::Buffer,
     datatypes::{DataType, Field},
     error::Error,
+    offset::Offset,
 };
 use std::sync::Arc;
 
 use super::{
     new_empty_array,
     specification::{try_check_offsets, try_check_offsets_bounds},
-    Array, Offset,
+    Array,
 };
 
 mod ffi;

diff --git a/src/array/list/mutable.rs b/src/array/list/mutable.rs
@@ -4,11 +4,12 @@ use crate::{
     array::{
         physical_binary::{extend_validity, try_extend_offsets},
         specification::try_check_offsets,
-        Array, MutableArray, Offset, TryExtend, TryExtendFromSelf, TryPush,
+        Array, MutableArray, TryExtend, TryExtendFromSelf, TryPush,
     },
     bitmap::MutableBitmap,
     datatypes::{DataType, Field},
     error::{Error, Result},
+    offset::Offset,
     trusted_len::TrustedLen,
 };
 

diff --git a/src/array/mod.rs b/src/array/mod.rs
@@ -439,7 +439,6 @@ pub use iterator::ArrayValuesIter;
 pub use equal::equal;
 pub use fmt::{get_display, get_value_display};
 
-pub use crate::types::Offset;
 pub use binary::{BinaryArray, BinaryValueIter, MutableBinaryArray, MutableBinaryValuesArray};
 pub use boolean::{BooleanArray, MutableBooleanArray};
 pub use dictionary::{DictionaryArray, DictionaryKey, MutableDictionaryArray};
@@ -483,7 +482,7 @@ pub trait TryExtendFromSelf {
 /// 1. `offsets.len() > 0`
 /// 2. `offsets[i] >= offsets[i-1] for all i`
 /// 3. `offsets[i] < values.len() for all i`
-pub unsafe trait GenericBinaryArray<O: Offset>: Array {
+pub unsafe trait GenericBinaryArray<O: crate::offset::Offset>: Array {
     /// The values of the array
     fn values(&self) -> &[u8];
     /// The offsets of the array

diff --git a/src/array/ord.rs b/src/array/ord.rs
@@ -4,6 +4,7 @@ use std::cmp::Ordering;
 
 use crate::datatypes::*;
 use crate::error::{Error, Result};
+use crate::offset::Offset;
 use crate::{array::*, types::NativeType};
 
 /// Compare the values at two arbitrary indices in two arrays.

diff --git a/src/array/physical_binary.rs b/src/array/physical_binary.rs
@@ -1,6 +1,6 @@
-use crate::array::Offset;
 use crate::bitmap::MutableBitmap;
 use crate::error::Error;
+use crate::offset::Offset;
 
 /// # Safety
 /// The caller must ensure that `iterator` is `TrustedLen`.

diff --git a/src/array/utf8/ffi.rs b/src/array/utf8/ffi.rs
@@ -1,8 +1,9 @@
 use crate::{
-    array::{FromFfi, Offset, ToFfi},
+    array::{FromFfi, ToFfi},
     bitmap::align,
     error::Result,
     ffi,
+    offset::Offset,
 };
 
 use super::Utf8Array;

diff --git a/src/array/utf8/fmt.rs b/src/array/utf8/fmt.rs
@@ -1,7 +1,8 @@
 use std::fmt::{Debug, Formatter, Result, Write};
 
+use crate::offset::Offset;
+
 use super::super::fmt::write_vec;
-use super::super::Offset;
 use super::Utf8Array;
 
 pub fn write_value<O: Offset, W: Write>(array: &Utf8Array<O>, index: usize, f: &mut W) -> Result {

diff --git a/src/array/utf8/from.rs b/src/array/utf8/from.rs
@@ -1,6 +1,6 @@
 use std::iter::FromIterator;
 
-use crate::array::Offset;
+use crate::offset::Offset;
 
 use super::{MutableUtf8Array, Utf8Array};
 

diff --git a/src/array/utf8/iterator.rs b/src/array/utf8/iterator.rs
@@ -1,5 +1,6 @@
-use crate::array::{ArrayAccessor, ArrayValuesIter, Offset};
+use crate::array::{ArrayAccessor, ArrayValuesIter};
 use crate::bitmap::utils::{BitmapIter, ZipValidity};
+use crate::offset::Offset;
 
 use super::{MutableUtf8Array, MutableUtf8ValuesArray, Utf8Array};
 

diff --git a/src/array/utf8/mod.rs b/src/array/utf8/mod.rs
@@ -6,14 +6,15 @@ use crate::{
     buffer::Buffer,
     datatypes::DataType,
     error::{Error, Result},
+    offset::Offset,
     trusted_len::TrustedLen,
 };
 
 use either::Either;
 
 use super::{
     specification::{try_check_offsets_and_utf8, try_check_offsets_bounds},
-    Array, GenericBinaryArray, Offset,
+    Array, GenericBinaryArray,
 };
 
 mod ffi;

diff --git a/src/array/utf8/mutable.rs b/src/array/utf8/mutable.rs
@@ -2,13 +2,14 @@ use std::{iter::FromIterator, sync::Arc};
 
 use crate::array::{physical_binary::*, TryExtendFromSelf};
 use crate::{
-    array::{Array, MutableArray, Offset, TryExtend, TryPush},
+    array::{Array, MutableArray, TryExtend, TryPush},
     bitmap::{
         utils::{BitmapIter, ZipValidity},
         Bitmap, MutableBitmap,
     },
     datatypes::DataType,
     error::{Error, Result},
+    offset::Offset,
     trusted_len::TrustedLen,
 };
 

diff --git a/src/array/utf8/mutable_values.rs b/src/array/utf8/mutable_values.rs
@@ -3,11 +3,12 @@ use std::{iter::FromIterator, sync::Arc};
 use crate::{
     array::{
         specification::{check_offsets_minimal, try_check_offsets_and_utf8},
-        Array, ArrayValuesIter, MutableArray, Offset, TryExtend, TryExtendFromSelf, TryPush,
+        Array, ArrayValuesIter, MutableArray, TryExtend, TryExtendFromSelf, TryPush,
     },
     bitmap::MutableBitmap,
     datatypes::DataType,
     error::{Error, Result},
+    offset::Offset,
     trusted_len::TrustedLen,
 };
 

diff --git a/src/compute/aggregate/min_max.rs b/src/compute/aggregate/min_max.rs
@@ -1,11 +1,12 @@
 use crate::bitmap::utils::{BitChunkIterExact, BitChunksExact};
 use crate::datatypes::{DataType, PhysicalType, PrimitiveType};
 use crate::error::{Error, Result};
+use crate::offset::Offset;
 use crate::scalar::*;
 use crate::types::simd::*;
 use crate::types::NativeType;
 use crate::{
-    array::{Array, BinaryArray, BooleanArray, Offset, PrimitiveArray, Utf8Array},
+    array::{Array, BinaryArray, BooleanArray, PrimitiveArray, Utf8Array},
     bitmap::Bitmap,
 };
 

diff --git a/src/compute/cast/binary_to.rs b/src/compute/cast/binary_to.rs
@@ -1,6 +1,7 @@
 use std::convert::TryFrom;
 
 use crate::error::{Error, Result};
+use crate::offset::Offset;
 use crate::{array::*, datatypes::DataType, types::NativeType};
 
 use super::CastOptions;

diff --git a/src/compute/cast/boolean_to.rs b/src/compute/cast/boolean_to.rs
@@ -1,6 +1,7 @@
 use crate::{
-    array::{Array, BinaryArray, BooleanArray, Offset, PrimitiveArray, Utf8Array},
+    array::{Array, BinaryArray, BooleanArray, PrimitiveArray, Utf8Array},
     error::Result,
+    offset::Offset,
     types::NativeType,
 };
 

diff --git a/src/compute/cast/mod.rs b/src/compute/cast/mod.rs
@@ -18,6 +18,7 @@ use crate::{
     array::*,
     datatypes::*,
     error::{Error, Result},
+    offset::Offset,
 };
 
 /// options defining how Cast kernels behave

diff --git a/src/compute/cast/primitive_to.rs b/src/compute/cast/primitive_to.rs
@@ -4,6 +4,7 @@ use num_traits::{AsPrimitive, Float, ToPrimitive};
 
 use crate::datatypes::IntervalUnit;
 use crate::error::Result;
+use crate::offset::Offset;
 use crate::types::{days_ms, f16, months_days_ns};
 use crate::{
     array::*,

diff --git a/src/compute/cast/utf8_to.rs b/src/compute/cast/utf8_to.rs
@@ -6,6 +6,7 @@ use crate::{
     array::*,
     datatypes::DataType,
     error::{Error, Result},
+    offset::Offset,
     temporal_conversions::{
         utf8_to_naive_timestamp_ns as utf8_to_naive_timestamp_ns_,
         utf8_to_timestamp_ns as utf8_to_timestamp_ns_, EPOCH_DAYS_FROM_CE,

diff --git a/src/compute/comparison/binary.rs b/src/compute/comparison/binary.rs
@@ -1,9 +1,10 @@
 //! Comparison functions for [`BinaryArray`]
 use crate::compute::comparison::{finish_eq_validities, finish_neq_validities};
 use crate::{
-    array::{BinaryArray, BooleanArray, Offset},
+    array::{BinaryArray, BooleanArray},
     bitmap::Bitmap,
     datatypes::DataType,
+    offset::Offset,
 };
 
 use super::super::utils::combine_validities;