Skip to content

Commit ec8c78e

Browse files
committed
Adapt planner to DataFusion 51 APIs
1 parent 786e865 commit ec8c78e

18 files changed

Lines changed: 136 additions & 85 deletions

Cargo.lock

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

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ delta_kernel = { version = "0.19.0" }
6060
cornucopia = { version = "0.9.0" }
6161
cornucopia_async = {version = "0.6.0"}
6262
deadpool-postgres = "0.14"
63-
prost = { version = "0.13", features = ["no-recursion-limit"] }
64-
prost-reflect = "0.14.0"
65-
prost-build = { version = "0.13" }
66-
prost-types = "0.13"
63+
prost = { version = "0.14", features = ["no-recursion-limit"] }
64+
prost-reflect = "0.16.0"
65+
prost-build = { version = "0.14" }
66+
prost-types = "0.14"
6767
aws-config = "=1.8.0"
6868
reqwest = "0.12"
6969
rusqlite = "0.31"

crates/arroyo-planner/src/builder.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use datafusion::common::{
1313
DFSchema, DFSchemaRef, DataFusionError, Result, ScalarValue, Spans, TableReference, plan_err,
1414
};
1515
use datafusion::execution::context::SessionState;
16-
use datafusion::execution::runtime_env::RuntimeEnvBuilder;
1716
use datafusion::functions::datetime::date_bin;
1817
use datafusion::logical_expr::{Expr, Extension, LogicalPlan, UserDefinedLogicalNode};
1918
use datafusion::physical_expr::PhysicalExpr;
@@ -161,11 +160,8 @@ impl<'a> Planner<'a> {
161160
.ok_or_else(|| DataFusionError::Plan("missing input".to_string()))?;
162161

163162
// need to convert to ExecutionPlan to get the partial schema.
164-
let partial_aggregation_exec_plan = partial_aggregation_plan.try_into_physical_plan(
165-
self.schema_provider,
166-
&RuntimeEnvBuilder::new().build().unwrap(),
167-
&codec,
168-
)?;
163+
let partial_aggregation_exec_plan =
164+
partial_aggregation_plan.try_into_physical_plan(self.schema_provider, &codec)?;
169165

170166
let partial_schema = partial_aggregation_exec_plan.schema();
171167
let final_input_table_provider =
@@ -244,7 +240,7 @@ impl ExtensionPlanner for ArroyoExtensionPlanner {
244240
physical_inputs: &[Arc<dyn ExecutionPlan>],
245241
_session_state: &SessionState,
246242
) -> Result<Option<Arc<dyn ExecutionPlan>>> {
247-
let schema = node.schema().as_ref().into();
243+
let schema = node.schema().as_arrow().clone();
248244
if let Ok::<&dyn ArroyoExtension, _>(arroyo_extension) = node.try_into()
249245
&& arroyo_extension.transparent()
250246
{

0 commit comments

Comments
 (0)