Skip to content

Commit 98ad8dd

Browse files
authored
Merge branch 'main' into semver_ci_clean
2 parents 074453d + ca55f1c commit 98ad8dd

File tree

29 files changed

+743
-372
lines changed

29 files changed

+743
-372
lines changed

Cargo.lock

Lines changed: 28 additions & 94 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

datafusion-examples/examples/parquet_index.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ use arrow::datatypes::{Int32Type, SchemaRef};
2323
use arrow::util::pretty::pretty_format_batches;
2424
use async_trait::async_trait;
2525
use datafusion::catalog::Session;
26+
use datafusion::common::pruning::PruningStatistics;
2627
use datafusion::common::{
2728
internal_datafusion_err, DFSchema, DataFusionError, Result, ScalarValue,
2829
};
@@ -39,7 +40,7 @@ use datafusion::parquet::arrow::{
3940
arrow_reader::ParquetRecordBatchReaderBuilder, ArrowWriter,
4041
};
4142
use datafusion::physical_expr::PhysicalExpr;
42-
use datafusion::physical_optimizer::pruning::{PruningPredicate, PruningStatistics};
43+
use datafusion::physical_optimizer::pruning::PruningPredicate;
4344
use datafusion::physical_plan::ExecutionPlan;
4445
use datafusion::prelude::*;
4546
use std::any::Any;

datafusion-examples/examples/pruning.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@ use std::sync::Arc;
2020

2121
use arrow::array::{ArrayRef, BooleanArray, Int32Array};
2222
use arrow::datatypes::{DataType, Field, Schema, SchemaRef};
23+
use datafusion::common::pruning::PruningStatistics;
2324
use datafusion::common::{DFSchema, ScalarValue};
2425
use datafusion::execution::context::ExecutionProps;
2526
use datafusion::physical_expr::create_physical_expr;
26-
use datafusion::physical_optimizer::pruning::{PruningPredicate, PruningStatistics};
27+
use datafusion::physical_optimizer::pruning::PruningPredicate;
2728
use datafusion::prelude::*;
2829

2930
/// This example shows how to use DataFusion's `PruningPredicate` to prove

datafusion/common/src/config.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,9 @@ config_namespace! {
292292
/// target batch size is determined by the configuration setting
293293
pub coalesce_batches: bool, default = true
294294

295-
/// Should DataFusion collect statistics after listing files
295+
/// Should DataFusion collect statistics when first creating a table.
296+
/// Has no effect after the table is created. Applies to the default
297+
/// `ListingTableProvider` in DataFusion. Defaults to false.
296298
pub collect_statistics: bool, default = false
297299

298300
/// Number of partitions for query execution. Increasing partitions can increase

datafusion/common/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ pub mod format;
4747
pub mod hash_utils;
4848
pub mod instant;
4949
pub mod parsers;
50+
pub mod pruning;
5051
pub mod rounding;
5152
pub mod scalar;
5253
pub mod spans;

0 commit comments

Comments
 (0)