Skip to content

Commit 6895106

Browse files
committed
Update references to use build
1 parent f5b0391 commit 6895106

File tree

35 files changed

+126
-126
lines changed

35 files changed

+126
-126
lines changed

arrow-arith/src/arity.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ where
228228
.zip(b.values())
229229
.for_each(|(l, r)| *l = op(*l, *r));
230230

231-
let array = builder.finish();
231+
let array = builder.build();
232232

233233
// The builder has the null buffer from `a`, it is not changed.
234234
let nulls = NullBuffer::union(array.logical_nulls().as_ref(), b.logical_nulls().as_ref());
@@ -345,7 +345,7 @@ where
345345
if let Err(err) = r {
346346
return Ok(Err(err));
347347
}
348-
let array_builder = builder.finish().into_data().into_builder();
348+
let array_builder = builder.build().into_data().into_builder();
349349
let array_data = unsafe { array_builder.nulls(Some(nulls)).build_unchecked() };
350350
Ok(Ok(PrimitiveArray::<T>::from(array_data)))
351351
}
@@ -411,7 +411,7 @@ where
411411
};
412412
};
413413
}
414-
Ok(Ok(builder.finish()))
414+
Ok(Ok(builder.build()))
415415
}
416416

417417
#[cfg(test)]

arrow-array/benches/decimal_overflow.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ fn criterion_benchmark(c: &mut Criterion) {
3333
builder_256.append_value(i256::from_i128(i as i128));
3434
}
3535
}
36-
let array_128 = builder_128.finish();
37-
let array_256 = builder_256.finish();
36+
let array_128 = builder_128.build();
37+
let array_256 = builder_256.build();
3838

