Skip to content

Commit eaf4ab1

Browse files
scovichxudong963
authored andcommitted
Consider fully match row groups in row filter
1 parent 576a063 commit eaf4ab1

17 files changed

Lines changed: 479 additions & 45 deletions

File tree

‎arrow-arith/src/temporal.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ pub fn date_part(array: &dyn Array, part: DatePart) -> Result<ArrayRef, ArrowErr
189189
DataType::Dictionary(_, _) => {
190190
let array = array.as_any_dictionary();
191191
let values = date_part(array.values(), part)?;
192-
let values = Arc::new(values) as ArrayRef;
193192
let new_array = array.with_values(values);
194193
Ok(new_array)
195194
}

‎arrow-cast/src/cast/mod.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8963,8 +8963,6 @@ mod tests {
89638963
];
89648964

89658965
for (array, expected) in cases {
8966-
let array = Arc::new(array) as ArrayRef;
8967-
89688966
assert!(
89698967
can_cast_types(array.data_type(), expected.data_type()),
89708968
"can_cast_types claims we cannot cast {:?} to {:?}",
@@ -13288,8 +13286,7 @@ mod tests {
1328813286
for values in values_arrays {
1328913287
let keys =
1329013288
Int8Array::from_iter([Some(1), Some(0), None, Some(3), None, Some(1), Some(4)]);
13291-
let string_dict_array =
13292-
DictionaryArray::<Int8Type>::try_new(keys, Arc::new(values)).unwrap();
13289+
let string_dict_array = DictionaryArray::<Int8Type>::try_new(keys, values).unwrap();
1329313290

1329413291
let casted = cast(&string_dict_array, &DataType::BinaryView).unwrap();
1329513292
assert_eq!(casted.as_ref(), &expected);
@@ -13316,8 +13313,7 @@ mod tests {
1331613313
for values in values_arrays {
1331713314
let keys =
1331813315
Int8Array::from_iter([Some(1), Some(0), None, Some(3), None, Some(1), Some(4)]);
13319-
let string_dict_array =
13320-
DictionaryArray::<Int8Type>::try_new(keys, Arc::new(values)).unwrap();
13316+
let string_dict_array = DictionaryArray::<Int8Type>::try_new(keys, values).unwrap();
1332113317

1332213318
let casted = cast(&string_dict_array, &DataType::Utf8View).unwrap();
1332313319
assert_eq!(casted.as_ref(), &expected);

‎arrow-cast/src/cast/run_array.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pub(crate) fn run_end_encoded_cast<K: RunEndIndexType>(
6868
));
6969
}
7070
};
71-
Ok(Arc::new(new_run_array))
71+
Ok(new_run_array)
7272
}
7373

7474
// Expand to logical form

‎arrow-ipc/src/reader.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1954,7 +1954,7 @@ mod tests {
19541954
.len(3)
19551955
.build()
19561956
.unwrap();
1957-
let array9: ArrayRef = Arc::new(StructArray::from(array9));
1957+
let array9 = StructArray::from(array9);
19581958

19591959
let array10_input = vec![Some(1_i32), None, None];
19601960
let mut array10_builder = PrimitiveRunBuilder::<Int16Type, Int32Type>::new();
@@ -2995,7 +2995,7 @@ mod tests {
29952995
)
29962996
};
29972997
expect_ipc_validation_error(
2998-
Arc::new(invalid_struct_arr),
2998+
invalid_struct_arr,
29992999
"Invalid argument error: Invalid UTF8 sequence at string index 3 (3..18): invalid utf-8 sequence of 1 bytes from index 11",
30003000
);
30013001
}

‎arrow-ord/src/sort.rs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,7 @@ mod tests {
11071107
) {
11081108
let output = create_decimal_array::<T>(data, precision, scale);
11091109
let expected = UInt32Array::from(expected_data);
1110-
let output = sort_to_indices(&(Arc::new(output) as ArrayRef), options, limit).unwrap();
1110+
let output = sort_to_indices(&output, options, limit).unwrap();
11111111
assert_eq!(output, expected)
11121112
}
11131113

@@ -1119,7 +1119,7 @@ mod tests {
11191119
) {
11201120
let output = create_decimal256_array(data);
11211121
let expected = UInt32Array::from(expected_data);
1122-
let output = sort_to_indices(&(Arc::new(output) as ArrayRef), options, limit).unwrap();
1122+
let output = sort_to_indices(&output, options, limit).unwrap();
11231123
assert_eq!(output, expected)
11241124
}
11251125

@@ -1134,8 +1134,8 @@ mod tests {
11341134
let output = create_decimal_array::<T>(data, p, s);
11351135
let expected = Arc::new(create_decimal_array::<T>(expected_data, p, s)) as ArrayRef;
11361136
let output = match limit {
1137-
Some(_) => sort_limit(&(Arc::new(output) as ArrayRef), options, limit).unwrap(),
1138-
_ => sort(&(Arc::new(output) as ArrayRef), options).unwrap(),
1137+
Some(_) => sort_limit(&output, options, limit).unwrap(),
1138+
_ => sort(&output, options).unwrap(),
11391139
};
11401140
assert_eq!(&output, &expected)
11411141
}
@@ -1149,8 +1149,8 @@ mod tests {
11491149
let output = create_decimal256_array(data);
11501150
let expected = Arc::new(create_decimal256_array(expected_data)) as ArrayRef;
11511151
let output = match limit {
1152-
Some(_) => sort_limit(&(Arc::new(output) as ArrayRef), options, limit).unwrap(),
1153-
_ => sort(&(Arc::new(output) as ArrayRef), options).unwrap(),
1152+
Some(_) => sort_limit(&output, options, limit).unwrap(),
1153+
_ => sort(&output, options).unwrap(),
11541154
};
11551155
assert_eq!(&output, &expected)
11561156
}
@@ -1163,7 +1163,7 @@ mod tests {
11631163
) {
11641164
let output = BooleanArray::from(data);
11651165
let expected = UInt32Array::from(expected_data);
1166-
let output = sort_to_indices(&(Arc::new(output) as ArrayRef), options, limit).unwrap();
1166+
let output = sort_to_indices(&output, options, limit).unwrap();
11671167
assert_eq!(output, expected)
11681168
}
11691169

@@ -1178,7 +1178,7 @@ mod tests {
11781178
{
11791179
let output = PrimitiveArray::<T>::from(data);
11801180
let expected = UInt32Array::from(expected_data);
1181-
let output = sort_to_indices(&(Arc::new(output) as ArrayRef), options, limit).unwrap();
1181+
let output = sort_to_indices(&output, options, limit).unwrap();
11821182
assert_eq!(output, expected)
11831183
}
11841184

@@ -1194,8 +1194,8 @@ mod tests {
11941194
let output = PrimitiveArray::<T>::from(data);
11951195
let expected = Arc::new(PrimitiveArray::<T>::from(expected_data)) as ArrayRef;
11961196
let output = match limit {
1197-
Some(_) => sort_limit(&(Arc::new(output) as ArrayRef), options, limit).unwrap(),
1198-
_ => sort(&(Arc::new(output) as ArrayRef), options).unwrap(),
1197+
Some(_) => sort_limit(&output, options, limit).unwrap(),
1198+
_ => sort(&output, options).unwrap(),
11991199
};
12001200
assert_eq!(&output, &expected)
12011201
}
@@ -1208,7 +1208,7 @@ mod tests {
12081208
) {
12091209
let output = StringArray::from(data);
12101210
let expected = UInt32Array::from(expected_data);
1211-
let output = sort_to_indices(&(Arc::new(output) as ArrayRef), options, limit).unwrap();
1211+
let output = sort_to_indices(&output, options, limit).unwrap();
12121212
assert_eq!(output, expected)
12131213
}
12141214

@@ -1222,24 +1222,24 @@ mod tests {
12221222
let output = StringArray::from(data.clone());
12231223
let expected = Arc::new(StringArray::from(expected_data.clone())) as ArrayRef;
12241224
let output = match limit {
1225-
Some(_) => sort_limit(&(Arc::new(output) as ArrayRef), options, limit).unwrap(),
1226-
_ => sort(&(Arc::new(output) as ArrayRef), options).unwrap(),
1225+
Some(_) => sort_limit(&output, options, limit).unwrap(),
1226+
_ => sort(&output, options).unwrap(),
12271227
};
12281228
assert_eq!(&output, &expected);
12291229

12301230
let output = LargeStringArray::from(data.clone());
12311231
let expected = Arc::new(LargeStringArray::from(expected_data.clone())) as ArrayRef;
12321232
let output = match limit {
1233-
Some(_) => sort_limit(&(Arc::new(output) as ArrayRef), options, limit).unwrap(),
1234-
_ => sort(&(Arc::new(output) as ArrayRef), options).unwrap(),
1233+
Some(_) => sort_limit(&output, options, limit).unwrap(),
1234+
_ => sort(&output, options).unwrap(),
12351235
};
12361236
assert_eq!(&output, &expected);
12371237

12381238
let output = StringViewArray::from(data);
12391239
let expected = Arc::new(StringViewArray::from(expected_data)) as ArrayRef;
12401240
let output = match limit {
1241-
Some(_) => sort_limit(&(Arc::new(output) as ArrayRef), options, limit).unwrap(),
1242-
_ => sort(&(Arc::new(output) as ArrayRef), options).unwrap(),
1241+
Some(_) => sort_limit(&output, options, limit).unwrap(),
1242+
_ => sort(&output, options).unwrap(),
12431243
};
12441244
assert_eq!(&output, &expected);
12451245
}
@@ -1258,8 +1258,8 @@ mod tests {
12581258
.expect("Unable to get dictionary values");
12591259

12601260
let sorted = match limit {
1261-
Some(_) => sort_limit(&(Arc::new(array) as ArrayRef), options, limit).unwrap(),
1262-
_ => sort(&(Arc::new(array) as ArrayRef), options).unwrap(),
1261+
Some(_) => sort_limit(&array, options, limit).unwrap(),
1262+
_ => sort(&array, options).unwrap(),
12631263
};
12641264
let sorted = sorted
12651265
.as_any()
@@ -1300,8 +1300,8 @@ mod tests {
13001300
let dict = array_values.as_primitive::<T>();
13011301

13021302
let sorted = match limit {
1303-
Some(_) => sort_limit(&(Arc::new(array) as ArrayRef), options, limit).unwrap(),
1304-
_ => sort(&(Arc::new(array) as ArrayRef), options).unwrap(),
1303+
Some(_) => sort_limit(&array, options, limit).unwrap(),
1304+
_ => sort(&array, options).unwrap(),
13051305
};
13061306
let sorted = sorted
13071307
.as_any()

‎arrow-select/src/concat.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -404,13 +404,13 @@ where
404404

405405
macro_rules! dict_helper {
406406
($t:ty, $arrays:expr) => {
407-
return Ok(Arc::new(concat_dictionaries::<$t>($arrays)?) as _)
407+
return concat_dictionaries::<$t>($arrays)
408408
};
409409
}
410410

411411
macro_rules! primitive_concat {
412412
($t:ty, $arrays:expr) => {
413-
return Ok(Arc::new(concat_primitives::<$t>($arrays)?) as _)
413+
return concat_primitives::<$t>($arrays)
414414
};
415415
}
416416

‎arrow-select/src/interleave.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ macro_rules! primitive_helper {
3737

3838
macro_rules! dict_helper {
3939
($t:ty, $values:expr, $indices:expr) => {
40-
Ok(Arc::new(interleave_dictionaries::<$t>($values, $indices)?) as _)
40+
interleave_dictionaries::<$t>($values, $indices)
4141
};
4242
}
4343

‎arrow/tests/array_cast.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ fn get_all_types() -> Vec<DataType> {
592592
fn test_timestamp_cast_utf8() {
593593
let array: PrimitiveArray<TimestampMicrosecondType> =
594594
vec![Some(37800000000), None, Some(86339000000)].into();
595-
let out = cast(&(Arc::new(array) as ArrayRef), &DataType::Utf8).unwrap();
595+
let out = cast(&array, &DataType::Utf8).unwrap();
596596

597597
let expected = StringArray::from(vec![
598598
Some("1970-01-01T10:30:00"),
@@ -608,7 +608,7 @@ fn test_timestamp_cast_utf8() {
608608
let array: PrimitiveArray<TimestampMicrosecondType> =
609609
vec![Some(37800000000), None, Some(86339000000)].into();
610610
let array = array.with_timezone("Australia/Sydney".to_string());
611-
let out = cast(&(Arc::new(array) as ArrayRef), &DataType::Utf8).unwrap();
611+
let out = cast(&array, &DataType::Utf8).unwrap();
612612

613613
let expected = StringArray::from(vec![
614614
Some("1970-01-01T20:30:00+10:00"),

‎parquet-variant-compute/src/variant_get.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ fn shredded_get_path(
180180
ShreddedPathStep::Missing => {
181181
let num_rows = input.len();
182182
let arr = match as_field.map(|f| f.data_type()) {
183-
Some(data_type) => Arc::new(array::new_null_array(data_type, num_rows)) as _,
183+
Some(data_type) => array::new_null_array(data_type, num_rows),
184184
None => Arc::new(array::NullArray::new(num_rows)) as _,
185185
};
186186
return Ok(arr);

‎parquet-variant-compute/src/variant_to_arrow.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,10 @@ macro_rules! define_variant_to_primitive_builder {
636636
// This is mainly for `FakeNullBuilder`
637637
#[allow(unused_mut)]
638638
fn finish(mut self) -> Result<ArrayRef> {
639-
Ok(Arc::new(self.builder.finish()))
639+
// If the builder produces T: Array, the compiler infers `<Arc<T> as From<T>>::from`
640+
// (which then coerces to ArrayRef). If the builder produces ArrayRef directly, the
641+
// compiler infers `<ArrayRef as From<ArrayRef>>::from` (no-op, From blanket impl).
642+
Ok(Arc::from(self.builder.finish()))
640643
}
641644
}
642645
}

0 commit comments

Comments
 (0)