Skip to content

Fix code generation for json feature #3367

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 5, 2022
Merged

Fix code generation for json feature #3367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e165c85
Fix code generation for json feature
Sep 5, 2022
664c124
Fix accidental hiding of proto module
Sep 5, 2022
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: 1 addition & 1 deletion datafusion/proto/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ fn build() -> Result<(), String> {
let mut file = std::fs::OpenOptions::new()
.write(true)
.create(true)
.open("src/generated/datafusion.rs")
.open("src/generated/datafusion_json.rs")
.unwrap();
file.write(proto.as_str().as_ref()).unwrap();
file.write(json.as_str().as_ref()).unwrap();
Expand Down
6 changes: 6 additions & 0 deletions datafusion/proto/src/generated/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,10 @@
// include the generated protobuf source as a submodule
#[allow(clippy::all)]
#[rustfmt::skip]
#[cfg(not(feature = "json"))]
pub mod datafusion;

#[allow(clippy::all)]
#[rustfmt::skip]
#[cfg(feature = "json")]
pub mod datafusion_json;
6 changes: 5 additions & 1 deletion datafusion/proto/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@ pub mod from_proto;
pub mod generated;
pub mod logical_plan;
pub mod to_proto;
use generated::datafusion as protobuf;

#[cfg(not(feature = "json"))]
pub use generated::datafusion as protobuf;
#[cfg(feature = "json")]
pub use generated::datafusion_json as protobuf;

#[cfg(doctest)]
doc_comment::doctest!("../README.md", readme_example_test);
Expand Down