Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions datafusion/substrait/src/logical_plan/consumer/expr/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ mod field_reference;
mod function_arguments;
mod if_then;
mod literal;
mod nested;
mod scalar_function;
mod singular_or_list;
mod subquery;
Expand All @@ -32,6 +33,7 @@ pub use field_reference::*;
pub use function_arguments::*;
pub use if_then::*;
pub use literal::*;
pub use nested::*;
pub use scalar_function::*;
pub use singular_or_list::*;
pub use subquery::*;
Expand Down
60 changes: 60 additions & 0 deletions datafusion/substrait/src/logical_plan/consumer/expr/nested.rs
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see the substrait producer does not currently have support for Nested types as well -- it will never produce a substrait plan with a Nested type in it. This means means roundtrips with DataFusion's substrait producer <-> consumer are not possible, but it is possible to have NestedType from an external substrait producer, so I think this is a valid solution still.

Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

use crate::logical_plan::consumer::SubstraitConsumer;
use crate::logical_plan::consumer::expr::from_substrait_rex;
use datafusion::common::{DFSchema, not_impl_err, substrait_err};
use datafusion::execution::FunctionRegistry;
use datafusion::logical_expr::Expr;
use substrait::proto::expression::Nested;
use substrait::proto::expression::nested::NestedType;

/// Convert a Substrait Nested expression (List, Struct, Map constructors) to a DataFusion Expr.
///
/// Nested::List is converted to a `make_array(...)` scalar function call.
pub async fn from_nested(
consumer: &impl SubstraitConsumer,
nested: &Nested,
input_schema: &DFSchema,
) -> datafusion::common::Result<Expr> {
let Some(nested_type) = nested.nested_type.as_ref() else {
return substrait_err!("Nested expression must set nested_type");
};

match nested_type {
NestedType::List(list) => {
let mut args = Vec::with_capacity(list.values.len());
for expr in &list.values {
args.push(from_substrait_rex(consumer, expr, input_schema).await?);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be just consumed with the consumer instead of directly calling from_substrait_rex

}

let make_array_udf = consumer.get_function_registry().udf("make_array")?;
Ok(Expr::ScalarFunction(
datafusion::logical_expr::expr::ScalarFunction::new_udf(
make_array_udf.to_owned(),
args,
),
))
}
NestedType::Struct(_) => {
not_impl_err!("Nested Struct expression is not yet supported")
}
NestedType::Map(_) => {
not_impl_err!("Nested Map expression is not yet supported")
}
Comment on lines +53 to +58
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we support these types as well?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd say this PR is well scoped enough that those can be follow up, given the current support for NestedType is 0 anyways we aren't breaking anything.

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
use super::{
from_aggregate_rel, from_cast, from_cross_rel, from_exchange_rel, from_fetch_rel,
from_field_reference, from_filter_rel, from_if_then, from_join_rel, from_literal,
from_project_rel, from_read_rel, from_scalar_function, from_set_rel,
from_nested, from_project_rel, from_read_rel, from_scalar_function, from_set_rel,
from_singular_or_list, from_sort_rel, from_subquery, from_substrait_rel,
from_substrait_rex, from_window_function,
};
Expand Down Expand Up @@ -342,10 +342,10 @@ pub trait SubstraitConsumer: Send + Sync + Sized {

async fn consume_nested(
&self,
_expr: &Nested,
_input_schema: &DFSchema,
expr: &Nested,
input_schema: &DFSchema,
) -> datafusion::common::Result<Expr> {
not_impl_err!("Nested expression not supported")
from_nested(self, expr, input_schema).await
}
Comment on lines +346 to 349
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you think we should add a test in datafusion/substrait/tests/cases/logical_plans.rs?


async fn consume_enum(
Expand Down