fix

Author: adriangb

datafusion/core/src/physical_planner.rs

@@ -2720,8 +2720,11 @@ impl DefaultPhysicalPlanner {
             ExplainAnalyzeLevel::Summary => vec![MetricType::SUMMARY],
             ExplainAnalyzeLevel::Dev => vec![MetricType::SUMMARY, MetricType::DEV],
         };
-        let analyze_categories =
-            session_state.config_options().explain.analyze_categories.clone();
+        let analyze_categories = session_state
+            .config_options()
+            .explain
+            .analyze_categories
+            .clone();
         let metric_categories = match analyze_categories {
             ExplainAnalyzeCategories::All => None,
             ExplainAnalyzeCategories::Only(cats) => Some(cats),

datafusion/core/tests/sql/explain_analyze.rs

@@ -1205,11 +1205,7 @@ async fn explain_analyze_categories() {
             false,
         ),
         // "none" — plan only, no metrics at all
-        (
-            ExplainAnalyzeCategories::Only(vec![]),
-            "output_rows",
-            false,
-        ),
+        (ExplainAnalyzeCategories::Only(vec![]), "output_rows", false),
         (
             ExplainAnalyzeCategories::Only(vec![]),
             "elapsed_compute",

datafusion/datasource-parquet/src/opener.rs

@@ -48,8 +48,8 @@ use datafusion_physical_expr_common::physical_expr::{
     PhysicalExpr, is_dynamic_physical_expr,
 };
 use datafusion_physical_plan::metrics::{
-    BaselineMetrics, Count, ExecutionPlanMetricsSet, Gauge, MetricBuilder, MetricCategory,
-    PruningMetrics,
+    BaselineMetrics, Count, ExecutionPlanMetricsSet, Gauge, MetricBuilder,
+    MetricCategory, PruningMetrics,
 };
 use datafusion_pruning::{FilePruner, PruningPredicate, build_pruning_predicate};
 

datafusion/physical-plan/src/analyze.rs

@@ -321,6 +321,7 @@ mod tests {
             true,
             false,
             vec![MetricType::SUMMARY, MetricType::DEV],
+            None,
             blocking_exec,
             schema,
         ));

datafusion/physical-plan/src/display.rs

@@ -469,8 +469,7 @@ impl ExecutionPlanVisitor for IndentVisitor<'_, '_> {
             }
             ShowMetrics::Full => {
                 if let Some(metrics) = plan.metrics() {
-                    let mut metrics =
-                        metrics.filter_by_metric_types(self.metric_types);
+                    let mut metrics = metrics.filter_by_metric_types(self.metric_types);
                     if let Some(cats) = self.metric_categories {
                         metrics = metrics.filter_by_categories(cats);
                     }
@@ -565,8 +564,7 @@ impl ExecutionPlanVisitor for GraphvizVisitor<'_, '_> {
             }
             ShowMetrics::Full => {
                 if let Some(metrics) = plan.metrics() {
-                    let mut metrics =
-                        metrics.filter_by_metric_types(self.metric_types);
+                    let mut metrics = metrics.filter_by_metric_types(self.metric_types);
                     if let Some(cats) = self.metric_categories {
                         metrics = metrics.filter_by_categories(cats);
                     }

datafusion/physical-plan/src/joins/sort_merge_join/metrics.rs

@@ -18,8 +18,8 @@
 //! Module for tracking Sort Merge Join metrics
 
 use crate::metrics::{
-    BaselineMetrics, Count, ExecutionPlanMetricsSet, Gauge, MetricBuilder, MetricCategory,
-    SpillMetrics, Time,
+    BaselineMetrics, Count, ExecutionPlanMetricsSet, Gauge, MetricBuilder,
+    MetricCategory, SpillMetrics, Time,
 };
 
 /// Metrics for SortMergeJoinExec

datafusion/physical-plan/src/unnest.rs

@@ -23,8 +23,7 @@ use std::{any::Any, sync::Arc};
 
 use super::metrics::{
     self, BaselineMetrics, ExecutionPlanMetricsSet, MetricBuilder, MetricCategory,
-    MetricsSet,
-    RecordOutput,
+    MetricsSet, RecordOutput,
 };
 use super::{DisplayAs, ExecutionPlanProperties, PlanProperties};
 use crate::{

datafusion/proto/src/physical_plan/mod.rs

@@ -2320,20 +2320,19 @@ impl protobuf::PhysicalPlanNode {
             codec,
             proto_converter,
         )?;
-        let (has_metric_categories, metric_categories) =
-            match exec.metric_categories() {
-                Some(cats) => (
-                    true,
-                    cats.iter()
-                        .map(|c| match c {
-                            MetricCategory::Rows => "rows".to_string(),
-                            MetricCategory::Bytes => "bytes".to_string(),
-                            MetricCategory::Timing => "timing".to_string(),
-                        })
-                        .collect(),
-                ),
-                None => (false, vec![]),
-            };
+        let (has_metric_categories, metric_categories) = match exec.metric_categories() {
+            Some(cats) => (
+                true,
+                cats.iter()
+                    .map(|c| match c {
+                        MetricCategory::Rows => "rows".to_string(),
+                        MetricCategory::Bytes => "bytes".to_string(),
+                        MetricCategory::Timing => "timing".to_string(),
+                    })
+                    .collect(),
+            ),
+            None => (false, vec![]),
+        };
         Ok(protobuf::PhysicalPlanNode {
             physical_plan_type: Some(PhysicalPlanType::Analyze(Box::new(
                 protobuf::AnalyzeExecNode {