Skip to content

Commit c054941

Browse files
Dandandanovr
Dandandan
authored and
ovr
committed
[Minor] Fix clippy errors with new rust version (1.56) and float formatting with nightly (apache#845)
* Clippy fixes * Test formatting fixes * Test formatting fixes * Fixup
1 parent 46b9633 commit c054941

File tree

3 files changed

+65
-73
lines changed

3 files changed

+65
-73
lines changed

‎arrow/src/compute/kernels/cast.rs

Lines changed: 58 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3090,35 +3090,41 @@ mod tests {
30903090
let f64_array: ArrayRef = Arc::new(Float64Array::from(f64_values));
30913091

30923092
let f64_expected = vec![
3093-
"-9223372036854776000.0",
3094-
"-2147483648.0",
3095-
"-32768.0",
3096-
"-128.0",
3097-
"0.0",
3098-
"255.0",
3099-
"65535.0",
3100-
"4294967295.0",
3101-
"18446744073709552000.0",
3093+
-9223372036854776000.0,
3094+
-2147483648.0,
3095+
-32768.0,
3096+
-128.0,
3097+
0.0,
3098+
255.0,
3099+
65535.0,
3100+
4294967295.0,
3101+
18446744073709552000.0,
31023102
];
31033103
assert_eq!(
31043104
f64_expected,
31053105
get_cast_values::<Float64Type>(&f64_array, &DataType::Float64)
3106+
.iter()
3107+
.map(|i| i.parse::<f64>().unwrap())
3108+
.collect::<Vec<f64>>()
31063109
);
31073110

31083111
let f32_expected = vec![
3109-
"-9223372000000000000.0",
3110-
"-2147483600.0",
3111-
"-32768.0",
3112-
"-128.0",
3113-
"0.0",
3114-
"255.0",
3115-
"65535.0",
3116-
"4294967300.0",
3117-
"18446744000000000000.0",
3112+
-9223372000000000000.0,
3113+
-2147483600.0,
3114+
-32768.0,
3115+
-128.0,
3116+
0.0,
3117+
255.0,
3118+
65535.0,
3119+
4294967300.0,
3120+
18446744000000000000.0,
31183121
];
31193122
assert_eq!(
31203123
f32_expected,
31213124
get_cast_values::<Float32Type>(&f64_array, &DataType::Float32)
3125+
.iter()
3126+
.map(|i| i.parse::<f32>().unwrap())
3127+
.collect::<Vec<f32>>()
31223128
);
31233129

31243130
let i64_expected = vec![
@@ -3365,28 +3371,24 @@ mod tests {
33653371
];
33663372
let u64_array: ArrayRef = Arc::new(UInt64Array::from(u64_values));
33673373

3368-
let f64_expected = vec![
3369-
"0.0",
3370-
"255.0",
3371-
"65535.0",
3372-
"4294967295.0",
3373-
"18446744073709552000.0",
3374-
];
3374+
let f64_expected =
3375+
vec![0.0, 255.0, 65535.0, 4294967295.0, 18446744073709552000.0];
33753376
assert_eq!(
33763377
f64_expected,
33773378
get_cast_values::<Float64Type>(&u64_array, &DataType::Float64)
3379+
.iter()
3380+
.map(|i| i.parse::<f64>().unwrap())
3381+
.collect::<Vec<f64>>()
33783382
);
33793383

3380-
let f32_expected = vec![
3381-
"0.0",
3382-
"255.0",
3383-
"65535.0",
3384-
"4294967300.0",
3385-
"18446744000000000000.0",
3386-
];
3384+
let f32_expected =
3385+
vec![0.0, 255.0, 65535.0, 4294967300.0, 18446744000000000000.0];
33873386
assert_eq!(
33883387
f32_expected,
33893388
get_cast_values::<Float32Type>(&u64_array, &DataType::Float32)
3389+
.iter()
3390+
.map(|i| i.parse::<f32>().unwrap())
3391+
.collect::<Vec<f32>>()
33903392
);
33913393

33923394
let i64_expected = vec!["0", "255", "65535", "4294967295", "null"];
@@ -3658,35 +3660,41 @@ mod tests {
36583660
let i64_array: ArrayRef = Arc::new(Int64Array::from(i64_values));
36593661

36603662
let f64_expected = vec![
3661-
"-9223372036854776000.0",
3662-
"-2147483648.0",
3663-
"-32768.0",
3664-
"-128.0",
3665-
"0.0",
3666-
"127.0",
3667-
"32767.0",
3668-
"2147483647.0",
3669-
"9223372036854776000.0",
3663+
-9223372036854776000.0,
3664+
-2147483648.0,
3665+
-32768.0,
3666+
-128.0,
3667+
0.0,
3668+
127.0,
3669+
32767.0,
3670+
2147483647.0,
3671+
9223372036854776000.0,
36703672
];
36713673
assert_eq!(
36723674
f64_expected,
36733675
get_cast_values::<Float64Type>(&i64_array, &DataType::Float64)
3676+
.iter()
3677+
.map(|i| i.parse::<f64>().unwrap())
3678+
.collect::<Vec<f64>>()
36743679
);
36753680

36763681
let f32_expected = vec![
3677-
"-9223372000000000000.0",
3678-
"-2147483600.0",
3679-
"-32768.0",
3680-
"-128.0",
3681-
"0.0",
3682-
"127.0",
3683-
"32767.0",
3684-
"2147483600.0",
3685-
"9223372000000000000.0",
3682+
-9223372000000000000.0,
3683+
-2147483600.0,
3684+
-32768.0,
3685+
-128.0,
3686+
0.0,
3687+
127.0,
3688+
32767.0,
3689+
2147483600.0,
3690+
9223372000000000000.0,
36863691
];
36873692
assert_eq!(
36883693
f32_expected,
36893694
get_cast_values::<Float32Type>(&i64_array, &DataType::Float32)
3695+
.iter()
3696+
.map(|i| i.parse::<f32>().unwrap())
3697+
.collect::<Vec<f32>>()
36903698
);
36913699

36923700
let i64_expected = vec![

‎arrow/src/ipc/reader.rs

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -347,18 +347,7 @@ fn create_list_array(
347347
buffers: &[Buffer],
348348
child_array: ArrayRef,
349349
) -> ArrayRef {
350-
if let DataType::List(_) = *data_type {
351-
let null_count = field_node.null_count() as usize;
352-
let mut builder = ArrayData::builder(data_type.clone())
353-
.len(field_node.length() as usize)
354-
.buffers(buffers[1..2].to_vec())
355-
.offset(0)
356-
.child_data(vec![child_array.data().clone()]);
357-
if null_count > 0 {
358-
builder = builder.null_bit_buffer(buffers[0].clone())
359-
}
360-
make_array(builder.build())
361-
} else if let DataType::LargeList(_) = *data_type {
350+
if let DataType::List(_) | DataType::LargeList(_) = *data_type {
362351
let null_count = field_node.null_count() as usize;
363352
let mut builder = ArrayData::builder(data_type.clone())
364353
.len(field_node.length() as usize)

‎parquet/src/schema/parser.rs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -371,19 +371,14 @@ impl<'a> Parser<'a> {
371371
"Failed to parse scale for DECIMAL type",
372372
)?;
373373
assert_token(self.tokenizer.next(), ")")?;
374-
logical = Some(LogicalType::DECIMAL(DecimalType {
375-
scale,
376-
precision,
377-
}));
378-
converted = ConvertedType::from(logical.clone());
379374
} else {
380-
scale = 0;
381-
logical = Some(LogicalType::DECIMAL(DecimalType {
382-
scale,
383-
precision,
384-
}));
385-
converted = ConvertedType::from(logical.clone());
375+
scale = 0
386376
}
377+
logical = Some(LogicalType::DECIMAL(DecimalType {
378+
scale,
379+
precision,
380+
}));
381+
converted = ConvertedType::from(logical.clone());
387382
}
388383
}
389384
LogicalType::TIME(_) => {

0 commit comments

Comments
 (0)