Skip to content

Commit 230281c

Browse files
committed
Fix cargo fmt
Signed-off-by: Tai Le Manh <[email protected]>
1 parent 1ea189e commit 230281c

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

datafusion/functions/src/string/common.rs

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ use std::fmt::{Display, Formatter};
1919
use std::sync::Arc;
2020

2121
use arrow::array::{
22-
new_null_array, Array, ArrayDataBuilder, ArrayRef, GenericStringArray,
23-
GenericStringBuilder, OffsetSizeTrait, StringArray,
22+
new_null_array, Array, ArrayAccessor, ArrayDataBuilder, ArrayIter, ArrayRef,
23+
GenericStringArray, GenericStringBuilder, OffsetSizeTrait, StringArray,
24+
StringViewArray,
2425
};
2526
use arrow::buffer::{Buffer, MutableBuffer, NullBuffer};
2627
use arrow::datatypes::DataType;
@@ -251,6 +252,22 @@ impl<'a> ColumnarValueRef<'a> {
251252
}
252253
}
253254

255+
pub trait StringArrayType<'a>: ArrayAccessor<Item = &'a str> + Sized {
256+
fn iter(&self) -> ArrayIter<Self>;
257+
}
258+
259+
impl<'a, T: OffsetSizeTrait> StringArrayType<'a> for &'a GenericStringArray<T> {
260+
fn iter(&self) -> ArrayIter<Self> {
261+
GenericStringArray::<T>::iter(self)
262+
}
263+
}
264+
265+
impl<'a> StringArrayType<'a> for &'a StringViewArray {
266+
fn iter(&self) -> ArrayIter<Self> {
267+
StringViewArray::iter(self)
268+
}
269+
}
270+
254271
/// Optimized version of the StringBuilder in Arrow that:
255272
/// 1. Precalculating the expected length of the result, avoiding reallocations.
256273
/// 2. Avoids creating / incrementally creating a `NullBufferBuilder`

datafusion/functions/src/string/repeat.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ use std::any::Any;
1919
use std::sync::Arc;
2020

2121
use arrow::array::{
22-
ArrayRef, AsArray, GenericStringArray, GenericStringBuilder,
23-
Int64Array, OffsetSizeTrait, StringViewArray,
22+
ArrayRef, AsArray, GenericStringArray, GenericStringBuilder, Int64Array,
23+
OffsetSizeTrait, StringViewArray,
2424
};
2525
use arrow::datatypes::DataType;
2626
use arrow::datatypes::DataType::{Int64, LargeUtf8, Utf8, Utf8View};
@@ -31,7 +31,8 @@ use datafusion_expr::TypeSignature::*;
3131
use datafusion_expr::{ColumnarValue, Volatility};
3232
use datafusion_expr::{ScalarUDFImpl, Signature};
3333

34-
use crate::utils::{make_scalar_function, utf8_to_str_type, StringArrayType};
34+
use crate::string::common::StringArrayType;
35+
use crate::utils::{make_scalar_function, utf8_to_str_type};
3536

3637
#[derive(Debug)]
3738
pub struct RepeatFunc {

datafusion/functions/src/unicode/lpad.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ use datafusion_common::{exec_err, Result};
3232
use datafusion_expr::TypeSignature::Exact;
3333
use datafusion_expr::{ColumnarValue, ScalarUDFImpl, Signature, Volatility};
3434

35-
use crate::utils::{make_scalar_function, utf8_to_str_type, StringArrayType};
35+
use crate::string::common::StringArrayType;
36+
use crate::utils::{make_scalar_function, utf8_to_str_type};
3637

3738
#[derive(Debug)]
3839
pub struct LPadFunc {

datafusion/functions/src/utils.rs

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717

1818
use std::sync::Arc;
1919

20-
use arrow::array::{
21-
ArrayAccessor, ArrayIter, ArrayRef, GenericStringArray, OffsetSizeTrait,
22-
StringViewArray,
23-
};
20+
use arrow::array::ArrayRef;
2421
use arrow::datatypes::DataType;
2522

2623
use datafusion_common::{Result, ScalarValue};
@@ -125,22 +122,6 @@ where
125122
})
126123
}
127124

128-
pub trait StringArrayType<'a>: ArrayAccessor<Item = &'a str> + Sized {
129-
fn iter(&self) -> ArrayIter<Self>;
130-
}
131-
132-
impl<'a, T: OffsetSizeTrait> StringArrayType<'a> for &'a GenericStringArray<T> {
133-
fn iter(&self) -> ArrayIter<Self> {
134-
GenericStringArray::<T>::iter(self)
135-
}
136-
}
137-
138-
impl<'a> StringArrayType<'a> for &'a StringViewArray {
139-
fn iter(&self) -> ArrayIter<Self> {
140-
StringViewArray::iter(self)
141-
}
142-
}
143-
144125
#[cfg(test)]
145126
pub mod test {
146127
/// $FUNC ScalarUDFImpl to test

0 commit comments

Comments
 (0)