fix: clippy fmt

getdozer · Apr 5, 2024 · 1636c16 · 1636c16
1 parent 5b46ee2
commit 1636c16
Show file tree

Hide file tree

Showing 11 changed files with 314 additions and 296 deletions.
diff --git a/dozer-ingestion/aerospike/src/connector.rs b/dozer-ingestion/aerospike/src/connector.rs
@@ -811,7 +811,6 @@ pub(crate) fn map_value_to_field(
             check_type("int8")?;
             let string = value.as_str().ok_or_else(unsupported_type)?;
             Ok(Field::Int8(string.parse()?))
-
         }
         FieldType::U128 => {
             check_type("str")?;

diff --git a/dozer-ingestion/tests/test_suite/basic.rs b/dozer-ingestion/tests/test_suite/basic.rs
@@ -293,6 +293,9 @@ fn assert_record_matches_schema(record: &Record, schema: &Schema, only_match_pk:
             FieldType::Int => {
                 assert!(value.as_int().is_some())
             }
+            FieldType::Int8 => {
+                assert!(value.as_int().is_some())
+            }
             FieldType::I128 => {
                 assert!(value.as_i128().is_some())
             }

diff --git a/dozer-ingestion/tests/test_suite/connectors/object_store/arrow.rs b/dozer-ingestion/tests/test_suite/connectors/object_store/arrow.rs
@@ -278,6 +278,7 @@ fn field_type_to_arrow(field_type: FieldType) -> Option<arrow::datatypes::DataTy
         FieldType::UInt => Some(arrow::datatypes::DataType::UInt64),
         FieldType::U128 => None,
         FieldType::Int => Some(arrow::datatypes::DataType::Int64),
+        FieldType::Int8 => Some(arrow::datatypes::DataType::Int64),
         FieldType::I128 => None,
         FieldType::Float => Some(arrow::datatypes::DataType::Float64),
         FieldType::Boolean => Some(arrow::datatypes::DataType::Boolean),
@@ -349,6 +350,18 @@ fn fields_to_arrow<'a, F: IntoIterator<Item = &'a Field>>(
             }
             Arc::new(builder.finish())
         }
+        FieldType::Int8 => {
+            let mut builder = arrow::array::Int64Array::builder(count);
+            for field in fields {
+                match field {
+                    Field::Int(value) => builder.append_value(*value),
+                    Field::Int8(value) => builder.append_value(*value as i64),
+                    Field::Null => builder.append_null(),
+                    _ => panic!("Unexpected field type"),
+                }
+            }
+            Arc::new(builder.finish())
+        }
         FieldType::I128 => panic!("Unexpected field type"),
         FieldType::Float => {
             let mut builder = arrow::array::Float64Array::builder(count);

diff --git a/dozer-ingestion/tests/test_suite/connectors/sql.rs b/dozer-ingestion/tests/test_suite/connectors/sql.rs
@@ -158,6 +158,7 @@ fn field_type_to_sql(field_type: FieldType) -> Option<String> {
         FieldType::UInt => None,
         FieldType::U128 => None,
         FieldType::Int => Some("INT8".to_string()),
+        FieldType::Int8 => Some("INT8".to_string()),
         FieldType::I128 => None,
         FieldType::Float => Some("FLOAT8".to_string()),
         FieldType::Boolean => Some("BOOLEAN".to_string()),
@@ -229,6 +230,7 @@ fn field_to_sql(field: &Field) -> String {
         Field::UInt(i) => i.to_string(),
         Field::U128(i) => i.to_string(),
         Field::Int(i) => i.to_string(),
+        Field::Int8(i) => i.to_string(),
         Field::I128(i) => i.to_string(),
         Field::Float(f) => f.to_string(),
         Field::Boolean(b) => b.to_string(),

diff --git a/dozer-sink-aerospike/src/aerospike.rs b/dozer-sink-aerospike/src/aerospike.rs
@@ -558,7 +558,11 @@ pub(crate) unsafe fn new_record_map(
                 as_orderedmap_set(map, key, check_alloc(as_integer_new(*v)) as *const as_val);
             }
             Field::Int8(v) => {
-                as_orderedmap_set(map, key, check_alloc(as_integer_new((*v).into())) as *const as_val);
+                as_orderedmap_set(
+                    map,
+                    key,
+                    check_alloc(as_integer_new((*v).into())) as *const as_val,
+                );
             }
             Field::I128(v) => {
                 map_set_str(map, key, v, allocated_strings);

diff --git a/dozer-sink-clickhouse/src/sink.rs b/dozer-sink-clickhouse/src/sink.rs
@@ -156,7 +156,7 @@ impl ClickhouseSink {
     ) -> Self {
         let mut schema = schema.clone();
 
-        if table.engine == "CollapsingMergeTree" && schema.fields.len() > 0 {
+        if table.engine == "CollapsingMergeTree" && !schema.fields.is_empty() {
             // get source from any field in schema
             let source = schema.fields[0].source.clone();
             schema.fields.push(FieldDefinition {

diff --git a/dozer-sql/expression/src/comparison/mod.rs b/dozer-sql/expression/src/comparison/mod.rs
@@ -862,10 +862,9 @@ pub fn evaluate_lt(
             Field::Float(right_v) => Ok(Field::Boolean((left_v as f64) < *right_v)),
             // left: Int, right: Decimal
             Field::Decimal(right_v) => {
-                let left_v_d = Decimal::from_i64(left_v as i64).ok_or(PipelineError::UnableToCast(
-                    format!("{}", left_v),
-                    "Decimal".to_string(),
-                ))?;
+                let left_v_d = Decimal::from_i64(left_v as i64).ok_or(
+                    PipelineError::UnableToCast(format!("{}", left_v), "Decimal".to_string()),
+                )?;
                 Ok(Field::Boolean(left_v_d < right_v))
             }
             // left: Int, right: String or Text
@@ -903,7 +902,7 @@ pub fn evaluate_lt(
             Field::I128(right_v) => Ok(Field::Boolean(left_v < right_v)),
             // left: I128, right: UInt
             Field::UInt(right_v) => Ok(Field::Boolean(left_v < (right_v as i128))),
-            
+
             // left: I128, right: U128
             Field::U128(right_v) => Ok(Field::Boolean(left_v < (right_v as i128))),
             // left: I128, right: Float