cargo fmt

Author: goldmedal

wren-modeling-rs/Cargo.toml

@@ -15,9 +15,9 @@ version = "0.1.0"
 [workspace.dependencies]
 arrow-schema = { version = "51.0.0", default-features = false }
 datafusion = { version = "38.0.0" }
+log = { version = "0.4.14" }
+petgraph = "0.6.5"
+petgraph-evcxr = "*"
 serde = { version = "1.0.201", features = ["derive", "rc"] }
 serde_json = { version = "1.0.117" }
 tokio = { version = "1.4.0", features = ["rt", "rt-multi-thread", "macros"] }
-petgraph = "0.6.5"
-petgraph-evcxr = "*"
-log = { version = "0.4.14" }

wren-modeling-rs/sqllogictest/Cargo.toml

@@ -14,31 +14,29 @@ name = "wren_sqllogictest"
 path = "src/lib.rs"
 
 [dependencies]
-wren-core = { path = "../core" }
-datafusion = { workspace = true }
-sqllogictest = "0.20.4"
 async-trait = "0.1.80"
-thiserror = "1.0.61"
-tokio = { workspace = true }
-log = { workspace = true }
 bigdecimal = "0.4.3"
+datafusion = { workspace = true }
 half = { version = "2.4.1", default-features = true }
+log = { workspace = true }
 rust_decimal = { version = "1.27.0" }
+sqllogictest = "0.20.4"
+thiserror = "1.0.61"
+tokio = { workspace = true }
+wren-core = { path = "../core" }
 
 itertools = "0.13.0"
 object_store = { version = "0.10.1", default-features = false }
 
-tempfile = "3.10.1"
-futures = "0.3.17"
 clap = { version = "4.4.8", features = ["derive", "env"] }
-
+futures = "0.3.17"
+tempfile = "3.10.1"
 
 [dev-dependencies]
 env_logger = "0.11.3"
 num_cpus = "1.16.0"
 tokio = { workspace = true, features = ["rt-multi-thread"] }
 
-
 [[test]]
 harness = false
 name = "sqllogictests"

wren-modeling-rs/sqllogictest/bin/sqllogictests.rs

@@ -183,7 +183,9 @@ async fn run_complete_file(test_file: TestFile) -> Result<()> {
         )
         .await
         // Can't use e directly because it isn't marked Send, so turn it into a string.
-        .map_err(|e| DataFusionError::Execution(format!("Error completing {relative_path:?}: {e}")))
+        .map_err(|e| {
+            DataFusionError::Execution(format!("Error completing {relative_path:?}: {e}"))
+        })
 }
 
 /// Represents a parsed test file
@@ -214,7 +216,9 @@ impl TestFile {
     }
 }
 
