Skip to content

Commit aa276c1

Browse files
committed
lint and format
1 parent f943950 commit aa276c1

File tree

1 file changed

+47
-38
lines changed

1 file changed

+47
-38
lines changed

arrow-select/src/zip.rs

Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -532,14 +532,14 @@ impl<T: ByteArrayType> BytesScalarImpl<T> {
532532
// All values are falsy
533533

534534
let (bytes, offsets) =
535-
Self::get_bytes_and_offset_for_all_same_value(predicate.len(), falsy_val);
535+
Self::get_bytes_and_offset_for_all_same_value(predicate.len(), falsy_val);
536536

537537
return (bytes, offsets);
538538
}
539539
n if n == predicate.len() => {
540540
// All values are truthy
541541
let (bytes, offsets) =
542-
Self::get_bytes_and_offset_for_all_same_value(predicate.len(), truthy_val);
542+
Self::get_bytes_and_offset_for_all_same_value(predicate.len(), truthy_val);
543543

544544
return (bytes, offsets);
545545
}
@@ -550,7 +550,7 @@ impl<T: ByteArrayType> BytesScalarImpl<T> {
550550
}
551551

552552
let total_number_of_bytes =
553-
true_count * truthy_val.len() + (predicate.len() - true_count) * falsy_val.len();
553+
true_count * truthy_val.len() + (predicate.len() - true_count) * falsy_val.len();
554554
let mut mutable = MutableBuffer::with_capacity(total_number_of_bytes);
555555
let mut offset_buffer_builder = OffsetBufferBuilder::<T::Offset>::new(predicate.len());
556556

@@ -755,24 +755,29 @@ mod test {
755755
let mask = BooleanArray::from(vec![true, true, false, true, false, false]);
756756
let out = zip(&mask, &scalar_truthy, &scalar_falsy).unwrap();
757757
let actual = out.as_any().downcast_ref::<Int32Array>().unwrap();
758-
let expected = Int32Array::from(vec![Some(42), Some(42), Some(123), Some(42), Some(123), Some(123)]);
758+
let expected = Int32Array::from(vec![
759+
Some(42),
760+
Some(42),
761+
Some(123),
762+
Some(42),
763+
Some(123),
764+
Some(123),
765+
]);
759766
assert_eq!(actual, &expected);
760767
}
761768

762769
#[test]
763-
fn test_zip_kernel_primitive_scalar_with_boolean_array_mask_with_nulls_should_be_treated_as_false() {
770+
fn test_zip_kernel_primitive_scalar_with_boolean_array_mask_with_nulls_should_be_treated_as_false()
771+
{
764772
let scalar_truthy = Scalar::new(Int32Array::from_value(42, 1));
765773
let scalar_falsy = Scalar::new(Int32Array::from_value(123, 1));
766774

767775
let mask = {
768776
let booleans = BooleanBuffer::from(vec![true, true, false, true, false, false]);
769777
let nulls = NullBuffer::from(vec![
770-
true,
771-
true,
772-
true,
778+
true, true, true,
773779
false, // null treated as false even though in the original mask it was true
774-
true,
775-
true
780+
true, true,
776781
]);
777782
BooleanArray::new(booleans, Some(nulls))
778783
};
@@ -784,7 +789,7 @@ mod test {
784789
Some(123),
785790
Some(123), // true in mask but null
786791
Some(123),
787-
Some(123)
792+
Some(123),
788793
]);
789794
assert_eq!(actual, &expected);
790795
}
@@ -826,19 +831,17 @@ mod test {
826831
}
827832

828833
#[test]
829-
fn test_zip_kernel_large_string_scalar_with_boolean_array_mask_with_nulls_should_be_treated_as_false() {
830-
let scalar_truthy = Scalar::new(LargeStringArray::from_iter_values(&["test"]));
831-
let scalar_falsy = Scalar::new(LargeStringArray::from_iter_values(&["something else"]));
834+
fn test_zip_kernel_large_string_scalar_with_boolean_array_mask_with_nulls_should_be_treated_as_false()
835+
{
836+
let scalar_truthy = Scalar::new(LargeStringArray::from_iter_values(["test"]));
837+
let scalar_falsy = Scalar::new(LargeStringArray::from_iter_values(["something else"]));
832838

833839
let mask = {
834840
let booleans = BooleanBuffer::from(vec![true, true, false, true, false, false]);
835841
let nulls = NullBuffer::from(vec![
836-
true,
837-
true,
838-
true,
842+
true, true, true,
839843
false, // null treated as false even though in the original mask it was true
840-
true,
841-
true
844+
true, true,
842845
]);
843846
BooleanArray::new(booleans, Some(nulls))
844847
};
@@ -850,27 +853,33 @@ mod test {
850853
Some("something else"),
851854
Some("something else"), // true in mask but null
852855
Some("something else"),
853-
Some("something else")
856+
Some("something else"),
854857
]);
855858
assert_eq!(actual, &expected);
856859
}
857860

