lint and fix tests

delta-io · Jun 28, 2023 · 3877770 · 3877770
1 parent 90b8ed9
commit 3877770
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 11 deletions.
diff --git a/rust/src/action/checkpoints.rs b/rust/src/action/checkpoints.rs
@@ -287,7 +287,7 @@ fn filter_binary(schema: &Schema) -> Schema {
     Schema::new(
         schema
             .get_fields()
-            .into_iter()
+            .iter()
             .flat_map(|f| match f.get_type() {
                 SchemaDataType::primitive(p) => {
                     if p != "binary" {

diff --git a/rust/src/action/parquet_read/mod.rs b/rust/src/action/parquet_read/mod.rs
@@ -254,7 +254,9 @@ fn primitive_parquet_field_to_json_value(field: &Field) -> Result<serde_json::Va
         Field::Float(value) => Ok(json!(value)),
         Field::Double(value) => Ok(json!(value)),
         Field::Str(value) => Ok(json!(value)),
-        Field::Decimal(decimal) => Ok(serde_json::Value::String(BigInt::from_signed_bytes_be(decimal.data()).to_string())),
+        Field::Decimal(decimal) => Ok(serde_json::Value::String(
+            BigInt::from_signed_bytes_be(decimal.data()).to_string(),
+        )),
         Field::TimestampMicros(timestamp) => Ok(serde_json::Value::String(
             convert_timestamp_micros_to_string(*timestamp)?,
         )),

diff --git a/rust/src/writer/stats.rs b/rust/src/writer/stats.rs
@@ -242,13 +242,13 @@ impl StatsScalar {
 
                 let decimal_string = if val.len() > *scale as usize {
                     let (integer_part, fractional_part) = val.split_at(val.len() - *scale as usize);
-                    if fractional_part.len() == 0 {
+                    if fractional_part.is_empty() {
                         integer_part.to_string()
                     } else {
                         format!("{}.{}", integer_part, fractional_part)
                     }
                 } else if *scale < 0 {
-                    let abs_scale = scale.abs() as usize;
+                    let abs_scale = scale.unsigned_abs() as usize;
                     let decimal_zeros = "0".repeat(abs_scale);
                     format!("{}{}", val, decimal_zeros)
                 } else {
@@ -519,15 +519,15 @@ mod tests {
                     scale: 3,
                     precision: 4,
                 }),
-                Value::from(1.234),
+                Value::from("1.234"),
             ),
             (
                 simple_parquet_stat!(Statistics::Int32, 1234),
                 Some(LogicalType::Decimal {
                     scale: -1,
                     precision: 4,
                 }),
-                Value::from(12340.0),
+                Value::from("12340"),
             ),
             (
                 simple_parquet_stat!(Statistics::Int32, 737821),
@@ -564,15 +564,15 @@ mod tests {
                     scale: 3,
                     precision: 4,
                 }),
-                Value::from(1.234),
+                Value::from("1.234"),
             ),
             (
                 simple_parquet_stat!(Statistics::Int64, 1234),
                 Some(LogicalType::Decimal {
                     scale: -1,
                     precision: 4,
                 }),
-                Value::from(12340.0),
+                Value::from("12340"),
             ),
             (
                 simple_parquet_stat!(Statistics::Int64, 1234),
@@ -598,7 +598,7 @@ mod tests {
                     scale: 3,
                     precision: 16,
                 }),
-                Value::from(1243124142314.423),
+                Value::from("1243124142314.423"),
             ),
         ];
 

diff --git a/rust/tests/checkpoint_writer.rs b/rust/tests/checkpoint_writer.rs
@@ -9,7 +9,7 @@ mod fs_common;
 #[cfg(all(feature = "arrow", feature = "parquet"))]
 mod simple_checkpoint {
     use arrow::datatypes::Schema as ArrowSchema;
-    use arrow_array::{BinaryArray, RecordBatch, Decimal128Array};
+    use arrow_array::{BinaryArray, Decimal128Array, RecordBatch};
     use arrow_schema::{DataType, Field};
     use deltalake::writer::{DeltaWriter, RecordBatchWriter};
     use deltalake::*;
@@ -80,7 +80,12 @@ mod simple_checkpoint {
         let mut dt = context.table;
         let mut writer = RecordBatchWriter::for_table(&dt)?;
 
-        write(&mut writer, &mut dt, get_batch(vec![&[1, 2]], vec![18446744073709551614])?).await?;
+        write(
+            &mut writer,
+            &mut dt,
+            get_batch(vec![&[1, 2]], vec![18446744073709551614])?,
+        )
+        .await?;
 
         // Just checking that this doesn't fail. https://github.com/delta-io/delta-rs/issues/1493
         checkpoints::create_checkpoint(&dt).await?;