Skip to content

Commit 5726954

Browse files
committed
resolve conflicts
1 parent 5e40270 commit 5726954

File tree

5 files changed

+7
-12
lines changed

5 files changed

+7
-12
lines changed

datafusion/core/src/datasource/listing/table.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ use datafusion_common::stats::Precision;
5757
use datafusion_datasource::compute_all_files_statistics;
5858
use datafusion_datasource::file_groups::FileGroup;
5959
use datafusion_physical_expr_common::sort_expr::LexRequirement;
60-
use datafusion_physical_plan::statistics::add_row_stats;
6160
use futures::{future, stream, Stream, StreamExt, TryStreamExt};
6261
use itertools::Itertools;
6362
use object_store::ObjectStore;

datafusion/datasource/src/source.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ use std::sync::Arc;
2525
use datafusion_physical_plan::execution_plan::{Boundedness, EmissionType};
2626
use datafusion_physical_plan::metrics::{ExecutionPlanMetricsSet, MetricsSet};
2727
use datafusion_physical_plan::projection::ProjectionExec;
28+
use datafusion_physical_plan::statistics::PartitionedStatistics;
2829
use datafusion_physical_plan::{
2930
DisplayAs, DisplayFormatType, ExecutionPlan, PlanProperties,
3031
};
@@ -188,9 +189,7 @@ impl ExecutionPlan for DataSourceExec {
188189
self.data_source.statistics()
189190
}
190191

191-
fn statistics_by_partition(
192-
&self,
193-
) -> datafusion_common::Result<PartitionedStatistics> {
192+
fn statistics_by_partition(&self) -> Result<PartitionedStatistics> {
194193
let mut statistics = {
195194
let mut v =
196195
Vec::with_capacity(self.properties().partitioning.partition_count());

datafusion/datasource/src/statistics.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ use datafusion_common::stats::Precision;
3636
use datafusion_common::{plan_datafusion_err, plan_err, DataFusionError, Result};
3737
use datafusion_physical_expr::{expressions::Column, PhysicalSortExpr};
3838
use datafusion_physical_expr_common::sort_expr::LexOrdering;
39-
pub(crate) use datafusion_physical_plan::statistics::{
40-
add_row_stats, compute_summary_statistics, set_max_if_greater, set_min_if_lesser,
41-
};
4239
use datafusion_physical_plan::{ColumnStatistics, Statistics};
4340

4441
/// A normalized representation of file min/max statistics that allows for efficient sorting & comparison.
@@ -479,7 +476,7 @@ pub fn compute_all_files_statistics(
479476
// Then summary statistics across all file groups
480477
let file_groups_statistics = file_groups_with_stats
481478
.iter()
482-
.filter_map(|file_group| file_group.statistics());
479+
.filter_map(|file_group| file_group.statistics().as_deref());
483480

484481
let mut statistics =
485482
Statistics::try_merge_iter(file_groups_statistics, &table_schema)?;

datafusion/physical-optimizer/src/enforce_sorting/replace_with_order_preserving_variants.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use datafusion_physical_plan::execution_plan::EmissionType;
3434
use datafusion_physical_plan::repartition::RepartitionExec;
3535
use datafusion_physical_plan::sorts::sort_preserving_merge::SortPreservingMergeExec;
3636
use datafusion_physical_plan::tree_node::PlanContext;
37-
use datafusion_physical_plan::{ExecutionPlan, ExecutionPlanProperties};
37+
use datafusion_physical_plan::ExecutionPlanProperties;
3838

3939
use itertools::izip;
4040

@@ -205,9 +205,8 @@ pub fn plan_with_order_breaking_variants(
205205
// Replace `SortPreservingMergeExec` with a `CoalescePartitionsExec`
206206
// SPM may have `fetch`, so pass it to the `CoalescePartitionsExec`
207207
let child = Arc::clone(&sort_input.children[0].plan);
208-
let coalesce = CoalescePartitionsExec::new(child)
209-
.with_fetch(plan.fetch())
210-
.unwrap();
208+
let coalesce =
209+
Arc::new(CoalescePartitionsExec::new(child).with_fetch(plan.fetch()));
211210
sort_input.plan = coalesce;
212211
} else {
213212
return sort_input.update_plan_from_children();

datafusion/physical-plan/src/coalesce_batches.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ use std::task::{Context, Poll};
2424

2525
use super::metrics::{BaselineMetrics, ExecutionPlanMetricsSet, MetricsSet};
2626
use super::{DisplayAs, ExecutionPlanProperties, PlanProperties, Statistics};
27+
use crate::statistics::PartitionedStatistics;
2728
use crate::{
2829
DisplayFormatType, ExecutionPlan, RecordBatchStream, SendableRecordBatchStream,
2930
};

0 commit comments

Comments
 (0)