This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch active_release
in repository https://gitbox.apache.org/repos/asf/arrow-rs.git
The following commit(s) were added to refs/heads/active_release by this push:
new 2cc6493 [Minor] Fix clippy errors with new rust version (1.56) and
float formatting with nightly (#845) (#850)
2cc6493 is described below
commit 2cc64937a153f632796915d2d9869d5c2a501d28
Author: Andrew Lamb <[email protected]>
AuthorDate: Sat Oct 23 08:34:02 2021 -0400
[Minor] Fix clippy errors with new rust version (1.56) and float formatting
with nightly (#845) (#850)
* Clippy fixes
* Test formatting fixes
* Test formatting fixes
* Fixup
Co-authored-by: Daniël Heres <[email protected]>
---
arrow/src/compute/kernels/cast.rs | 108 ++++++++++++++++++++------------------
arrow/src/ipc/reader.rs | 13 +----
parquet/src/schema/parser.rs | 17 +++---
3 files changed, 65 insertions(+), 73 deletions(-)
diff --git a/arrow/src/compute/kernels/cast.rs
b/arrow/src/compute/kernels/cast.rs
index b882019..69733fa 100644
--- a/arrow/src/compute/kernels/cast.rs
+++ b/arrow/src/compute/kernels/cast.rs
@@ -2340,35 +2340,41 @@ mod tests {
let f64_array: ArrayRef = Arc::new(Float64Array::from(f64_values));
let f64_expected = vec![
- "-9223372036854776000.0",
- "-2147483648.0",
- "-32768.0",
- "-128.0",
- "0.0",
- "255.0",
- "65535.0",
- "4294967295.0",
- "18446744073709552000.0",
+ -9223372036854776000.0,
+ -2147483648.0,
+ -32768.0,
+ -128.0,
+ 0.0,
+ 255.0,
+ 65535.0,
+ 4294967295.0,
+ 18446744073709552000.0,
];
assert_eq!(
f64_expected,
get_cast_values::<Float64Type>(&f64_array, &DataType::Float64)
+ .iter()
+ .map(|i| i.parse::<f64>().unwrap())
+ .collect::<Vec<f64>>()
);
let f32_expected = vec![
- "-9223372000000000000.0",
- "-2147483600.0",
- "-32768.0",
- "-128.0",
- "0.0",
- "255.0",
- "65535.0",
- "4294967300.0",
- "18446744000000000000.0",
+ -9223372000000000000.0,
+ -2147483600.0,
+ -32768.0,
+ -128.0,
+ 0.0,
+ 255.0,
+ 65535.0,
+ 4294967300.0,
+ 18446744000000000000.0,
];
assert_eq!(
f32_expected,
get_cast_values::<Float32Type>(&f64_array, &DataType::Float32)
+ .iter()
+ .map(|i| i.parse::<f32>().unwrap())
+ .collect::<Vec<f32>>()
);
let i64_expected = vec![
@@ -2615,28 +2621,24 @@ mod tests {
];
let u64_array: ArrayRef = Arc::new(UInt64Array::from(u64_values));
- let f64_expected = vec![
- "0.0",
- "255.0",
- "65535.0",
- "4294967295.0",
- "18446744073709552000.0",
- ];
+ let f64_expected =
+ vec![0.0, 255.0, 65535.0, 4294967295.0, 18446744073709552000.0];
assert_eq!(
f64_expected,
get_cast_values::<Float64Type>(&u64_array, &DataType::Float64)
+ .iter()
+ .map(|i| i.parse::<f64>().unwrap())
+ .collect::<Vec<f64>>()
);
- let f32_expected = vec![
- "0.0",
- "255.0",
- "65535.0",
- "4294967300.0",
- "18446744000000000000.0",
- ];
+ let f32_expected =
+ vec![0.0, 255.0, 65535.0, 4294967300.0, 18446744000000000000.0];
assert_eq!(
f32_expected,
get_cast_values::<Float32Type>(&u64_array, &DataType::Float32)
+ .iter()
+ .map(|i| i.parse::<f32>().unwrap())
+ .collect::<Vec<f32>>()
);
let i64_expected = vec!["0", "255", "65535", "4294967295", "null"];
@@ -2908,35 +2910,41 @@ mod tests {
let i64_array: ArrayRef = Arc::new(Int64Array::from(i64_values));
let f64_expected = vec![
- "-9223372036854776000.0",
- "-2147483648.0",
- "-32768.0",
- "-128.0",
- "0.0",
- "127.0",
- "32767.0",
- "2147483647.0",
- "9223372036854776000.0",
+ -9223372036854776000.0,
+ -2147483648.0,
+ -32768.0,
+ -128.0,
+ 0.0,
+ 127.0,
+ 32767.0,
+ 2147483647.0,
+ 9223372036854776000.0,
];
assert_eq!(
f64_expected,
get_cast_values::<Float64Type>(&i64_array, &DataType::Float64)
+ .iter()
+ .map(|i| i.parse::<f64>().unwrap())
+ .collect::<Vec<f64>>()
);
let f32_expected = vec![
- "-9223372000000000000.0",
- "-2147483600.0",
- "-32768.0",
- "-128.0",
- "0.0",
- "127.0",
- "32767.0",
- "2147483600.0",
- "9223372000000000000.0",
+ -9223372000000000000.0,
+ -2147483600.0,
+ -32768.0,
+ -128.0,
+ 0.0,
+ 127.0,
+ 32767.0,
+ 2147483600.0,
+ 9223372000000000000.0,
];
assert_eq!(
f32_expected,
get_cast_values::<Float32Type>(&i64_array, &DataType::Float32)
+ .iter()
+ .map(|i| i.parse::<f32>().unwrap())
+ .collect::<Vec<f32>>()
);
let i64_expected = vec![
diff --git a/arrow/src/ipc/reader.rs b/arrow/src/ipc/reader.rs
index 088e9ad..e925e2a 100644
--- a/arrow/src/ipc/reader.rs
+++ b/arrow/src/ipc/reader.rs
@@ -347,18 +347,7 @@ fn create_list_array(
buffers: &[Buffer],
child_array: ArrayRef,
) -> ArrayRef {
- if let DataType::List(_) = *data_type {
- let null_count = field_node.null_count() as usize;
- let mut builder = ArrayData::builder(data_type.clone())
- .len(field_node.length() as usize)
- .buffers(buffers[1..2].to_vec())
- .offset(0)
- .child_data(vec![child_array.data().clone()]);
- if null_count > 0 {
- builder = builder.null_bit_buffer(buffers[0].clone())
- }
- make_array(unsafe { builder.build_unchecked() })
- } else if let DataType::LargeList(_) = *data_type {
+ if let DataType::List(_) | DataType::LargeList(_) = *data_type {
let null_count = field_node.null_count() as usize;
let mut builder = ArrayData::builder(data_type.clone())
.len(field_node.length() as usize)
diff --git a/parquet/src/schema/parser.rs b/parquet/src/schema/parser.rs
index 41f6290..ba1f566 100644
--- a/parquet/src/schema/parser.rs
+++ b/parquet/src/schema/parser.rs
@@ -371,19 +371,14 @@ impl<'a> Parser<'a> {
"Failed to parse scale for DECIMAL type",
)?;
assert_token(self.tokenizer.next(), ")")?;
- logical =
Some(LogicalType::DECIMAL(DecimalType {
- scale,
- precision,
- }));
- converted =
ConvertedType::from(logical.clone());
} else {
- scale = 0;
- logical =
Some(LogicalType::DECIMAL(DecimalType {
- scale,
- precision,
- }));
- converted =
ConvertedType::from(logical.clone());
+ scale = 0
}
+ logical = Some(LogicalType::DECIMAL(DecimalType {
+ scale,
+ precision,
+ }));
+ converted = ConvertedType::from(logical.clone());
}
}
LogicalType::TIME(_) => {