3939
c.bench_function("validate_decimal_precision_128", |b| {
4040
b.iter(|| hint::black_box(array_128.validate_decimal_precision(8)));

arrow-array/src/array/dictionary_array.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -507,11 +507,11 @@ impl<K: ArrowDictionaryKeyType> DictionaryArray<K> {
507507
(Ok(key_builder), Ok(value_builder)) => Ok(unsafe {
508508
PrimitiveDictionaryBuilder::new_from_builders(key_builder, value_builder)
509509
}),
510-
(Err(key_array), Ok(mut value_builder)) => {
511-
Err(Self::try_new(key_array, Arc::new(value_builder.finish())).unwrap())
510+
(Err(key_array), Ok(value_builder)) => {
511+
Err(Self::try_new(key_array, Arc::new(value_builder.build())).unwrap())
512512
}
513-
(Ok(mut key_builder), Err(value_array)) => {
514-
Err(Self::try_new(key_builder.finish(), Arc::new(value_array)).unwrap())
513+
(Ok(key_builder), Err(value_array)) => {
514+
Err(Self::try_new(key_builder.build(), Arc::new(value_array)).unwrap())
515515
}
516516
(Err(key_array), Err(value_array)) => {
517517
Err(Self::try_new(key_array, Arc::new(value_array)).unwrap())

arrow-array/src/array/primitive_array.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@ impl<T: ArrowPrimitiveType> PrimitiveArray<T> {
957957
.values_slice_mut()
958958
.iter_mut()
959959
.for_each(|v| *v = op(*v));
960-
Ok(builder.finish())
960+
Ok(builder.build())
961961
}
962962

963963
/// Applies a unary fallible function to all valid values in a primitive
@@ -1033,7 +1033,7 @@ impl<T: ArrowPrimitiveType> PrimitiveArray<T> {
10331033
return Ok(Err(err));
10341034
}
10351035

1036-
Ok(Ok(builder.finish()))
1036+
Ok(Ok(builder.build()))
10371037
}
10381038

10391039
/// Applies a unary and nullable function to all valid values in a primitive array
@@ -2105,7 +2105,7 @@ mod tests {
21052105
builder.append_slice(&[0, 1]);
21062106
builder.append_null();
21072107
builder.append_slice(&[3, 4]);
2108-
let arr = builder.finish();
2108+
let arr = builder.build();
21092109
assert_eq!(
21102110
"PrimitiveArray<Int32>\n[\n 0,\n 1,\n null,\n 3,\n 4,\n]",
21112111
format!("{arr:?}")
@@ -2451,7 +2451,7 @@ mod tests {
24512451
let mut decimal_builder = Decimal128Builder::with_capacity(10);
24522452
decimal_builder.append_value(123456);
24532453
decimal_builder.append_value(12345);
2454-
let result = decimal_builder.finish().with_precision_and_scale(5, 3);
2454+
let result = decimal_builder.build().with_precision_and_scale(5, 3);
24552455
assert!(result.is_ok());
24562456
let arr = result.unwrap();
24572457
assert_eq!("12.345", arr.value_as_string(1));
@@ -2469,7 +2469,7 @@ mod tests {
24692469
decimal_builder.append_value(99);
24702470
decimal_builder.append_value(-100);
24712471
decimal_builder.append_value(-99);
2472-
let result = decimal_builder.finish().with_precision_and_scale(2, 1);
2472+
let result = decimal_builder.build().with_precision_and_scale(2, 1);
24732473
assert!(result.is_ok());
24742474
let arr = result.unwrap();
24752475
assert_eq!("9.9", arr.value_as_string(1));
@@ -2626,7 +2626,7 @@ mod tests {
26262626
let decimal2 = i256::from_i128(56789);
26272627
builder.append_value(decimal2);
26282628

2629-
let array: Decimal256Array = builder.finish().with_precision_and_scale(76, 6).unwrap();
2629+
let array: Decimal256Array = builder.build().with_precision_and_scale(76, 6).unwrap();
26302630

26312631
let collected: Vec<_> = array.iter().collect();
26322632
assert_eq!(vec![Some(decimal1), None, Some(decimal2)], collected);
@@ -2673,7 +2673,7 @@ mod tests {
26732673
let decimal2 = 56789;
26742674
builder.append_value(decimal2);
26752675

2676-
let array: Decimal64Array = builder.finish().with_precision_and_scale(18, 4).unwrap();
2676+
let array: Decimal64Array = builder.build().with_precision_and_scale(18, 4).unwrap();
26772677

26782678
let collected: Vec<_> = array.iter().collect();
26792679
assert_eq!(vec![Some(decimal1), None, Some(decimal2)], collected);
@@ -2707,7 +2707,7 @@ mod tests {
27072707
let decimal2 = 56789;
27082708
builder.append_value(decimal2);
27092709

2710-
let array: Decimal32Array = builder.finish().with_precision_and_scale(9, 2).unwrap();
2710+
let array: Decimal32Array = builder.build().with_precision_and_scale(9, 2).unwrap();
27112711

27122712
let collected: Vec<_> = array.iter().collect();
27132713
assert_eq!(vec![Some(decimal1), None, Some(decimal2)], collected);
@@ -2771,7 +2771,7 @@ mod tests {
27712771

27722772
let expected: Int32Array = vec![Some(4), Some(2), Some(1)].into_iter().collect();
27732773

2774-
let new_array = builder.finish();
2774+
let new_array = builder.build();
27752775
assert_eq!(expected, new_array);
27762776
}
27772777

arrow-array/src/builder/buffer_builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ mod tests {
219219
a.append_values(values, is_valid);
220220

221221
assert_eq!(a.len(), 7);
222-
let array = a.finish();
222+
let array = a.build();
223223
assert_eq!(array.value(0), 1);
224224
assert!(array.is_null(1));
225225
assert_eq!(array.value(2), -2);

arrow-array/src/builder/fixed_size_binary_dictionary_builder.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ where
128128
/// assert_eq!(keys, &UInt16Array::from_iter(0..256));
129129
/// ```
130130
pub fn try_new_from_builder<K2>(
131-
mut source: FixedSizeBinaryDictionaryBuilder<K2>,
131+
source: FixedSizeBinaryDictionaryBuilder<K2>,
132132
) -> Result<Self, ArrowError>
133133
where
134134
K::Native: NumCast,
@@ -140,7 +140,7 @@ where
140140
let values_builder = source.values_builder;
141141
let byte_width = source.byte_width;
142142

143-
let source_keys = source.keys_builder.finish();
143+
let source_keys = source.keys_builder.build();
144144
let new_keys: PrimitiveArray<K> = source_keys.try_unary(|value| {
145145
num_traits::cast::cast::<K2::Native, K::Native>(value).ok_or_else(|| {
146146
ArrowError::CastError(format!(
@@ -561,7 +561,7 @@ mod tests {
561561
.append_value(<<K2 as ArrowPrimitiveType>::Native as From<u8>>::from(1u8));
562562
expected_keys_builder
563563
.append_value(<<K2 as ArrowPrimitiveType>::Native as From<u8>>::from(2u8));
564-
let expected_keys = expected_keys_builder.finish();
564+
let expected_keys = expected_keys_builder.build();
565565
assert_eq!(array.keys(), &expected_keys);
566566

567567
let av = array.values();

arrow-array/src/builder/generic_bytes_dictionary_builder.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ where
184184
/// assert_eq!(keys, &UInt16Array::from_iter(0..256));
185185
/// ```
186186
pub fn try_new_from_builder<K2>(
187-
mut source: GenericByteDictionaryBuilder<K2, T>,
187+
source: GenericByteDictionaryBuilder<K2, T>,
188188
) -> Result<Self, ArrowError>
189189
where
190190
K::Native: NumCast,
@@ -195,7 +195,7 @@ where
195195
let dedup = source.dedup;
196196
let values_builder = source.values_builder;
197197

198-
let source_keys = source.keys_builder.finish();
198+
let source_keys = source.keys_builder.build();
199199
let new_keys: PrimitiveArray<K> = source_keys.try_unary(|value| {
200200
num_traits::cast::cast::<K2::Native, K::Native>(value).ok_or_else(|| {
201201
ArrowError::CastError(format!(
@@ -741,7 +741,7 @@ mod tests {
741741
expected_keys_builder.append_null();
742742
expected_keys_builder
743743
.append_value(<<K2 as ArrowPrimitiveType>::Native as From<u8>>::from(2u8));
744-
let expected_keys = expected_keys_builder.finish();
744+
let expected_keys = expected_keys_builder.build();
745745
assert_eq!(array.keys(), &expected_keys);
746746

747747
let av = array.values();
@@ -975,7 +975,7 @@ mod tests {
975975
keys_builder.append_value(1);
976976

977977
let values = values_builder.finish();
978-
let keys = keys_builder.finish();
978+
let keys = keys_builder.build();
979979

980980
let data_type = DataType::Dictionary(
981981
Box::new(Int32Type::DATA_TYPE),

arrow-array/src/builder/primitive_builder.rs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ mod tests {
436436
for i in 0..5 {
437437
builder.append_value(i);
438438
}
439-
let arr = builder.finish();
439+
let arr = builder.build();
440440
assert_eq!(5, arr.len());
441441
assert_eq!(0, arr.offset());
442442
assert_eq!(0, arr.null_count());
@@ -451,7 +451,7 @@ mod tests {
451451
fn test_primitive_array_builder_i32_append_iter() {
452452
let mut builder = Int32Array::builder(5);
453453
unsafe { builder.append_trusted_len_iter(0..5) };
454-
let arr = builder.finish();
454+
let arr = builder.build();
455455
assert_eq!(5, arr.len());
456456
assert_eq!(0, arr.offset());
457457
assert_eq!(0, arr.null_count());
@@ -466,7 +466,7 @@ mod tests {
466466
fn test_primitive_array_builder_i32_append_nulls() {
467467
let mut builder = Int32Array::builder(5);
468468
builder.append_nulls(5);
469-
let arr = builder.finish();
469+
let arr = builder.build();
470470
assert_eq!(5, arr.len());
471471
assert_eq!(0, arr.offset());
472472
assert_eq!(5, arr.null_count());
@@ -482,7 +482,7 @@ mod tests {
482482
for i in 0..5 {
483483
builder.append_value(i);
484484
}
485-
let arr = builder.finish();
485+
let arr = builder.build();
486486
assert_eq!(5, arr.len());
487487
assert_eq!(0, arr.offset());
488488
assert_eq!(0, arr.null_count());
@@ -499,7 +499,7 @@ mod tests {
499499
for i in 0..5 {
500500
builder.append_value(i);
501501
}
502-
let arr = builder.finish();
502+
let arr = builder.build();
503503
assert_eq!(5, arr.len());
504504
assert_eq!(0, arr.offset());
505505
assert_eq!(0, arr.null_count());
@@ -545,7 +545,7 @@ mod tests {
545545
builder.append_option(Some(2));
546546
builder.append_option(None);
547547
builder.append_option(Some(4));
548-
let arr2 = builder.finish();
548+
let arr2 = builder.build();
549549

550550
assert_eq!(arr1.len(), arr2.len());
551551
assert_eq!(arr1.offset(), arr2.offset());
@@ -569,7 +569,7 @@ mod tests {
569569
builder.append_null();
570570
builder.append_null();
571571
builder.append_value(4);
572-
let arr2 = builder.finish();
572+
let arr2 = builder.build();
573573

574574
assert_eq!(arr1.len(), arr2.len());
575575
assert_eq!(arr1.offset(), arr2.offset());
@@ -592,7 +592,7 @@ mod tests {
592592
builder.append_null();
593593
builder.append_null();
594594
builder.append_value(4);
595-
let arr2 = builder.finish();
595+
let arr2 = builder.build();
596596

597597
assert_eq!(arr1.len(), arr2.len());
598598
assert_eq!(arr1.offset(), arr2.offset());
@@ -646,14 +646,14 @@ mod tests {
646646
fn test_primitive_array_builder_with_data_type() {
647647
let mut builder = Decimal128Builder::new().with_data_type(DataType::Decimal128(1, 2));
648648
builder.append_value(1);
649-
let array = builder.finish();
649+
let array = builder.build();
650650
assert_eq!(array.precision(), 1);
651651
assert_eq!(array.scale(), 2);
652652

653653
let data_type = DataType::Timestamp(TimeUnit::Nanosecond, Some("+00:00".into()));
654654
let mut builder = TimestampNanosecondBuilder::new().with_data_type(data_type.clone());
655655
builder.append_value(1);
656-
let array = builder.finish();
656+
let array = builder.build();
657657
assert_eq!(array.data_type(), &data_type);
658658
}
659659

@@ -682,7 +682,7 @@ mod tests {
682682
let mut builder = PrimitiveBuilder::<Int16Type>::new();
683683
builder.extend([1, 2, 3, 5, 2, 4, 4].into_iter().map(Some));
684684
builder.extend([2, 4, 6, 2].into_iter().map(Some));
685-
let array = builder.finish();
685+
let array = builder.build();
686686
assert_eq!(array.values(), &[1, 2, 3, 5, 2, 4, 4, 2, 4, 6, 2]);
687687
}
688688

@@ -711,7 +711,7 @@ mod tests {
711711
builder.append_array(&arr1);
712712
builder.append_array(&arr2);
713713
builder.append_array(&arr3);
714-
let actual = builder.finish();
714+
let actual = builder.build();
715715
let expected = Int32Array::from(input);
716716

717717
assert_eq!(actual, expected);
@@ -726,7 +726,7 @@ mod tests {
726726

727727
let mut builder = Int32Array::builder(5);
728728
builder.append_array(&array);
729-
let actual = builder.finish();
729+
let actual = builder.build();
730730

731731
assert_eq!(actual, array);
732732
assert_eq!(actual.values(), array.values())
@@ -738,7 +738,7 @@ mod tests {
738738
let array = {
739739
let mut builder = Decimal128Builder::new().with_data_type(DataType::Decimal128(1, 2));
740740
builder.append_value(1);
741-
builder.finish()
741+
builder.build()
742742
};
743743

744744
let mut builder = Decimal128Builder::new().with_data_type(DataType::Decimal128(2, 3));

arrow-array/src/builder/primitive_dictionary_builder.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ where
198198
///
199199
/// assert_eq!(keys, &UInt16Array::from_iter(0..256));
200200
pub fn try_new_from_builder<K2>(
201-
mut source: PrimitiveDictionaryBuilder<K2, V>,
201+
source: PrimitiveDictionaryBuilder<K2, V>,
202202
) -> Result<Self, ArrowError>
203203
where
204204
K::Native: NumCast,
@@ -208,7 +208,7 @@ where
208208
let map = source.map;
209209
let values_builder = source.values_builder;
210210

211-
let source_keys = source.keys_builder.finish();
211+
let source_keys = source.keys_builder.build();
212212
let new_keys: PrimitiveArray<K> = source_keys.try_unary(|value| {
213213
num_traits::cast::cast::<K2::Native, K::Native>(value).ok_or_else(|| {
214214
ArrowError::CastError(format!(
@@ -669,8 +669,8 @@ mod tests {
669669
values_builder.append_value(42);
670670
keys_builder.append_value(1);
671671

672-
let values = values_builder.finish();
673-
let keys = keys_builder.finish();
672+
let values = values_builder.build();
673+
let keys = keys_builder.build();
674674

675675
let data_type = DataType::Dictionary(
676676
Box::new(Int32Type::DATA_TYPE),
@@ -774,7 +774,7 @@ mod tests {
774774
.append_value(<<K2 as ArrowPrimitiveType>::Native as From<u8>>::from(1u8));
775775
expected_keys_builder
776776
.append_value(<<K2 as ArrowPrimitiveType>::Native as From<u8>>::from(2u8));
777-
let expected_keys = expected_keys_builder.finish();
777+
let expected_keys = expected_keys_builder.build();
778778
assert_eq!(array.keys(), &expected_keys);
779779

780780
let av = array.values();

arrow-array/src/builder/primitive_run_builder.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,8 @@ where
204204
let mut run_end_builder = run_ends_array.into_builder().unwrap();
205205
let mut values_builder = values_array.into_builder().unwrap();
206206
self.append_run_end_with_builders(&mut run_end_builder, &mut values_builder);
207-
run_ends_array = run_end_builder.finish();
208-
values_array = values_builder.finish();
207+
run_ends_array = run_end_builder.build();
208+
values_array = values_builder.build();
209209
}
210210

211211
RunArray::try_new(&run_ends_array, &values_array).unwrap()

0 commit comments

Comments
 (0)