update

Author: xudong963

datafusion/core/tests/parquet/mod.rs

@@ -173,12 +173,13 @@ impl TestOutput {
                 if let MetricValue::PruningMetrics {
                     pruning_metrics, ..
                 } = metric.value()
-            {
-                total_pruned += pruning_metrics.pruned();
-                total_matched += pruning_metrics.matched();
-                total_fully_matched += pruning_metrics.fully_matched();
+                {
+                    total_pruned += pruning_metrics.pruned();
+                    total_matched += pruning_metrics.matched();
+                    total_fully_matched += pruning_metrics.fully_matched();
 
-                found = true;
+                    found = true;
+                }
             }
         }
 
@@ -215,18 +216,6 @@ impl TestOutput {
             .map(|pm| pm.total_fully_matched())
     }
 
-    /*
-    /// The number of row_groups fully matched by statistics
-    fn row_groups_fully_matched_statistics(&self) -> Option<usize> {
-        self.metric_value("row_groups_fully_matched_statistics")
-    }
-
-    /// The number of row groups pruned by limit pruning
-    fn limit_pruned_row_groups(&self) -> Option<usize> {
-        self.metric_value("limit_pruned_row_groups")
-    }
-    */
-
     /// The number of row_groups pruned by statistics
     fn row_groups_pruned_statistics(&self) -> Option<usize> {
         self.pruning_metric("row_groups_pruned_statistics")

datafusion/core/tests/parquet/row_group_pruning.rs

@@ -1900,8 +1900,8 @@ async fn test_limit_pruning_complex_filter() -> datafusion_common::error::Result
 }
 
 #[tokio::test]
-async fn test_limit_pruning_multiple_fully_matched()
--> datafusion_common::error::Result<()> {
+async fn test_limit_pruning_multiple_fully_matched(
+) -> datafusion_common::error::Result<()> {
     // Test Case 2: Limit requires multiple fully matched row groups
     // Row Group 0: a=[5,5,5,5] -> Fully matched, 4 rows
     // Row Group 1: a=[5,5,5,5] -> Fully matched, 4 rows

datafusion/datasource-parquet/src/metrics.rs

@@ -52,12 +52,6 @@ pub struct ParquetFileMetrics {
     pub row_groups_pruned_statistics: PruningMetrics,
     /// Number of row groups whose bloom filters were checked and matched (not pruned)
     pub row_groups_matched_bloom_filter: Count,
-    /// Number of row groups pruned due to limit pruning.
-    pub limit_pruned_row_groups: Count,
-    /// Number of row groups whose statistics were checked and fully matched
-    pub row_groups_fully_matched_statistics: Count,
-    /// Number of row groups whose statistics were checked and matched (not pruned)
-    pub row_groups_matched_statistics: Count,
     /// Total number of bytes scanned
     pub bytes_scanned: Count,
     /// Total rows filtered out by predicates pushed into parquet scan
@@ -174,8 +168,6 @@ impl ParquetFileMetrics {
             predicate_evaluation_errors,
             row_groups_matched_bloom_filter,
             row_groups_pruned_bloom_filter,
-            row_groups_fully_matched_statistics,
-            row_groups_matched_statistics,
             row_groups_pruned_statistics,
             limit_pruned_row_groups,
             bytes_scanned,