Skip to content

Apache DataFusion SQL Query Engine

chore: enforce clippy::allow_attributes for proto, pruning, session (#19350)

Kumar Ujjawal7900cd6e98c1
diff --git a/datafusion/proto/src/generated/mod.rs b/datafusion/proto/src/generated/mod.rs
index da3302a743..adf5125457 100644
--- a/datafusion/proto/src/generated/mod.rs
+++ b/datafusion/proto/src/generated/mod.rs
@@ -15,6 +15,8 @@
// specific language governing permissions and limitations
// under the License.
+#![allow(clippy::allow_attributes)]
+
#[allow(clippy::all)]
#[rustfmt::skip]
pub mod datafusion {
diff --git a/datafusion/proto/src/lib.rs b/datafusion/proto/src/lib.rs
index 7ddc930fa2..e30d2a2234 100644
--- a/datafusion/proto/src/lib.rs
+++ b/datafusion/proto/src/lib.rs
@@ -23,6 +23,7 @@
// Make sure fast / cheap clones on Arc are explicit:
// https://github.com/apache/datafusion/issues/11143
#![deny(clippy::clone_on_ref_ptr)]
+#![deny(clippy::allow_attributes)]
#![cfg_attr(test, allow(clippy::needless_pass_by_value))]
//! Serialize / Deserialize DataFusion Plans to bytes
diff --git a/datafusion/proto/src/logical_plan/file_formats.rs b/datafusion/proto/src/logical_plan/file_formats.rs
index 96a707e08a..508edd3eff 100644
--- a/datafusion/proto/src/logical_plan/file_formats.rs
+++ b/datafusion/proto/src/logical_plan/file_formats.rs
@@ -364,8 +364,7 @@ mod parquet {
};
let column_specific_options = global_options.column_specific_options;
- #[allow(deprecated)] // max_statistics_size
- TableParquetOptionsProto {
+ TableParquetOptionsProto {
global: Some(ParquetOptionsProto {
enable_page_index: global_options.global.enable_page_index,
pruning: global_options.global.pruning,
@@ -462,8 +461,7 @@ mod parquet {
impl From<&ParquetOptionsProto> for ParquetOptions {
fn from(proto: &ParquetOptionsProto) -> Self {
- #[allow(deprecated)] // max_statistics_size
- ParquetOptions {
+ ParquetOptions {
enable_page_index: proto.enable_page_index,
pruning: proto.pruning,
skip_metadata: proto.skip_metadata,
@@ -524,8 +522,7 @@ mod parquet {
impl From<ParquetColumnOptionsProto> for ParquetColumnOptions {
fn from(proto: ParquetColumnOptionsProto) -> Self {
- #[allow(deprecated)] // max_statistics_size
- ParquetColumnOptions {
+ ParquetColumnOptions {
bloom_filter_enabled: proto.bloom_filter_enabled_opt.map(
|parquet_column_options::BloomFilterEnabledOpt::BloomFilterEnabled(v)| v,
),
diff --git a/datafusion/proto/src/logical_plan/mod.rs b/datafusion/proto/src/logical_plan/mod.rs
index e7a619cd89..218c2e4e47 100644
--- a/datafusion/proto/src/logical_plan/mod.rs
+++ b/datafusion/proto/src/logical_plan/mod.rs
@@ -422,14 +422,17 @@ impl AsLogicalPlan for LogicalPlanNode {
}
Arc::new(json)
}
- #[cfg_attr(not(feature = "avro"), allow(unused_variables))]
FileFormatType::Avro(..) => {
#[cfg(feature = "avro")]
{
Arc::new(AvroFormat)
}
#[cfg(not(feature = "avro"))]
- panic!("Unable to process avro file since `avro` feature is not enabled");
+ {
+ panic!(
+ "Unable to process avro file since `avro` feature is not enabled"
+ );
+ }
}
FileFormatType::Arrow(..) => {
Arc::new(ArrowFormat)
diff --git a/datafusion/proto/src/physical_plan/mod.rs b/datafusion/proto/src/physical_plan/mod.rs
index 6b8a1e545a..5c64dfbce3 100644
--- a/datafusion/proto/src/physical_plan/mod.rs
+++ b/datafusion/proto/src/physical_plan/mod.rs
@@ -155,11 +155,9 @@ impl AsExecutionPlan for protobuf::PhysicalPlanNode {
PhysicalPlanType::JsonScan(scan) => {
self.try_into_json_scan_physical_plan(scan, ctx, extension_codec)
}
- #[cfg_attr(not(feature = "parquet"), allow(unused_variables))]
PhysicalPlanType::ParquetScan(scan) => {
self.try_into_parquet_scan_physical_plan(scan, ctx, extension_codec)
}
- #[cfg_attr(not(feature = "avro"), allow(unused_variables))]
PhysicalPlanType::AvroScan(scan) => {
self.try_into_avro_scan_physical_plan(scan, ctx, extension_codec)
}
@@ -672,7 +670,7 @@ impl protobuf::PhysicalPlanNode {
Ok(DataSourceExec::from_data_source(scan_conf))
}
- #[cfg_attr(not(feature = "parquet"), allow(unused_variables))]
+ #[cfg_attr(not(feature = "parquet"), expect(unused_variables))]
fn try_into_parquet_scan_physical_plan(
&self,
scan: &protobuf::ParquetScanExecNode,
@@ -740,7 +738,7 @@ impl protobuf::PhysicalPlanNode {
)
}
- #[cfg_attr(not(feature = "avro"), allow(unused_variables))]
+ #[cfg_attr(not(feature = "avro"), expect(unused_variables))]
fn try_into_avro_scan_physical_plan(
&self,
scan: &protobuf::AvroScanExecNode,
@@ -759,6 +757,7 @@ impl protobuf::PhysicalPlanNode {
)?;
Ok(DataSourceExec::from_data_source(conf))
}
+
#[cfg(not(feature = "avro"))]
panic!("Unable to process a Avro PhysicalPlan when `avro` feature is not enabled")
}
diff --git a/datafusion/pruning/src/lib.rs b/datafusion/pruning/src/lib.rs
index be17f29eaa..9f8142447b 100644
--- a/datafusion/pruning/src/lib.rs
+++ b/datafusion/pruning/src/lib.rs
@@ -16,6 +16,7 @@
// under the License.
#![cfg_attr(test, allow(clippy::needless_pass_by_value))]
+#![deny(clippy::allow_attributes)]
mod file_pruner;
mod pruning_predicate;
diff --git a/datafusion/pruning/src/pruning_predicate.rs b/datafusion/pruning/src/pruning_predicate.rs
index 32f2371f79..b5b8267d7f 100644
--- a/datafusion/pruning/src/pruning_predicate.rs
+++ b/datafusion/pruning/src/pruning_predicate.rs
@@ -604,8 +604,6 @@ impl PruningPredicate {
is_always_true(&self.predicate_expr) && self.literal_guarantees.is_empty()
}
- // this is only used by `parquet` feature right now
- #[allow(dead_code)]
pub fn required_columns(&self) -> &RequiredColumns {
&self.required_columns
}
@@ -744,8 +742,6 @@ impl RequiredColumns {
/// * `a > 5 OR a < 10` returns `Some(a)`
/// * `a > 5 OR b < 10` returns `None`
/// * `true` returns None
- #[allow(dead_code)]
- // this fn is only used by `parquet` feature right now, thus the `allow(dead_code)`
pub fn single_column(&self) -> Option<&phys_expr::Column> {
if self.columns.windows(2).all(|w| {
// check if all columns are the same (ignoring statistics and field)
diff --git a/datafusion/session/src/lib.rs b/datafusion/session/src/lib.rs
index 11f734e757..3d3cb541b5 100644
--- a/datafusion/session/src/lib.rs
+++ b/datafusion/session/src/lib.rs
@@ -16,6 +16,7 @@
// under the License.
#![cfg_attr(test, allow(clippy::needless_pass_by_value))]
+#![deny(clippy::allow_attributes)]
//! Session management for DataFusion query execution environment
//!