-fn read_test_files<'a>(options: &'a Options) -> Result<Box<dyn Iterator<Item = TestFile> + 'a>> {
+fn read_test_files<'a>(
+    options: &'a Options,
+) -> Result<Box<dyn Iterator<Item = TestFile> + 'a>> {
     Ok(Box::new(
         read_dir_recursive(TEST_DIRECTORY)?
             .into_iter()

wren-modeling-rs/sqllogictest/src/engine/conversion.rs

@@ -83,13 +83,15 @@ pub(crate) fn f64_to_str(value: f64) -> String {
 
 pub(crate) fn i128_to_str(value: i128, precision: &u8, scale: &i8) -> String {
     big_decimal_to_str(
-        BigDecimal::from_str(&Decimal128Type::format_decimal(value, *precision, *scale)).unwrap(),
+        BigDecimal::from_str(&Decimal128Type::format_decimal(value, *precision, *scale))
+            .unwrap(),
     )
 }
 
 pub(crate) fn i256_to_str(value: i256, precision: &u8, scale: &i8) -> String {
     big_decimal_to_str(
-        BigDecimal::from_str(&Decimal256Type::format_decimal(value, *precision, *scale)).unwrap(),
+        BigDecimal::from_str(&Decimal256Type::format_decimal(value, *precision, *scale))
+            .unwrap(),
     )
 }
 

wren-modeling-rs/sqllogictest/src/engine/normalize.rs

@@ -17,7 +17,9 @@
 
 use datafusion::arrow::datatypes::Fields;
 use datafusion::arrow::util::display::ArrayFormatter;
-use datafusion::arrow::{array, array::ArrayRef, datatypes::DataType, record_batch::RecordBatch};
+use datafusion::arrow::{
+    array, array::ArrayRef, datatypes::DataType, record_batch::RecordBatch,
+};
 use datafusion::common::format::DEFAULT_FORMAT_OPTIONS;
 use datafusion::common::DataFusionError;
 use std::path::PathBuf;
@@ -157,7 +159,8 @@ fn workspace_root() -> &'static object_store::path::Path {
         let sanitized_workplace_root = if cfg!(windows) {
             // Object store paths are delimited with `/`, e.g. `/datafusion/datafusion/testing/data/csv/aggregate_test_100.csv`.
             // The default windows delimiter is `\`, so the workplace path is `datafusion\datafusion`.
-            workspace_root.replace(std::path::MAIN_SEPARATOR, object_store::path::DELIMITER)
+            workspace_root
+                .replace(std::path::MAIN_SEPARATOR, object_store::path::DELIMITER)
         } else {
             workspace_root.to_string()
         };
@@ -204,10 +207,18 @@ pub fn cell_to_string(col: &ArrayRef, row: usize) -> Result<String> {
     } else {
         match col.data_type() {
             DataType::Null => Ok(NULL_STR.to_string()),
-            DataType::Boolean => Ok(bool_to_str(get_row_value!(array::BooleanArray, col, row))),
-            DataType::Float16 => Ok(f16_to_str(get_row_value!(array::Float16Array, col, row))),
-            DataType::Float32 => Ok(f32_to_str(get_row_value!(array::Float32Array, col, row))),
-            DataType::Float64 => Ok(f64_to_str(get_row_value!(array::Float64Array, col, row))),
+            DataType::Boolean => {
+                Ok(bool_to_str(get_row_value!(array::BooleanArray, col, row)))
+            }
+            DataType::Float16 => {
+                Ok(f16_to_str(get_row_value!(array::Float16Array, col, row)))
+            }
+            DataType::Float32 => {
+                Ok(f32_to_str(get_row_value!(array::Float32Array, col, row)))
+            }
+            DataType::Float64 => {
+                Ok(f64_to_str(get_row_value!(array::Float64Array, col, row)))
+            }
             DataType::Decimal128(precision, scale) => {
                 let value = get_row_value!(array::Decimal128Array, col, row);
                 Ok(i128_to_str(value, precision, scale))
@@ -221,7 +232,9 @@ pub fn cell_to_string(col: &ArrayRef, row: usize) -> Result<String> {
                 col,
                 row
             ))),
-            DataType::Utf8 => Ok(varchar_to_str(get_row_value!(array::StringArray, col, row))),
+            DataType::Utf8 => {
+                Ok(varchar_to_str(get_row_value!(array::StringArray, col, row)))
+            }
             _ => {
                 let f = ArrayFormatter::try_new(col.as_ref(), &DEFAULT_FORMAT_OPTIONS);
                 Ok(f.unwrap().value(row).to_string())
@@ -252,9 +265,10 @@ pub(crate) fn convert_schema_to_types(columns: &Fields) -> Vec<DFColumnType> {
             | DataType::Decimal128(_, _)
             | DataType::Decimal256(_, _) => DFColumnType::Float,
             DataType::Utf8 | DataType::LargeUtf8 => DFColumnType::Text,
-            DataType::Date32 | DataType::Date64 | DataType::Time32(_) | DataType::Time64(_) => {
-                DFColumnType::DateTime
-            }
+            DataType::Date32
+            | DataType::Date64
+            | DataType::Time32(_)
+            | DataType::Time64(_) => DFColumnType::DateTime,
             DataType::Timestamp(_, _) => DFColumnType::Timestamp,
             _ => DFColumnType::Another,
         })

wren-modeling-rs/sqllogictest/src/engine/utils.rs

@@ -1,19 +1,26 @@
 use datafusion::common::exec_datafusion_err;
 use std::path::{Path, PathBuf};
 
-pub fn read_dir_recursive<P: AsRef<Path>>(path: P) -> datafusion::common::Result<Vec<PathBuf>> {
+pub fn read_dir_recursive<P: AsRef<Path>>(
+    path: P,
+) -> datafusion::common::Result<Vec<PathBuf>> {
     let mut dst = vec![];
     read_dir_recursive_impl(&mut dst, path.as_ref())?;
     Ok(dst)
 }
 
 /// Append all paths recursively to dst
-fn read_dir_recursive_impl(dst: &mut Vec<PathBuf>, path: &Path) -> datafusion::common::Result<()> {
+fn read_dir_recursive_impl(
+    dst: &mut Vec<PathBuf>,
+    path: &Path,
+) -> datafusion::common::Result<()> {
     let entries = std::fs::read_dir(path)
         .map_err(|e| exec_datafusion_err!("Error reading directory {path:?}: {e}"))?;
     for entry in entries {
         let path = entry
-            .map_err(|e| exec_datafusion_err!("Error reading entry in directory {path:?}: {e}"))?
+            .map_err(|e| {
+                exec_datafusion_err!("Error reading entry in directory {path:?}: {e}")
+            })?
             .path();
 
         if path.is_dir() {