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
1 change: 1 addition & 0 deletions rust/arrow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ default = ["simd"]
[dev-dependencies]
criterion = "0.2"
lazy_static = "1"
flate2 = "1"

[[bench]]
name = "array_from_vec"
Expand Down
29 changes: 29 additions & 0 deletions rust/arrow/src/array/array.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1544,6 +1544,35 @@ impl fmt::Debug for StructArray {
}
}

impl From<(Vec<(Field, ArrayRef)>, Buffer, usize)> for StructArray {
fn from(triple: (Vec<(Field, ArrayRef)>, Buffer, usize)) -> Self {
let (field_types, field_values): (Vec<_>, Vec<_>) = triple.0.into_iter().unzip();

// Check the length of the child arrays
let length = field_values[0].len();
for i in 1..field_values.len() {
assert_eq!(
length,
field_values[i].len(),
"all child arrays of a StructArray must have the same length"
);
assert_eq!(
field_types[i].data_type(),
field_values[i].data().data_type(),
"the field data types must match the array data in a StructArray"
)
}

let data = ArrayData::builder(DataType::Struct(field_types))
.null_bit_buffer(triple.1)
.child_data(field_values.into_iter().map(|a| a.data()).collect())
.len(length)
.null_count(triple.2)
.build();
Self::from(data)
}
}

#[cfg(test)]
mod tests {
use super::*;
Expand Down
3 changes: 2 additions & 1 deletion rust/arrow/src/datatypes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,8 @@ impl ArrowNativeType for u64 {

impl ArrowNativeType for f32 {
fn into_json_value(self) -> Option<Value> {
Number::from_f64(self as f64).map(|num| VNumber(num))
Number::from_f64(f64::round(self as f64 * 1000.0) / 1000.0)
.map(|num| VNumber(num))
}
}

Expand Down
Loading