Skip to content

Commit 76fd71a

Browse files
connortsui20connortsui20
committed
Use explicit decimal constructor names
Signed-off-by: Connor Tsui <connor.tsui20@gmail.com>
1 parent 3fed3dd commit 76fd71a

51 files changed

Lines changed: 263 additions & 212 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎encodings/decimal-byte-parts/src/decimal_byte_parts/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ fn to_canonical_decimal(
285285
// SAFETY: The primitive array's buffer is already validated with correct type.
286286
// The decimal dtype matches the array's dtype, and validity is preserved.
287287
unsafe {
288-
DecimalArray::new_unchecked(
288+
DecimalArray::new_decimal_unchecked(
289289
prim.to_buffer::<P>(),
290290
*array
291291
.dtype()

‎encodings/sparse/src/canonical.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ fn execute_sparse_decimal<D: NativeDecimalType>(
535535
}
536536
}
537537
let filled_array = builder.finish_into_decimal();
538-
Ok(filled_array.patch(patches, ctx)?.into_array())
538+
Ok(filled_array.patch_decimal(patches, ctx)?.into_array())
539539
}
540540

541541
fn execute_varbin(
@@ -856,7 +856,7 @@ mod test {
856856
let mut ctx = SESSION.create_execution_ctx();
857857
let indices = buffer![0u32, 1u32, 7u32, 8u32].into_array();
858858
let decimal_dtype = DecimalDType::new(3, 2);
859-
let patch_values = DecimalArray::new(
859+
let patch_values = DecimalArray::new_decimal(
860860
buffer![100i128, 200i128, 300i128, 4000i128],
861861
decimal_dtype,
862862
Validity::from_iter([true, true, true, false]),
@@ -869,7 +869,7 @@ mod test {
869869
let expected = SESSION
870870
.arrow()
871871
.execute_arrow(
872-
DecimalArray::new(
872+
DecimalArray::new_decimal(
873873
buffer![100i128, 200, 123, 123, 123, 123, 123, 300, 4000, 123],
874874
decimal_dtype,
875875
// NB: patch indices: [0, 1, 7, 8]; patch validity: [Valid, Valid, Valid, Invalid]; ergo 0, 1, 7 are valid.

‎fuzz/src/array/fill_null.rs‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ fn fill_decimal_array(
162162
.validity()
163163
.vortex_expect("decimal validity should be derivable in fuzz baseline")
164164
{
165-
Validity::NonNullable | Validity::AllValid => DecimalArray::new(
165+
Validity::NonNullable | Validity::AllValid => DecimalArray::new_decimal(
166166
array.buffer::<D>(),
167167
decimal_dtype,
168168
result_nullability.into(),
@@ -187,9 +187,13 @@ fn fill_decimal_array(
187187
}
188188
}
189189

190-
DecimalArray::try_new(new_data.freeze(), decimal_dtype, result_nullability.into())
191-
.vortex_expect("DecimalArray creation should succeed in fuzz test")
192-
.into_array()
190+
DecimalArray::try_new_decimal(
191+
new_data.freeze(),
192+
decimal_dtype,
193+
result_nullability.into(),
194+
)
195+
.vortex_expect("DecimalArray creation should succeed in fuzz test")
196+
.into_array()
193197
}
194198
}
195199
})
@@ -413,7 +417,7 @@ mod tests {
413417
#[test]
414418
fn test_fill_null_decimal_i32() {
415419
let mut ctx = array_session().create_execution_ctx();
416-
let array = DecimalArray::from_option_iter(
420+
let array = DecimalArray::from_decimal_option_iter(
417421
[Some(100i32), None, Some(300i32), None, Some(500i32)],
418422
DecimalDType::new(10, 2),
419423
);
@@ -425,7 +429,7 @@ mod tests {
425429

426430
let result = fill_null_canonical_array(canonical(array), &fill_value, &mut ctx).unwrap();
427431

428-
let expected = DecimalArray::from_iter(
432+
let expected = DecimalArray::from_decimal_iter(
429433
[100i32, 999i32, 300i32, 999i32, 500i32],
430434
DecimalDType::new(10, 2),
431435
);
@@ -435,7 +439,7 @@ mod tests {
435439
#[test]
436440
fn test_fill_null_decimal_i64() {
437441
let mut ctx = array_session().create_execution_ctx();
438-
let array = DecimalArray::from_option_iter(
442+
let array = DecimalArray::from_decimal_option_iter(
439443
[Some(1000i64), None, Some(3000i64)],
440444
DecimalDType::new(15, 3),
441445
);
@@ -448,14 +452,14 @@ mod tests {
448452
let result = fill_null_canonical_array(canonical(array), &fill_value, &mut ctx).unwrap();
449453

450454
let expected =
451-
DecimalArray::from_iter([1000i64, 9999i64, 3000i64], DecimalDType::new(15, 3));
455+
DecimalArray::from_decimal_iter([1000i64, 9999i64, 3000i64], DecimalDType::new(15, 3));
452456
assert_arrays_eq!(expected, result, &mut ctx);
453457
}
454458

455459
#[test]
456460
fn test_fill_null_decimal_i128() {
457461
let mut ctx = array_session().create_execution_ctx();
458-
let array = DecimalArray::from_option_iter(
462+
let array = DecimalArray::from_decimal_option_iter(
459463
[Some(10000i128), None, Some(30000i128), None],
460464
DecimalDType::new(20, 4),
461465
);
@@ -467,7 +471,7 @@ mod tests {
467471

468472
let result = fill_null_canonical_array(canonical(array), &fill_value, &mut ctx).unwrap();
469473

470-
let expected = DecimalArray::from_iter(
474+
let expected = DecimalArray::from_decimal_iter(
471475
[10000i128, 99999i128, 30000i128, 99999i128],
472476
DecimalDType::new(20, 4),
473477
);
@@ -477,8 +481,10 @@ mod tests {
477481
#[test]
478482
fn test_fill_null_decimal_all_invalid() {
479483
let mut ctx = array_session().create_execution_ctx();
480-
let array =
481-
DecimalArray::from_option_iter([None::<i64>, None, None], DecimalDType::new(10, 2));
484+
let array = DecimalArray::from_decimal_option_iter(
485+
[None::<i64>, None, None],
486+
DecimalDType::new(10, 2),
487+
);
482488
let fill_value = Scalar::decimal(
483489
DecimalValue::I64(777i64),
484490
DecimalDType::new(10, 2),
@@ -487,7 +493,7 @@ mod tests {
487493

488494
let result = fill_null_canonical_array(canonical(array), &fill_value, &mut ctx).unwrap();
489495

490-
let expected = DecimalArray::from_option_iter(
496+
let expected = DecimalArray::from_decimal_option_iter(
491497
[Some(777i64), Some(777i64), Some(777i64)],
492498
DecimalDType::new(10, 2),
493499
)
@@ -500,7 +506,7 @@ mod tests {
500506
#[test]
501507
fn test_fill_null_decimal_no_nulls() {
502508
let mut ctx = array_session().create_execution_ctx();
503-
let array = DecimalArray::from_option_iter(
509+
let array = DecimalArray::from_decimal_option_iter(
504510
[Some(100i32), Some(200i32), Some(300i32)],
505511
DecimalDType::new(10, 2),
506512
);
@@ -512,7 +518,7 @@ mod tests {
512518

513519
let result = fill_null_canonical_array(canonical(array), &fill_value, &mut ctx).unwrap();
514520

515-
let expected = DecimalArray::from_option_iter(
521+
let expected = DecimalArray::from_decimal_option_iter(
516522
[Some(100i32), Some(200i32), Some(300i32)],
517523
DecimalDType::new(10, 2),
518524
)

‎fuzz/src/array/filter.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ pub fn filter_canonical_array(
7474
let decimal_array = array.clone().execute::<DecimalArray>(ctx)?;
7575
match_each_decimal_value_type!(decimal_array.values_type(), |D| {
7676
let buf = decimal_array.buffer::<D>();
77-
Ok(DecimalArray::new(
77+
Ok(DecimalArray::new_decimal(
7878
filter
7979
.iter()
8080
.zip(buf.as_slice().iter().copied())

‎fuzz/src/array/mask.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,16 +236,18 @@ mod tests {
236236
fn test_mask_decimal_array() {
237237
let mut ctx = array_session().create_execution_ctx();
238238
let dtype = DecimalDType::new(10, 2);
239-
let array = DecimalArray::from_option_iter(
239+
let array = DecimalArray::from_decimal_option_iter(
240240
[Some(1i128), Some(2), Some(3), Some(4), Some(5)],
241241
dtype,
242242
);
243243
let mask = Mask::from_iter([true, true, false, true, true]);
244244

245245
let result = mask_canonical_array(canonical(array, &mut ctx), &mask, &mut ctx).unwrap();
246246

247-
let expected =
248-
DecimalArray::from_option_iter([Some(1i128), Some(2), None, Some(4), Some(5)], dtype);
247+
let expected = DecimalArray::from_decimal_option_iter(
248+
[Some(1i128), Some(2), None, Some(4), Some(5)],
249+
dtype,
250+
);
249251
assert_arrays_eq!(result, expected, &mut ctx);
250252
}
251253

‎fuzz/src/array/slice.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ pub fn slice_canonical_array(
5757
let decimal_array = array.clone().execute::<DecimalArray>(ctx)?;
5858
Ok(
5959
match_each_decimal_value_type!(decimal_array.values_type(), |D| {
60-
DecimalArray::new(
60+
DecimalArray::new_decimal(
6161
decimal_array.buffer::<D>().slice(start..stop),
6262
*decimal_dtype,
6363
validity,

‎fuzz/src/array/sort.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ pub fn sort_canonical_array(array: &ArrayRef, ctx: &mut ExecutionCtx) -> VortexR
8080
.map(|(p, v)| v.then_some(p))
8181
.collect::<Vec<_>>();
8282
opt_values.sort();
83-
Ok(DecimalArray::from_option_iter(opt_values, *d).into_array())
83+
Ok(DecimalArray::from_decimal_option_iter(opt_values, *d).into_array())
8484
})
8585
}
8686
DType::Utf8(_) | DType::Binary(_) => {

‎fuzz/src/array/take.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ fn take_decimal<D: NativeDecimalType>(
178178
) -> ArrayRef {
179179
let buf = array.buffer::<D>();
180180
let vec_values = buf.as_slice();
181-
DecimalArray::new(
181+
DecimalArray::new_decimal(
182182
indices
183183
.iter()
184184
.map(|i| vec_values[*i])

‎vortex-array/benches/cast_decimal.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ fn decimal_array(n: usize, precision: u8, scale: i8, nullable: bool) -> ArrayRef
4949
} else {
5050
Validity::NonNullable
5151
};
52-
DecimalArray::new(
52+
DecimalArray::new_decimal(
5353
values.freeze(),
5454
DecimalDType::new(precision, scale),
5555
validity,

‎vortex-array/benches/compare.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ fn string_array(rng: &mut StdRng) -> ArrayRef {
9898
}
9999

100100
fn decimal_array(rng: &mut StdRng) -> ArrayRef {
101-
DecimalArray::from_iter::<i128, _>(
101+
DecimalArray::from_decimal_iter::<i128, _>(
102102
(0..ARRAY_SIZE).map(|_| rng.random_range(0i128..100_000_000)),
103103
DecimalDType::new(38, 2),
104104
)

0 commit comments

Comments
 (0)