-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Handle serde for ScalarUDF #9395
Merged
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
8917593
feat: support serde for ScalarUDF
yyy1000 c8463a7
feat: change other places leveraing codec
yyy1000 47607c1
Merge branch 'main' into serde
yyy1000 982d7c8
fix conflict
yyy1000 c7db879
feat: add a test case(no working now)
yyy1000 5675568
feat: complete test case
yyy1000 eb11755
Merge branch 'main' into serde
yyy1000 88fd1bc
fix cargo fmt
yyy1000 0aa6d1a
Merge branch 'serde' of https://github.com/yyy1000/arrow-datafusion i…
yyy1000 ecb3141
fix typo
yyy1000 2ea00ee
fix typo
yyy1000 ef31c6f
remove regex dep
yyy1000 2f7f269
Update datafusion/proto/tests/cases/roundtrip_logical_plan.rs
yyy1000 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 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 |
---|---|---|
|
@@ -16,6 +16,7 @@ | |
// under the License. | ||
|
||
//! Serialization / Deserialization to Bytes | ||
use crate::logical_plan::to_proto::serialize_expr; | ||
use crate::logical_plan::{ | ||
self, AsLogicalPlan, DefaultLogicalExtensionCodec, LogicalExtensionCodec, | ||
}; | ||
|
@@ -87,8 +88,8 @@ pub trait Serializeable: Sized { | |
impl Serializeable for Expr { | ||
fn to_bytes(&self) -> Result<Bytes> { | ||
let mut buffer = BytesMut::new(); | ||
let protobuf: protobuf::LogicalExprNode = self | ||
.try_into() | ||
let extension_codec = DefaultLogicalExtensionCodec {}; | ||
let protobuf: protobuf::LogicalExprNode = serialize_expr(self, &extension_codec) | ||
.map_err(|e| plan_datafusion_err!("Error encoding expr as protobuf: {e}"))?; | ||
|
||
protobuf | ||
|
@@ -177,7 +178,8 @@ impl Serializeable for Expr { | |
let protobuf = protobuf::LogicalExprNode::decode(bytes) | ||
.map_err(|e| plan_datafusion_err!("Error decoding expr as protobuf: {e}"))?; | ||
|
||
logical_plan::from_proto::parse_expr(&protobuf, registry) | ||
let extension_codec = DefaultLogicalExtensionCodec {}; | ||
logical_plan::from_proto::parse_expr(&protobuf, registry, &extension_codec) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. And also here |
||
.map_err(|e| plan_datafusion_err!("Error parsing protobuf into Expr: {e}")) | ||
} | ||
} | ||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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.
Would this be OK?
I think
DefaultLogicalExtensionCodec
may need to implement some functions it didn't implement yet. I will also look into it.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.
Yes I think this is fine. These extension methods can be used for vanilla serialization and then if user needs custom stuff with a custom codec they can use the lower-level apis