Skip to content

Commit fc8623e

Browse files
committed
Add deprecation markers and fixes for CI.
1 parent f3d20d0 commit fc8623e

3 files changed

Lines changed: 13 additions & 3 deletions

File tree

datafusion/core/tests/fuzz_cases/once_exec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ impl ExecutionPlan for OnceExec {
9797
fn with_new_children(
9898
self: Arc<Self>,
9999
children: Vec<Arc<dyn ExecutionPlan>>,
100-
) -> datafusion_common::Result<Arc<dyn ExecutionPlan>> {
100+
) -> Result<Arc<dyn ExecutionPlan>> {
101101
self.replace_children(children, ChildrenPropertiesHint::Recompute)
102102
}
103103

@@ -106,7 +106,7 @@ impl ExecutionPlan for OnceExec {
106106
&self,
107107
partition: usize,
108108
_context: Arc<TaskContext>,
109-
) -> datafusion_common::Result<SendableRecordBatchStream> {
109+
) -> Result<SendableRecordBatchStream> {
110110
assert_eq!(partition, 0);
111111

112112
let stream = self.stream.lock().unwrap().take();

datafusion/physical-plan/src/display.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1578,10 +1578,10 @@ mod tests {
15781578
use insta::assert_snapshot;
15791579

15801580
use super::super::DisplayableExecutionPlan;
1581-
use crate::ChildrenPropertiesHint;
15821581
use crate::empty::EmptyExec;
15831582
use crate::filter::FilterExec;
15841583
use crate::projection::ProjectionExec;
1584+
use crate::{ChildrenPropertiesHint, ExecutionPlan};
15851585
use datafusion_physical_expr::expressions::{binary, col, lit};
15861586
use datafusion_physical_expr::{Partitioning, PhysicalExpr};
15871587

datafusion/physical-plan/src/execution_plan.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ pub trait ExecutionPlan: Any + Debug + DisplayAs + Send + Sync {
249249

250250
/// Returns a clone of the existing plan with the children replaced, skipping
251251
/// recomputation of plan properties if possible as indicated by the hint.
252+
#[expect(deprecated)]
252253
fn replace_children(
253254
self: Arc<Self>,
254255
children: Vec<Arc<dyn ExecutionPlan>>,
@@ -264,6 +265,10 @@ pub trait ExecutionPlan: Any + Debug + DisplayAs + Send + Sync {
264265

265266
/// Returns a new `ExecutionPlan` where all existing children were replaced
266267
/// by the `children`, in order
268+
#[deprecated(
269+
since = "55.0.0",
270+
note = "Use `ExecutionPlan::replace_children` with ChildrenPropertiesHint::Recompute"
271+
)]
267272
fn with_new_children(
268273
self: Arc<Self>,
269274
children: Vec<Arc<dyn ExecutionPlan>>,
@@ -283,6 +288,11 @@ pub trait ExecutionPlan: Any + Debug + DisplayAs + Send + Sync {
283288
///
284289
/// Callers should route through [`with_new_children_if_necessary`] and
285290
/// not invoke this method directly.
291+
#[deprecated(
292+
since = "55.0.0",
293+
note = "Use `ExecutionPlan::replace_children` with ChildrenPropertiesHint::SameProperties"
294+
)]
295+
#[expect(deprecated)]
286296
fn with_new_children_and_same_properties(
287297
self: Arc<Self>,
288298
children: Vec<Arc<dyn ExecutionPlan>>,

0 commit comments

Comments
 (0)