fix fmt

apache · Dec 31, 2024 · 30796bc · 30796bc
1 parent b1a231b
commit 30796bc
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 18 deletions.
diff --git a/datafusion-examples/examples/custom_file_format.rs b/datafusion-examples/examples/custom_file_format.rs
@@ -107,8 +107,8 @@ impl FileFormat for TSVFileFormat {
 
     async fn infer_file_ordering(
         &self,
-        store: &Arc<dyn ObjectStore>,
-        object: &ObjectMeta,
+        _store: &Arc<dyn ObjectStore>,
+        _object: &ObjectMeta,
     ) -> Option<&String> {
         None
     }

diff --git a/datafusion/core/src/dataframe/parquet.rs b/datafusion/core/src/dataframe/parquet.rs
@@ -18,7 +18,7 @@
 use std::sync::Arc;
 
 use crate::datasource::file_format::{
-    format_as_file_type, parquet::ParquetFormatFactory, DefaultFileType,
+    format_as_file_type, parquet::ParquetFormatFactory,
 };
 
 use super::{

diff --git a/datafusion/core/src/datasource/file_format/arrow.rs b/datafusion/core/src/datasource/file_format/arrow.rs
@@ -167,8 +167,8 @@ impl FileFormat for ArrowFormat {
 
     async fn infer_file_ordering(
         &self,
-        store: &Arc<dyn ObjectStore>,
-        object: &ObjectMeta,
+        _store: &Arc<dyn ObjectStore>,
+        _object: &ObjectMeta,
     ) -> Option<String> {
         // todo for now we don't support infer ordering for Arrow files
         None

diff --git a/datafusion/core/src/datasource/file_format/avro.rs b/datafusion/core/src/datasource/file_format/avro.rs
@@ -136,8 +136,8 @@ impl FileFormat for AvroFormat {
 
     async fn infer_file_ordering(
         &self,
-        store: &Arc<dyn ObjectStore>,
-        object: &ObjectMeta,
+        _store: &Arc<dyn ObjectStore>,
+        _object: &ObjectMeta,
     ) -> Option<String> {
         // todo Avro files sort order are not sorted
         None

diff --git a/datafusion/core/src/datasource/file_format/csv.rs b/datafusion/core/src/datasource/file_format/csv.rs
@@ -408,8 +408,8 @@ impl FileFormat for CsvFormat {
 
     async fn infer_file_ordering(
         &self,
-        store: &Arc<dyn ObjectStore>,
-        object: &ObjectMeta,
+        _store: &Arc<dyn ObjectStore>,
+        _object: &ObjectMeta,
     ) -> Option<String> {
         // CSV infer files order info is not supported
         None

diff --git a/datafusion/core/src/datasource/file_format/json.rs b/datafusion/core/src/datasource/file_format/json.rs
@@ -244,8 +244,8 @@ impl FileFormat for JsonFormat {
 
     async fn infer_file_ordering(
         &self,
-        store: &Arc<dyn ObjectStore>,
-        object: &ObjectMeta,
+        _store: &Arc<dyn ObjectStore>,
+        _object: &ObjectMeta,
     ) -> Option<String> {
         // Json infer files order are not supported
         None

diff --git a/datafusion/core/src/datasource/file_format/mod.rs b/datafusion/core/src/datasource/file_format/mod.rs
@@ -36,7 +36,6 @@ use crate::datasource::physical_plan::{FileScanConfig, FileSinkConfig};
 use crate::error::Result;
 use crate::execution::context::SessionState;
 use crate::physical_plan::{ExecutionPlan, Statistics};
-use ::parquet::arrow::parquet_to_arrow_schema;
 use std::any::Any;
 use std::collections::{HashMap, VecDeque};
 use std::fmt::{self, Debug, Display};
@@ -50,7 +49,6 @@ use datafusion_common::{internal_err, not_impl_err, GetExt};
 use datafusion_expr::Expr;
 use datafusion_physical_expr::PhysicalExpr;
 
-use crate::datasource::file_format::parquet::fetch_parquet_metadata;
 use async_trait::async_trait;
 use bytes::{Buf, Bytes};
 use datafusion_physical_expr_common::sort_expr::LexRequirement;
@@ -124,6 +122,16 @@ pub trait FileFormat: Send + Sync + Debug {
         object: &ObjectMeta,
     ) -> Result<Statistics>;
 
+    /// Infers the file ordering for a given object store and object meta.
+    ///
+    /// # Arguments
+    ///
+    /// * `store` - A reference to the object store.
+    /// * `object` - A reference to the object meta.
+    ///
+    /// # Returns
+    ///
+    /// An optional string representing the file ordering.
     async fn infer_file_ordering(
         &self,
         store: &Arc<dyn ObjectStore>,

diff --git a/datafusion/core/src/datasource/file_format/parquet.rs b/datafusion/core/src/datasource/file_format/parquet.rs
@@ -74,7 +74,7 @@ use parquet::arrow::{
     arrow_to_parquet_schema, parquet_to_arrow_schema, AsyncArrowWriter,
 };
 use parquet::file::metadata::{
-    KeyValue, ParquetMetaData, ParquetMetaDataReader, RowGroupMetaData,
+    ParquetMetaData, ParquetMetaDataReader, RowGroupMetaData,
 };
 use parquet::file::properties::WriterProperties;
 use parquet::file::writer::SerializedFileWriter;

diff --git a/datafusion/core/src/datasource/listing/table.rs b/datafusion/core/src/datasource/listing/table.rs
@@ -20,7 +20,6 @@
 use super::helpers::{expr_applicable_for_cols, pruned_partition_list, split_files};
 use super::{ListingTableUrl, PartitionedFile};
 use std::collections::HashMap;
-use std::ops::Deref;
 use std::{any::Any, str::FromStr, sync::Arc};
 
 use crate::datasource::{
@@ -52,11 +51,8 @@ use datafusion_physical_expr::{
     create_physical_expr, LexOrdering, PhysicalSortRequirement,
 };
 
-use crate::datasource::file_format::csv::CsvFormat;
-use crate::datasource::file_format::parquet::ParquetFormat;
 use async_trait::async_trait;
 use datafusion_catalog::Session;
-use datafusion_common::cse::FoundCommonNodes::No;
 use datafusion_expr::expr::Sort;
 use datafusion_physical_expr_common::sort_expr::LexRequirement;
 use futures::{future, stream, StreamExt, TryStreamExt};