feat(ffi): plumb simplify, expressions, reverse_expr, and documentation through FFI_WindowUDF
#22705
+757
−9
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| // 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 std::sync::Arc; | ||
|
|
||
| use arrow::ffi::FFI_ArrowSchema; | ||
| use arrow_schema::FieldRef; | ||
| use datafusion_common::{DataFusionError, Result}; | ||
| use datafusion_expr::function::ExpressionArgs; | ||
| use datafusion_physical_expr::PhysicalExpr; | ||
| use stabby::vec::Vec as SVec; | ||
|
|
||
| use crate::arrow_wrappers::WrappedSchema; | ||
| use crate::physical_expr::FFI_PhysicalExpr; | ||
| use crate::util::rvec_wrapped_to_vec_fieldref; | ||
|
|
||
| /// A stable struct for sharing [`ExpressionArgs`] across FFI boundaries. | ||
| #[repr(C)] | ||
| #[derive(Debug)] | ||
| pub struct FFI_ExpressionArgs { | ||
| input_exprs: SVec<FFI_PhysicalExpr>, | ||
| input_fields: SVec<WrappedSchema>, | ||
| } | ||
|
|
||
| impl TryFrom<ExpressionArgs<'_>> for FFI_ExpressionArgs { | ||
| type Error = DataFusionError; | ||
|
|
||
| fn try_from(args: ExpressionArgs) -> Result<Self> { | ||
| let input_exprs = args | ||
| .input_exprs() | ||
| .iter() | ||
| .map(Arc::clone) | ||
| .map(FFI_PhysicalExpr::from) | ||
| .collect(); | ||
|
|
||
| let input_fields = args | ||
| .input_fields() | ||
| .iter() | ||
| .map(|field| FFI_ArrowSchema::try_from(field.as_ref()).map(WrappedSchema)) | ||
| .collect::<Result<Vec<_>, _>>()? | ||
| .into_iter() | ||
| .collect(); | ||
|
|
||
| Ok(Self { | ||
| input_exprs, | ||
| input_fields, | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| pub struct ForeignExpressionArgs { | ||
| input_exprs: Vec<Arc<dyn PhysicalExpr>>, | ||
| input_fields: Vec<FieldRef>, | ||
| } | ||
|
Member
There was a problem hiding this comment. Why have a If that's the case then I think we should follow the naming convention like
Contributor
Author
There was a problem hiding this comment. You're correct it exists because ExpressionArgs<'_> holds borrows, so we need an owned struct to carry the data across the FFI boundary before constructing the borrow-based view. i will rename it to follow the existing naming convention like OwnedExpressionArgs |
||
|
|
||
| impl TryFrom<FFI_ExpressionArgs> for ForeignExpressionArgs { | ||
| type Error = DataFusionError; | ||
|
|
||
| fn try_from(value: FFI_ExpressionArgs) -> Result<Self> { | ||
| let input_exprs = value.input_exprs.iter().map(Into::into).collect(); | ||
|
|
||
| let input_fields = rvec_wrapped_to_vec_fieldref(&value.input_fields)?; | ||
|
|
||
| Ok(Self { | ||
| input_exprs, | ||
| input_fields, | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| impl<'a> From<&'a ForeignExpressionArgs> for ExpressionArgs<'a> { | ||
| fn from(value: &'a ForeignExpressionArgs) -> Self { | ||
| ExpressionArgs::new(&value.input_exprs, &value.input_fields) | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are these changes necessary? They seem unrelated to the current PR.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These changes were added accidentally during development to fix a transient Docker pull failure in my fork. They are unrelated to this PR and will be reverted.