Skip to content

Commit 0eae0ea

Browse files
committed
Move stage along with the other execution plan implementations
1 parent 45d29b2 commit 0eae0ea

File tree

12 files changed

+637
-711
lines changed

12 files changed

+637
-711
lines changed

src/execution_plans/arrow_flight_read.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use crate::channel_manager_ext::get_distributed_channel_resolver;
22
use crate::config_extension_ext::ContextGrpcMetadata;
33
use crate::errors::{map_flight_to_datafusion_error, map_status_to_datafusion_error};
4+
use crate::execution_plans::StageExec;
45
use crate::flight_service::{DoGet, StageKey};
56
use crate::protobuf::{proto_from_stage, DistributedCodec};
6-
use crate::stage::ExecutionStage;
77
use crate::ChannelResolver;
88
use arrow_flight::decode::FlightRecordBatchStream;
99
use arrow_flight::error::FlightError;
@@ -161,7 +161,7 @@ impl ExecutionPlan for ArrowFlightReadExec {
161161

162162
let stage = context
163163
.session_config()
164-
.get_extension::<ExecutionStage>()
164+
.get_extension::<StageExec>()
165165
.ok_or(internal_datafusion_err!(
166166
"ArrowFlightReadExec requires an ExecutionStage in the session config"
167167
))?;
@@ -218,7 +218,7 @@ impl ExecutionPlan for ArrowFlightReadExec {
218218
);
219219

220220
async move {
221-
let url = task.url()?.ok_or(internal_datafusion_err!(
221+
let url = task.url.ok_or(internal_datafusion_err!(
222222
"ArrowFlightReadExec: task is unassigned, cannot proceed"
223223
))?;
224224

src/execution_plans/mod.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
mod arrow_flight_read;
22
mod partition_isolator;
3+
mod stage;
34

45
pub use arrow_flight_read::ArrowFlightReadExec;
56
pub use partition_isolator::{PartitionGroup, PartitionIsolatorExec};
7+
pub use stage::{display_stage_graphviz, ExecutionTask, StageExec};

0 commit comments

Comments
 (0)