Skip to content

Commit 28bd6bb

Browse files
friendlymatthewfriendlymatthew
committed
Rename API
1 parent 7144a08 commit 28bd6bb

File tree

3 files changed

+48
-45
lines changed

3 files changed

+48
-45
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ impl<'a> VariantToShreddedObjectVariantRowBuilder<'a> {
309309
let (value, typed_value, nulls) = typed_value_builder.finish()?;
310310
let array =
311311
ShreddedVariantFieldArray::from_parts(Some(value), Some(typed_value), nulls);
312-
builder = builder.with_column(field_name, ArrayRef::from(array), false);
312+
builder = builder.with_column_name(field_name, ArrayRef::from(array), false);
313313
}
314314
if let Some(nulls) = self.typed_value_nulls.finish() {
315315
builder = builder.with_nulls(nulls);

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -288,10 +288,13 @@ impl VariantArray {
288288
typed_value: Option<ArrayRef>,
289289
nulls: Option<NullBuffer>,
290290
) -> Self {
291-
let mut builder =
292-
StructArrayBuilder::new().with_column("metadata", Arc::new(metadata.clone()), false);
291+
let mut builder = StructArrayBuilder::new().with_column_name(
292+
"metadata",
293+
Arc::new(metadata.clone()),
294+
false,
295+
);
293296
if let Some(value) = value.clone() {
294-
builder = builder.with_column("value", Arc::new(value), true);
297+
builder = builder.with_column_name("value", Arc::new(value), true);
295298
}
296299

297300
let typed_value = if let Some(typed_value_array) = typed_value.clone() {
@@ -654,7 +657,7 @@ impl ShreddedVariantFieldArray {
654657
) -> Self {
655658
let mut builder = StructArrayBuilder::new();
656659
if let Some(value) = value.clone() {
657-
builder = builder.with_column("value", Arc::new(value), true);
660+
builder = builder.with_column_name("value", Arc::new(value), true);
658661
}
659662

660663
let typed_value = if let Some(typed_value_array) = typed_value.clone() {
@@ -937,7 +940,7 @@ impl StructArrayBuilder {
937940
}
938941

939942
/// Add an array to this struct array as a field with the specified name.
940-
pub fn with_column(mut self, field_name: &str, array: ArrayRef, nullable: bool) -> Self {
943+
pub fn with_column_name(mut self, field_name: &str, array: ArrayRef, nullable: bool) -> Self {
941944
let field = Field::new(field_name, array.data_type().clone(), nullable);
942945
self.fields.push(Arc::new(field));
943946
self.arrays.push(array);

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

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,7 +1285,7 @@ mod test {
12851285
BinaryViewArray::from_iter_values(std::iter::repeat_n(EMPTY_VARIANT_METADATA_BYTES, 3));
12861286

12871287
let struct_array = StructArrayBuilder::new()
1288-
.with_column("metadata", Arc::new(metadata), false)
1288+
.with_column_name("metadata", Arc::new(metadata), false)
12891289
.with_nulls(nulls)
12901290
.build();
12911291

@@ -1375,7 +1375,7 @@ mod test {
13751375

13761376
// For perfect shredding of the x field, no "value" column, only typed_value
13771377
let x_field_struct = StructArrayBuilder::new()
1378-
.with_column("typed_value", Arc::new(x_field_typed_value), true)
1378+
.with_column_name("typed_value", Arc::new(x_field_typed_value), true)
13791379
.build();
13801380

13811381
// Wrap the x field struct in a ShreddedVariantFieldArray
@@ -1397,9 +1397,9 @@ mod test {
13971397

13981398
// Create the main VariantArray
13991399
let main_struct = StructArrayBuilder::new()
1400-
.with_column("metadata", Arc::new(metadata_array), false)
1401-
.with_column("value", Arc::new(value_array), true)
1402-
.with_column("typed_value", Arc::new(typed_value_struct), true)
1400+
.with_column_name("metadata", Arc::new(metadata_array), false)
1401+
.with_column_name("value", Arc::new(value_array), true)
1402+
.with_column_name("typed_value", Arc::new(typed_value_struct), true)
14031403
.build();
14041404

14051405
Arc::new(main_struct)
@@ -1755,7 +1755,7 @@ mod test {
17551755

17561756
// For the x field, only typed_value (perfect shredding when possible)
17571757
let x_field_struct = StructArrayBuilder::new()
1758-
.with_column("typed_value", Arc::new(x_field_typed_value), true)
1758+
.with_column_name("typed_value", Arc::new(x_field_typed_value), true)
17591759
.build();
17601760

17611761
let x_field_shredded = ShreddedVariantFieldArray::try_new(&x_field_struct)
@@ -1776,9 +1776,9 @@ mod test {
17761776

17771777
// Build final VariantArray
17781778
let struct_array = StructArrayBuilder::new()
1779-
.with_column("metadata", Arc::new(metadata_array), false)
1780-
.with_column("value", Arc::new(value_array), true)
1781-
.with_column("typed_value", Arc::new(typed_value_struct), true)
1779+
.with_column_name("metadata", Arc::new(metadata_array), false)
1780+
.with_column_name("value", Arc::new(value_array), true)
1781+
.with_column_name("typed_value", Arc::new(typed_value_struct), true)
17821782
.build();
17831783

17841784
Arc::new(struct_array)
@@ -1837,7 +1837,7 @@ mod test {
18371837
// Level 2: x field (the deepest level)
18381838
let x_typed_value = Int32Array::from(vec![Some(55), None]);
18391839
let x_field_struct = StructArrayBuilder::new()
1840-
.with_column("typed_value", Arc::new(x_typed_value), true)
1840+
.with_column_name("typed_value", Arc::new(x_typed_value), true)
18411841
.build();
18421842
let x_field_shredded = ShreddedVariantFieldArray::try_new(&x_field_struct)
18431843
.expect("should create ShreddedVariantFieldArray for x");
@@ -1864,7 +1864,7 @@ mod test {
18641864
true,
18651865
)]);
18661866
let a_inner_struct = StructArrayBuilder::new()
1867-
.with_column(
1867+
.with_column_name(
18681868
"typed_value",
18691869
Arc::new(
18701870
StructArray::try_new(
@@ -1876,7 +1876,7 @@ mod test {
18761876
),
18771877
true,
18781878
)
1879-
.with_column("value", Arc::new(a_value_array), true)
1879+
.with_column_name("value", Arc::new(a_value_array), true)
18801880
.build();
18811881
let a_field_shredded = ShreddedVariantFieldArray::try_new(&a_inner_struct)
18821882
.expect("should create ShreddedVariantFieldArray for a");
@@ -1896,9 +1896,9 @@ mod test {
18961896

18971897
// Build final VariantArray
18981898
let struct_array = StructArrayBuilder::new()
1899-
.with_column("metadata", Arc::new(metadata_array), false)
1900-
.with_column("value", Arc::new(value_array), true)
1901-
.with_column("typed_value", Arc::new(typed_value_struct), true)
1899+
.with_column_name("metadata", Arc::new(metadata_array), false)
1900+
.with_column_name("value", Arc::new(value_array), true)
1901+
.with_column_name("typed_value", Arc::new(typed_value_struct), true)
19021902
.build();
19031903

19041904
Arc::new(struct_array)
@@ -1950,7 +1950,7 @@ mod test {
19501950
// Level 3: x field (deepest level)
19511951
let x_typed_value = Int32Array::from(vec![Some(100), None, None]);
19521952
let x_field_struct = StructArrayBuilder::new()
1953-
.with_column("typed_value", Arc::new(x_typed_value), true)
1953+
.with_column_name("typed_value", Arc::new(x_typed_value), true)
19541954
.build();
19551955
let x_field_shredded = ShreddedVariantFieldArray::try_new(&x_field_struct)
19561956
.expect("should create ShreddedVariantFieldArray for x");
@@ -1975,7 +1975,7 @@ mod test {
19751975
true,
19761976
)]);
19771977
let b_inner_struct = StructArrayBuilder::new()
1978-
.with_column(
1978+
.with_column_name(
19791979
"typed_value",
19801980
Arc::new(
19811981
StructArray::try_new(
@@ -1987,7 +1987,7 @@ mod test {
19871987
),
19881988
true,
19891989
)
1990-
.with_column("value", Arc::new(b_value_array), true)
1990+
.with_column_name("value", Arc::new(b_value_array), true)
19911991
.build();
19921992
let b_field_shredded = ShreddedVariantFieldArray::try_new(&b_inner_struct)
19931993
.expect("should create ShreddedVariantFieldArray for b");
@@ -2012,7 +2012,7 @@ mod test {
20122012
true,
20132013
)]);
20142014
let a_inner_struct = StructArrayBuilder::new()
2015-
.with_column(
2015+
.with_column_name(
20162016
"typed_value",
20172017
Arc::new(
20182018
StructArray::try_new(
@@ -2024,7 +2024,7 @@ mod test {
20242024
),
20252025
true,
20262026
)
2027-
.with_column("value", Arc::new(a_value_array), true)
2027+
.with_column_name("value", Arc::new(a_value_array), true)
20282028
.build();
20292029
let a_field_shredded = ShreddedVariantFieldArray::try_new(&a_inner_struct)
20302030
.expect("should create ShreddedVariantFieldArray for a");
@@ -2044,9 +2044,9 @@ mod test {
20442044

20452045
// Build final VariantArray
20462046
let struct_array = StructArrayBuilder::new()
2047-
.with_column("metadata", Arc::new(metadata_array), false)
2048-
.with_column("value", Arc::new(value_array), true)
2049-
.with_column("typed_value", Arc::new(typed_value_struct), true)
2047+
.with_column_name("metadata", Arc::new(metadata_array), false)
2048+
.with_column_name("value", Arc::new(value_array), true)
2049+
.with_column_name("typed_value", Arc::new(typed_value_struct), true)
20502050
.build();
20512051

20522052
Arc::new(struct_array)
@@ -2736,23 +2736,23 @@ mod test {
27362736
// Field "a": present in rows 0,3 (missing in rows 1,2,4)
27372737
let a_field_typed_value = Int32Array::from(vec![Some(1), None, None, Some(1), None]);
27382738
let a_field_struct = StructArrayBuilder::new()
2739-
.with_column("typed_value", Arc::new(a_field_typed_value), true)
2739+
.with_column_name("typed_value", Arc::new(a_field_typed_value), true)
27402740
.build();
27412741
let a_field_shredded = ShreddedVariantFieldArray::try_new(&a_field_struct)
27422742
.expect("should create ShreddedVariantFieldArray for a");
27432743

27442744
// Field "b": present in rows 0,2 (missing in rows 1,3,4)
27452745
let b_field_typed_value = Int32Array::from(vec![Some(2), None, Some(2), None, None]);
27462746
let b_field_struct = StructArrayBuilder::new()
2747-
.with_column("typed_value", Arc::new(b_field_typed_value), true)
2747+
.with_column_name("typed_value", Arc::new(b_field_typed_value), true)
27482748
.build();
27492749
let b_field_shredded = ShreddedVariantFieldArray::try_new(&b_field_struct)
27502750
.expect("should create ShreddedVariantFieldArray for b");
27512751

27522752
// Field "c": present in row 0 only (missing in all other rows)
27532753
let c_field_typed_value = Int32Array::from(vec![Some(3), None, None, None, None]);
27542754
let c_field_struct = StructArrayBuilder::new()
2755-
.with_column("typed_value", Arc::new(c_field_typed_value), true)
2755+
.with_column_name("typed_value", Arc::new(c_field_typed_value), true)
27562756
.build();
27572757
let c_field_shredded = ShreddedVariantFieldArray::try_new(&c_field_struct)
27582758
.expect("should create ShreddedVariantFieldArray for c");
@@ -2776,8 +2776,8 @@ mod test {
27762776

27772777
// Build final VariantArray with top-level nulls
27782778
let struct_array = StructArrayBuilder::new()
2779-
.with_column("metadata", Arc::new(metadata_array), false)
2780-
.with_column("typed_value", Arc::new(typed_value_struct), true)
2779+
.with_column_name("metadata", Arc::new(metadata_array), false)
2780+
.with_column_name("typed_value", Arc::new(typed_value_struct), true)
27812781
.with_nulls(nulls)
27822782
.build();
27832783

@@ -2793,7 +2793,7 @@ mod test {
27932793
// Row 0: has value 42, Row 1: inner null, Row 2: outer null, Row 3: top-level null
27942794
let inner_typed_value = Int32Array::from(vec![Some(42), None, None, None]); // dummy value for row 2
27952795
let inner = StructArrayBuilder::new()
2796-
.with_column("typed_value", Arc::new(inner_typed_value), true)
2796+
.with_column_name("typed_value", Arc::new(inner_typed_value), true)
27972797
.build();
27982798
let inner = ShreddedVariantFieldArray::try_new(&inner).unwrap();
27992799

@@ -2804,12 +2804,12 @@ mod test {
28042804
false, // row 3: top-level NULL
28052805
]);
28062806
let outer_typed_value = StructArrayBuilder::new()
2807-
.with_column("inner", ArrayRef::from(inner), false)
2807+
.with_column_name("inner", ArrayRef::from(inner), false)
28082808
.with_nulls(outer_typed_value_nulls)
28092809
.build();
28102810

28112811
let outer = StructArrayBuilder::new()
2812-
.with_column("typed_value", Arc::new(outer_typed_value), true)
2812+
.with_column_name("typed_value", Arc::new(outer_typed_value), true)
28132813
.build();
28142814
let outer = ShreddedVariantFieldArray::try_new(&outer).unwrap();
28152815

@@ -2820,7 +2820,7 @@ mod test {
28202820
false, // row 3: top-level NULL
28212821
]);
28222822
let typed_value = StructArrayBuilder::new()
2823-
.with_column("outer", ArrayRef::from(outer), false)
2823+
.with_column_name("outer", ArrayRef::from(outer), false)
28242824
.with_nulls(typed_value_nulls)
28252825
.build();
28262826

@@ -2834,8 +2834,8 @@ mod test {
28342834
false, // row 3: top-level NULL
28352835
]);
28362836
let struct_array = StructArrayBuilder::new()
2837-
.with_column("metadata", Arc::new(metadata_array), false)
2838-
.with_column("typed_value", Arc::new(typed_value), true)
2837+
.with_column_name("metadata", Arc::new(metadata_array), false)
2838+
.with_column_name("typed_value", Arc::new(typed_value), true)
28392839
.with_nulls(nulls)
28402840
.build();
28412841

@@ -2890,23 +2890,23 @@ mod test {
28902890
// For top-level null row, the field still needs valid content (not null)
28912891
let x_field_typed_value = Int32Array::from(vec![Some(1), Some(2), Some(3), Some(0)]);
28922892
let x_field_struct = StructArrayBuilder::new()
2893-
.with_column("typed_value", Arc::new(x_field_typed_value), true)
2893+
.with_column_name("typed_value", Arc::new(x_field_typed_value), true)
28942894
.build();
28952895
let x_field_shredded = ShreddedVariantFieldArray::try_new(&x_field_struct)
28962896
.expect("should create ShreddedVariantFieldArray for x");
28972897

28982898
// Create main typed_value struct (only contains shredded fields)
28992899
let typed_value_struct = StructArrayBuilder::new()
2900-
.with_column("x", ArrayRef::from(x_field_shredded), false)
2900+
.with_column_name("x", ArrayRef::from(x_field_shredded), false)
29012901
.build();
29022902

29032903
// Build VariantArray with both value and typed_value (PartiallyShredded)
29042904
// Top-level null is encoded in the main StructArray's null mask
29052905
let variant_nulls = NullBuffer::from(vec![true, true, true, false]); // Row 3 is top-level null
29062906
let struct_array = StructArrayBuilder::new()
2907-
.with_column("metadata", Arc::new(metadata_array), false)
2908-
.with_column("value", Arc::new(value_array), true)
2909-
.with_column("typed_value", Arc::new(typed_value_struct), true)
2907+
.with_column_name("metadata", Arc::new(metadata_array), false)
2908+
.with_column_name("value", Arc::new(value_array), true)
2909+
.with_column_name("typed_value", Arc::new(typed_value_struct), true)
29102910
.with_nulls(variant_nulls)
29112911
.build();
29122912

0 commit comments

Comments
 (0)