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 logical conflict with protobuf #1958

Merged
merged 1 commit into from
Mar 8, 2022
Merged

Conversation

alamb
Copy link
Contributor

@alamb alamb commented Mar 8, 2022

#1941 introduced a small logical conflict with #1887 which results in a compile error on master:

https://github.com/apache/arrow-datafusion/runs/5467727177?check_suite_focus=true

error: failed to run custom build command for `ballista-core v0.6.0 (/__w/arrow-datafusion/arrow-datafusion/ballista/rust/core)`

Caused by:
  process didn't exit successfully: `/github/home/target/debug/debug/build/ballista-core-8af276defa9847ff/build-script-build` (exit status: 1)
  --- stdout
  cargo:rerun-if-env-changed=FORCE_REBUILD
  cargo:rerun-if-changed=proto/ballista.proto
  cargo:rerun-if-changed=proto/datafusion.proto

  --- stderr
  Error: "protobuf compilation failed: protoc failed: ballista.proto:402:3: \"LogicalExprNode\" is not defined.\n"
warning: build failed, waiting for other jobs to finish...
error: build failed
Error: Process completed with exit code 101.

This PR fixes the problem

@alamb alamb mentioned this pull request Mar 8, 2022
@alamb
Copy link
Contributor Author

alamb commented Mar 8, 2022

Since this seems likely to be uncontroversial (and fixes something I broke 😢 ) merging it in

@alamb alamb merged commit 9f444f0 into apache:master Mar 8, 2022
@alamb alamb deleted the alamb/fix_conflict branch March 8, 2022 18:07
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.

1 participant