Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bench-vortex/src/datasets/struct_list_of_ints.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ impl Dataset for StructListOfInts {
.collect::<Result<Vec<_>>>()?;
Ok(StructArray::try_new(
names.clone(),
fields,
fields.into(),
chunk_row_count,
Validity::NonNullable,
)?
Expand Down
2 changes: 1 addition & 1 deletion encodings/fsst/src/canonical.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ impl CanonicalVTable<FSSTVTable> for FSSTVTable {
unsafe {
Canonical::VarBinView(VarBinViewArray::new_unchecked(
views,
Arc::new([buffer]),
Arc::from([buffer]),
array.dtype().clone(),
array.codes().validity().clone(),
))
Expand Down
8 changes: 4 additions & 4 deletions encodings/sparse/src/canonical.rs
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ mod test {
let patch_values_b =
PrimitiveArray::from_option_iter([Some(1i32), Some(2), None, Some(3)]).into_array();
let patch_values = StructArray::try_new_with_dtype(
vec![patch_values_a, patch_values_b],
vec![patch_values_a, patch_values_b].into(),
struct_fields.clone(),
4,
Validity::Array(
Expand Down Expand Up @@ -669,7 +669,7 @@ mod test {
}));

let expected = StructArray::try_new_with_dtype(
vec![expected_a.into_array(), expected_b.into_array()],
vec![expected_a.into_array(), expected_b.into_array()].into(),
struct_fields,
len,
// NB: patch indices: [0, 1, 7, 8]; patch validity: [Valid, Valid, Valid, Invalid]; ergo 8 is Invalid.
Expand Down Expand Up @@ -706,7 +706,7 @@ mod test {
let patch_values_b =
PrimitiveArray::from_option_iter([Some(1i32), Some(2), None, Some(3)]).into_array();
let patch_values = StructArray::try_new_with_dtype(
vec![patch_values_a, patch_values_b],
vec![patch_values_a, patch_values_b].into(),
struct_fields.clone(),
4,
Validity::Array(
Expand Down Expand Up @@ -744,7 +744,7 @@ mod test {
}));

let expected = StructArray::try_new_with_dtype(
vec![expected_a.into_array(), expected_b.into_array()],
vec![expected_a.into_array(), expected_b.into_array()].into(),
struct_fields,
len,
// NB: patch indices: [0, 1, 7, 8]; patch validity: [Valid, Valid, Valid, Invalid]; ergo 0, 1, 7 are valid.
Expand Down
2 changes: 1 addition & 1 deletion fuzz/src/array/filter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ pub fn filter_canonical_array(array: &dyn Array, filter: &[bool]) -> VortexResul
.collect::<VortexResult<Vec<_>>>()?;

StructArray::try_new_with_dtype(
filtered_children,
filtered_children.into(),
struct_array.struct_fields().clone(),
filter.iter().filter(|b| **b).map(|b| *b as usize).sum(),
validity,
Expand Down
2 changes: 1 addition & 1 deletion fuzz/src/array/slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ pub fn slice_canonical_array(
.map(|c| slice_canonical_array(c, start, stop))
.collect::<VortexResult<Vec<_>>>()?;
StructArray::try_new_with_dtype(
sliced_children,
sliced_children.into(),
struct_array.struct_fields().clone(),
stop - start,
validity,
Expand Down
2 changes: 1 addition & 1 deletion fuzz/src/array/take.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ pub fn take_canonical_array(

StructArray::try_new(
struct_array.names().clone(),
taken_children,
taken_children.into(),
indices_slice_non_opt.len(),
validity,
)
Expand Down
2 changes: 1 addition & 1 deletion java/testfiles/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ fn main() {
// Make the struct array
let rows = StructArray::try_new(
["Name", "Salary", "State"].into(),
vec![names, salary, states],
vec![names, salary, states].into(),
10,
Validity::NonNullable,
)
Expand Down
11 changes: 8 additions & 3 deletions vortex-array/benches/scalar_at_struct.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ fn scalar_at_struct_simple(bencher: Bencher) {

let struct_array = StructArray::try_new(
FieldNames::from(["value"]),
vec![field],
vec![field].into(),
ARRAY_SIZE,
Validity::NonNullable,
)
Expand Down Expand Up @@ -71,8 +71,13 @@ fn scalar_at_struct_wide(bencher: Bencher) {
"field1", "field2", "field3", "field4", "field5", "field6", "field7", "field8",
]);

let struct_array =
StructArray::try_new(field_names, fields, ARRAY_SIZE, Validity::NonNullable).unwrap();
let struct_array = StructArray::try_new(
field_names,
fields.into(),
ARRAY_SIZE,
Validity::NonNullable,
)
.unwrap();

let indices: Vec<usize> = (0..NUM_ACCESSES)
.map(|_| rng.random_range(0..ARRAY_SIZE))
Expand Down
13 changes: 9 additions & 4 deletions vortex-array/benches/take_struct.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fn take_struct_simple(bencher: Bencher) {

let struct_array = StructArray::try_new(
FieldNames::from(["value"]),
vec![field],
vec![field].into(),
ARRAY_SIZE,
Validity::NonNullable,
)
Expand Down Expand Up @@ -70,8 +70,13 @@ fn take_struct_wide(bencher: Bencher, width: usize) {
"field1", "field2", "field3", "field4", "field5", "field6", "field7", "field8",
]);

let struct_array =
StructArray::try_new(field_names, fields, ARRAY_SIZE, Validity::NonNullable).unwrap();
let struct_array = StructArray::try_new(
field_names,
fields.into(),
ARRAY_SIZE,
Validity::NonNullable,
)
.unwrap();

let indices: Buffer<u64> = (0..TAKE_SIZE)
.map(|_| rng.random_range(0..ARRAY_SIZE) as u64)
Expand All @@ -98,7 +103,7 @@ fn take_struct_sequential_indices(bencher: Bencher) {

let struct_array = StructArray::try_new(
FieldNames::from(["value"]),
vec![field],
vec![field].into(),
ARRAY_SIZE,
Validity::NonNullable,
)
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/array/display/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ mod test {
fn test_empty_struct() {
let s = StructArray::try_new(
FieldNames::empty(),
vec![],
vec![].into(),
3,
Validity::Array(BoolArray::from_iter([true, false, true]).into_array()),
)
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/arbitrary.rs
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ fn random_array_chunk(
.collect::<Result<Vec<_>>>()?;
Ok(StructArray::try_new(
sdt.names().clone(),
children,
children.into(),
resolved_len,
random_validity(u, *n, resolved_len)?,
)
Expand Down
12 changes: 8 additions & 4 deletions vortex-array/src/arrays/chunked/compute/take.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,13 @@ mod test {

#[test]
fn test_take_nullability() {
let struct_array =
StructArray::try_new(FieldNames::default(), vec![], 100, Validity::NonNullable)
.unwrap();
let struct_array = StructArray::try_new(
FieldNames::default(),
vec![].into(),
100,
Validity::NonNullable,
)
.unwrap();

let arr = ChunkedArray::from_iter(vec![struct_array.to_array(), struct_array.to_array()]);

Expand All @@ -120,7 +124,7 @@ mod test {

let expect = StructArray::try_new(
FieldNames::default(),
vec![],
vec![].into(),
3,
Validity::Array(BoolArray::from_iter(vec![true, false, true]).to_array()),
)
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/chunked/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ fn scalar_at_empty_children_leading() {
pub fn pack_nested_structs() {
let struct_array = StructArray::try_new(
["a"].into(),
vec![VarBinViewArray::from_iter_str(["foo", "bar", "baz", "quak"]).into_array()],
vec![VarBinViewArray::from_iter_str(["foo", "bar", "baz", "quak"]).into_array()].into(),
4,
Validity::NonNullable,
)
Expand Down
4 changes: 2 additions & 2 deletions vortex-array/src/arrays/chunked/vtable/canonical.rs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ fn pack_struct_chunks(

// SAFETY: field_arrays are built from corresponding chunks of same length, dtypes match by
// construction.
unsafe { StructArray::new_unchecked(field_arrays, struct_dtype.clone(), len, validity) }
unsafe { StructArray::new_unchecked(field_arrays.into(), struct_dtype.clone(), len, validity) }
}

/// Packs [`ListViewArray`]s together into a chunked `ListViewArray`.
Expand Down Expand Up @@ -184,7 +184,7 @@ mod tests {
pub fn pack_nested_structs() {
let struct_array = StructArray::try_new(
["a"].into(),
vec![VarBinViewArray::from_iter_str(["foo", "bar", "baz", "quak"]).into_array()],
vec![VarBinViewArray::from_iter_str(["foo", "bar", "baz", "quak"]).into_array()].into(),
4,
Validity::NonNullable,
)
Expand Down
9 changes: 7 additions & 2 deletions vortex-array/src/arrays/constant/vtable/canonical.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,12 @@ impl CanonicalVTable<ConstantVTable> for ConstantVTable {
// SAFETY: Fields are constructed from the same struct scalar, all have same
// length, dtypes match by construction.
Canonical::Struct(unsafe {
StructArray::new_unchecked(fields, struct_dtype.clone(), array.len(), validity)
StructArray::new_unchecked(
fields.into(),
struct_dtype.clone(),
array.len(),
validity,
)
})
}
DType::List(..) => Canonical::List(constant_canonical_list_array(scalar, array.len())),
Expand Down Expand Up @@ -199,7 +204,7 @@ fn constant_canonical_byte_view(
unsafe {
VarBinViewArray::new_unchecked(
views,
Arc::from(buffers),
Arc::from(buffers.into_boxed_slice()),
dtype.clone(),
Validity::from(dtype.nullability()),
)
Expand Down
8 changes: 4 additions & 4 deletions vortex-array/src/arrays/fixed_size_list/tests/nested.rs
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ fn test_fsl_of_struct() {

let struct_array = StructArray::try_new(
struct_fields.names().clone(),
vec![a_values, b_values],
vec![a_values, b_values].into(),
fsl_len * fsl_size as usize,
Validity::NonNullable,
)
Expand Down Expand Up @@ -447,7 +447,7 @@ fn test_fsl_of_nullable_struct() {
let struct_validity = Validity::from_iter([true, false, true, true, false, true]);
let struct_array = StructArray::try_new(
struct_fields.names().clone(),
vec![x_values.into_array(), y_values.into_array()],
vec![x_values.into_array(), y_values.into_array()].into(),
fsl_len * fsl_size as usize,
struct_validity,
)
Expand Down Expand Up @@ -482,7 +482,7 @@ fn test_fsl_with_empty_struct() {

let struct_array = StructArray::try_new(
struct_fields.names().clone(),
vec![],
vec![].into(),
fsl_len * fsl_size as usize,
Validity::NonNullable,
)
Expand Down Expand Up @@ -527,7 +527,7 @@ fn test_struct_of_fsl() {

let struct_array = StructArray::try_new(
struct_fields.names().clone(),
vec![fsl1.into_array(), fsl2.into_array()],
vec![fsl1.into_array(), fsl2.into_array()].into(),
3,
Validity::NonNullable,
)
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/fixed_size_list/tests/take.rs
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ fn test_take_nullable_arrays_fsl_specific(
builder
.append_value(
Scalar::list(
DType::Primitive(PType::I32, Nullability::NonNullable),
DType::Primitive(PType::I32, Nullability::NonNullable).into(),
scalars,
Nullability::NonNullable,
)
Expand Down
3 changes: 2 additions & 1 deletion vortex-array/src/arrays/fixed_size_list/vtable/operations.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ impl OperationsVTable<FixedSizeListVTable> for FixedSizeListVTable {
let children_elements: Vec<Scalar> = (0..list.len()).map(|i| list.scalar_at(i)).collect();

debug_assert_eq!(children_elements.len(), array.list_size() as usize);
let element_dtype = list.dtype().clone().into();

Scalar::fixed_size_list(
list.dtype().clone(),
element_dtype,
children_elements,
array.dtype().nullability(),
)
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/list/compute/is_constant.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ mod tests {

let struct_of_lists = StructArray::try_new(
FieldNames::from(["xs"]),
vec![xs.into_array()],
vec![xs.into_array()].into(),
2,
Validity::NonNullable,
)
Expand Down
8 changes: 4 additions & 4 deletions vortex-array/src/arrays/listview/conversion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ pub fn recursive_list_from_list_view(array: ArrayRef) -> ArrayRef {
if any_changed {
StructArray::try_new(
struct_array.names().clone(),
converted_fields,
converted_fields.into(),
struct_array.len(),
struct_array.validity().clone(),
)
Expand Down Expand Up @@ -464,7 +464,7 @@ mod tests {

let struct_array = StructArray::try_new(
FieldNames::from(["lists", "values"]),
vec![listview_field, primitive_field],
vec![listview_field, primitive_field].into(),
4,
Validity::NonNullable,
)
Expand Down Expand Up @@ -521,7 +521,7 @@ mod tests {

let struct_array = StructArray::try_new(
FieldNames::from(["inner_lists"]),
vec![innermost_listview.into_array()],
vec![innermost_listview.into_array()].into(),
2,
Validity::NonNullable,
)
Expand Down Expand Up @@ -559,7 +559,7 @@ mod tests {

let struct_array = StructArray::try_new(
FieldNames::from(["listview_field", "list_field"]),
vec![listview.into_array(), list.into_array()],
vec![listview.into_array(), list.into_array()].into(),
4,
Validity::NonNullable,
)
Expand Down
2 changes: 1 addition & 1 deletion vortex-array/src/arrays/listview/tests/nested.rs
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ fn test_listview_of_struct_with_nulls() {

let struct_array = StructArray::try_new(
struct_fields.names().clone(),
vec![id_values, value_values],
vec![id_values, value_values].into(),
6,
struct_validity,
)
Expand Down
Loading
Loading