Clippy/fmt things

Signed-off-by: Adam Gutglick <[email protected]>

Author: AdamGS

Cargo.toml

@@ -202,7 +202,7 @@ tokio-stream = "0.1.17"
 tokio-util = { version = "0.7.16" }
 tpchgen = { version = "2" }
 tpchgen-arrow = { version = "2" }
-tracing = { version = "0.1.41" }
+tracing = { version = "0.1.41", default-features = false }
 tracing-perfetto = "0.1.5"
 tracing-subscriber = "0.3"
 url = "2.5.7"

bench-vortex/src/fineweb/mod.rs

@@ -11,8 +11,8 @@ use datafusion::datasource::listing::ListingTableConfig;
 use datafusion::datasource::listing::ListingTableUrl;
 use datafusion::prelude::SessionContext;
 use futures::StreamExt;
-use tracing::info;
 use parquet::arrow::async_writer::AsyncFileWriter;
+use tracing::info;
 use url::Url;
 use vortex::compressor::CompactCompressor;
 use vortex::file::WriteOptionsSessionExt;

bench-vortex/src/realnest/gharchive.rs

@@ -16,8 +16,8 @@ use datafusion::datasource::listing::ListingTableConfig;
 use datafusion::datasource::listing::ListingTableUrl;
 use datafusion::prelude::SessionContext;
 use futures::StreamExt;
-use tracing::info;
 use parquet::arrow::async_writer::AsyncFileWriter;
+use tracing::info;
 use url::Url;
 use vortex::compressor::CompactCompressor;
 use vortex::file::WriteOptionsSessionExt;

bench-vortex/src/tpch/tpch_benchmark.rs

@@ -13,11 +13,11 @@ use anyhow::anyhow;
 use datafusion::prelude::SessionContext;
 use ddb::DuckDBCtx;
 use glob::Pattern;
-use tracing::info;
-use tracing::warn;
 use similar::ChangeTag;
 use similar::TextDiff;
 use tokio::runtime::Runtime;
+use tracing::info;
+use tracing::warn;
 use url::Url;
 
 use crate::BenchmarkDataset;

bench-vortex/src/tpch/tpchgen.rs

@@ -14,7 +14,6 @@ use arrow_schema::SchemaRef;
 use futures::StreamExt;
 use futures::TryStreamExt;
 use futures::stream;
-use tracing::info;
 use parquet::arrow::AsyncArrowWriter;
 use parquet::basic::Compression;
 use parquet::file::properties::WriterProperties;
@@ -30,6 +29,7 @@ use tpchgen::generators::PartSuppGenerator;
 use tpchgen::generators::RegionGenerator;
 use tpchgen::generators::SupplierGenerator;
 use tpchgen_arrow::RecordBatchIterator;
+use tracing::info;
 use vortex::array::ArrayRef;
 use vortex::array::arrow::FromArrowArray;
 use vortex::array::stream::ArrayStreamAdapter;

bench-vortex/src/utils/parquet.rs

@@ -19,9 +19,9 @@ use arrow_schema::SchemaRef;
 use lance::dataset::Dataset as LanceDataset;
 use lance::dataset::WriteParams;
 use lance_encoding::version::LanceFileVersion;
-use tracing::info;
 use parquet::arrow::arrow_reader::ParquetRecordBatchReaderBuilder;
 use tokio::fs::create_dir_all;
+use tracing::info;
 
 use crate::utils::file::idempotent_async;
 

vortex-datafusion/Cargo.toml

@@ -35,7 +35,7 @@ moka = { workspace = true, features = ["future"] }
 object_store = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread", "fs"] }
 tokio-stream = { workspace = true }
-tracing = { workspace = true }
+tracing = { workspace = true, features = ["std", "attributes"] }
 vortex = { workspace = true, features = ["object_store", "tokio"] }
 vortex-utils = { workspace = true, features = ["dashmap"] }
 

vortex-ffi/Cargo.toml

@@ -27,7 +27,7 @@ mimalloc = { workspace = true, optional = true }
 object_store = { workspace = true, features = ["aws", "azure", "gcp"] }
 paste = { workspace = true }
 prost = { workspace = true }
-tracing = { workspace = true }
+tracing = { workspace = true, features = ["std", "log"] }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 url = { workspace = true, features = [] }
 vortex = { workspace = true, features = ["object_store"] }

vortex-io/src/file/driver.rs

@@ -125,8 +125,9 @@ impl State {
         }
     }
 
+    #[allow(clippy::cognitive_complexity)]
     fn on_event(&mut self, event: ReadEvent) {
-        tracing::debug!("Received ReadEvent: {:?}", event);
+        tracing::debug!(?event, "Received ReadEvent");
         match event {
             ReadEvent::Request(req) => {
                 self.requests_by_offset.insert((req.offset, req.id));
@@ -140,11 +141,11 @@ impl State {
             ReadEvent::Dropped(req_id) => {
                 if let Some(req) = self.requests.remove(&req_id) {
                     self.requests_by_offset.remove(&(req.offset, req_id));
-                    tracing::debug!("ReadRequest dropped before poll: {:?}", req);
+                    tracing::debug!(?req, "ReadRequest dropped before poll");
                 }
                 if let Some(req) = self.polled_requests.remove(&req_id) {
                     self.requests_by_offset.remove(&(req.offset, req_id));
-                    tracing::debug!("ReadRequest dropped after poll: {:?}", req);
+                    tracing::debug!(?req, "ReadRequest dropped after poll");
                 }
             }
         }

vortex-io/src/read.rs

@@ -181,6 +181,7 @@ impl<T> Drop for InstrumentedReadAt<T>
 where
     T: VortexReadAt,
 {
+    #[allow(clippy::cognitive_complexity)]
     fn drop(&mut self) {
         let sizes = self.sizes.snapshot();
         tracing::debug!("Reads: {}", self.sizes.count());