fix test, lint

Author: adriangb

datafusion/datasource-parquet/src/opener.rs

@@ -166,7 +166,6 @@ impl FileOpener for ParquetOpener {
             .global_counter("num_predicate_creation_errors");
 
         let expr_adapter_factory = self.expr_adapter_factory.clone();
-        let partition_fields = self.table_schema.table_partition_cols().to_vec();
         let mut predicate_file_schema = Arc::clone(self.table_schema.file_schema());
 
         let enable_page_index = self.enable_page_index;
@@ -191,7 +190,7 @@ impl FileOpener for ParquetOpener {
             let mut file_pruner = predicate
                 .as_ref()
                 .filter(|p| {
-                    is_dynamic_physical_expr(p) || partitioned_file.has_statistics()
+                    is_dynamic_physical_expr(p) && partitioned_file.has_statistics()
                 })
                 .and_then(|p| {
                     FilePruner::try_new(
@@ -1241,15 +1240,15 @@ mod test {
             }
         };
 
-        // // This filter could prune based on statistics, but since it's not dynamic it's not applied for pruning
-        // // (the assumption is this happened already at planning time)
-        let expr = col("a").eq(lit(42)).and(col("part").eq(lit(1)));
-        // let predicate = logical2physical(&expr, &table_schema);
-        // let opener = make_opener(predicate);
-        // let stream = opener.open(file.clone()).unwrap().await.unwrap();
-        // let (num_batches, num_rows) = count_batches_and_rows(stream).await;
-        // assert_eq!(num_batches, 1);
-        // assert_eq!(num_rows, 3);
+        // This filter could prune based on statistics, but since it's not dynamic it's not applied for pruning
+        // (the assumption is this happened already at planning time)
+        let expr = col("a").eq(lit(42));
+        let predicate = logical2physical(&expr, &table_schema);
+        let opener = make_opener(predicate);
+        let stream = opener.open(file.clone()).unwrap().await.unwrap();
+        let (num_batches, num_rows) = count_batches_and_rows(stream).await;
+        assert_eq!(num_batches, 1);
+        assert_eq!(num_rows, 3);
 
         // If we make the filter dynamic, it should prune.
         // This allows dynamic filters to prune partitions/files even if they are populated late into execution.