858861
#[test]
859862
fn test_zip_kernel_bytes_scalar_none_1() {
860-
let scalar_truthy = Scalar::new(StringArray::from_iter_values(&["hello"]));
863+
let scalar_truthy = Scalar::new(StringArray::from_iter_values(["hello"]));
861864
let scalar_falsy = Scalar::new(StringArray::new_null(1));
862865

863866
let mask = BooleanArray::from(vec![true, true, false, false, true]);
864867
let out = zip(&mask, &scalar_truthy, &scalar_falsy).unwrap();
865868
let actual = out.as_any().downcast_ref::<StringArray>().unwrap();
866-
let expected = StringArray::from_iter(vec![Some("hello"), Some("hello"), None, None, Some("hello")]);
869+
let expected = StringArray::from_iter(vec![
870+
Some("hello"),
871+
Some("hello"),
872+
None,
873+
None,
874+
Some("hello"),
875+
]);
867876
assert_eq!(actual, &expected);
868877
}
869878

870879
#[test]
871880
fn test_zip_kernel_bytes_scalar_none_2() {
872881
let scalar_truthy = Scalar::new(StringArray::new_null(1));
873-
let scalar_falsy = Scalar::new(StringArray::from_iter_values(&["hello"]));
882+
let scalar_falsy = Scalar::new(StringArray::from_iter_values(["hello"]));
874883

875884
let mask = BooleanArray::from(vec![true, true, false, false, true]);
876885
let out = zip(&mask, &scalar_truthy, &scalar_falsy).unwrap();
@@ -881,8 +890,8 @@ mod test {
881890

882891
#[test]
883892
fn test_zip_kernel_bytes_scalar_both() {
884-
let scalar_truthy = Scalar::new(StringArray::from_iter_values(&["test"]));
885-
let scalar_falsy = Scalar::new(StringArray::from_iter_values(&["something else"]));
893+
let scalar_truthy = Scalar::new(StringArray::from_iter_values(["test"]));
894+
let scalar_falsy = Scalar::new(StringArray::from_iter_values(["something else"]));
886895

887896
// mask ends with false
888897
let mask = BooleanArray::from(vec![true, true, false, true, false, false]);
@@ -906,8 +915,8 @@ mod test {
906915
let all_false_mask = BooleanArray::from(vec![false; mask_len]);
907916

908917
let null_scalar = Scalar::new(StringArray::new_null(1));
909-
let non_null_scalar_1 = Scalar::new(StringArray::from_iter_values(&["test"]));
910-
let non_null_scalar_2 = Scalar::new(StringArray::from_iter_values(&["something else"]));
918+
let non_null_scalar_1 = Scalar::new(StringArray::from_iter_values(["test"]));
919+
let non_null_scalar_2 = Scalar::new(StringArray::from_iter_values(["something else"]));
911920

912921
{
913922
// 1. Test where left is null and right is non-null
@@ -959,7 +968,8 @@ mod test {
959968
// and mask is all false
960969
let out = zip(&all_false_mask, &non_null_scalar_1, &non_null_scalar_2).unwrap();
961970
let actual = out.as_string::<i32>();
962-
let expected = StringArray::from_iter(std::iter::repeat_n(Some("something else"), mask_len));
971+
let expected =
972+
StringArray::from_iter(std::iter::repeat_n(Some("something else"), mask_len));
963973
assert_eq!(actual, &expected);
964974
}
965975

@@ -972,7 +982,6 @@ mod test {
972982
let expected = StringArray::from_iter(std::iter::repeat_n(None::<&str>, mask_len));
973983
assert_eq!(actual, &expected);
974984
}
975-
976985
}
977986

978987
#[test]
@@ -1041,9 +1050,7 @@ mod test {
10411050
fn test_zip_kernel_scalar_large_binary() {
10421051
let truthy_bytes: &[u8] = b"hey";
10431052
let falsy_bytes: &[u8] = b"world";
1044-
let scalar_truthy = Scalar::new(LargeBinaryArray::from_iter_values(
1045-
vec![truthy_bytes],
1046-
));
1053+
let scalar_truthy = Scalar::new(LargeBinaryArray::from_iter_values(vec![truthy_bytes]));
10471054
let scalar_falsy = Scalar::new(LargeBinaryArray::from_iter_values(vec![falsy_bytes]));
10481055

10491056
let mask = BooleanArray::from(vec![true, false, true, false, true]);
@@ -1140,13 +1147,15 @@ mod test {
11401147
#[test]
11411148
fn zip_scalar_fallback_impl() {
11421149
let truthy_list_item_scalar = Some(vec![Some(1), None, Some(3)]);
1143-
let truthy_list_array_scalar = Scalar::new(ListArray::from_iter_primitive::<Int32Type, _, _>(vec![
1144-
truthy_list_item_scalar.clone()
1145-
]));
1150+
let truthy_list_array_scalar =
1151+
Scalar::new(ListArray::from_iter_primitive::<Int32Type, _, _>(vec![
1152+
truthy_list_item_scalar.clone(),
1153+
]));
11461154
let falsy_list_item_scalar = Some(vec![None, Some(2), Some(4)]);
1147-
let falsy_list_array_scalar = Scalar::new(ListArray::from_iter_primitive::<Int32Type, _, _>(vec![
1148-
falsy_list_item_scalar.clone()
1149-
]));
1155+
let falsy_list_array_scalar =
1156+
Scalar::new(ListArray::from_iter_primitive::<Int32Type, _, _>(vec![
1157+
falsy_list_item_scalar.clone(),
1158+
]));
11501159
let mask = BooleanArray::from(vec![true, false, true, false, false, true, false]);
11511160
let out = zip(&mask, &truthy_list_array_scalar, &falsy_list_array_scalar).unwrap();
11521161
let actual = out.as_list::<i32>();

0 commit comments

Comments
 (0)