Skip to content
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

fix: check recursion limit in Expr::to_bytes #3970

Merged
merged 1 commit into from
Oct 28, 2022

Conversation

crepererum
Copy link
Contributor

Which issue does this PR close?

Closes #3968.

Rationale for this change

Expr::to_bytes can create outputs that Expr::from_bytes can no longer read.

What changes are included in this PR?

Try to deserialize the data in Expr::to_bytes to catch invalid data early. This is a workaround until tokio-rs/prost#736 is implemented.

Are there any user-facing changes?

Expressions that are nested too deeply are now rejected to serialization already.

Install a DF-specific workaround until
tokio-rs/prost#736 is implemented.

Fixes apache#3968.
// Need to provide some placeholder registry because the stream may contain UDFs
struct PlaceHolderRegistry;

impl FunctionRegistry for PlaceHolderRegistry {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

🙈

Copy link
Contributor

Choose a reason for hiding this comment

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

I think the comments explain what is going on 👍

Copy link
Contributor

@alamb alamb left a comment

Choose a reason for hiding this comment

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

As always, well tested @crepererum -- thank you

// Need to provide some placeholder registry because the stream may contain UDFs
struct PlaceHolderRegistry;

impl FunctionRegistry for PlaceHolderRegistry {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the comments explain what is going on 👍

@alamb alamb merged commit 366e610 into apache:master Oct 28, 2022
@ursabot
Copy link

ursabot commented Oct 28, 2022

Benchmark runs are scheduled for baseline = 4ea970d and contender = 366e610. 366e610 is a master commit associated with this PR. Results will be available as each benchmark for each run completes.
Conbench compare runs links:
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on ec2-t3-xlarge-us-east-2] ec2-t3-xlarge-us-east-2
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on test-mac-arm] test-mac-arm
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on ursa-i9-9960x] ursa-i9-9960x
[Skipped ⚠️ Benchmarking of arrow-datafusion-commits is not supported on ursa-thinkcentre-m75q] ursa-thinkcentre-m75q
Buildkite builds:
Supported benchmarks:
ec2-t3-xlarge-us-east-2: Supported benchmark langs: Python, R. Runs only benchmarks with cloud = True
test-mac-arm: Supported benchmark langs: C++, Python, R
ursa-i9-9960x: Supported benchmark langs: Python, R, JavaScript
ursa-thinkcentre-m75q: Supported benchmark langs: C++, Java

jimexist pushed a commit to jimexist/arrow-datafusion that referenced this pull request Oct 31, 2022
Install a DF-specific workaround until
tokio-rs/prost#736 is implemented.

Fixes apache#3968.
Dandandan pushed a commit to yuuch/arrow-datafusion that referenced this pull request Nov 5, 2022
Install a DF-specific workaround until
tokio-rs/prost#736 is implemented.

Fixes apache#3968.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Expr::to_bytes can produce output that hits Expr::from_bytes recursion limit
3 participants