This is an automated email from the ASF dual-hosted git repository.
comphead pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new d381306938 Fix datafusion proto crate `json` feature (#15172)
d381306938 is described below
commit d381306938da148cb850fd39ca3fefa3fdfa3fb6
Author: Owen Leung <[email protected]>
AuthorDate: Thu Mar 13 23:41:56 2025 +0800
Fix datafusion proto crate `json` feature (#15172)
* Fix datafusion proto crate json feature
Fix datafusion proto crate json feature
* Revert changes that remove the imports
* Enable CI check
---------
Co-authored-by: Andrew Lamb <[email protected]>
---
.github/workflows/rust.yml | 5 ++---
datafusion/proto/Cargo.toml | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index dfdc13057d..ac9b7d14c5 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -131,9 +131,8 @@ jobs:
rust-version: stable
- name: Check datafusion-proto (no-default-features)
run: cargo check --profile ci --all-targets --no-default-features -p
datafusion-proto
- # fails due to https://github.com/apache/datafusion/issues/15157
- #- name: Check datafusion-proto (json)
- # run: cargo check --profile ci --all-targets --no-default-features -p
datafusion-proto --features=json
+ - name: Check datafusion-proto (json)
+ run: cargo check --profile ci --all-targets --no-default-features -p
datafusion-proto --features=json
- name: Check datafusion-proto (parquet)
run: cargo check --profile ci --all-targets --no-default-features -p
datafusion-proto --features=parquet
- name: Check datafusion-proto (avro)
diff --git a/datafusion/proto/Cargo.toml b/datafusion/proto/Cargo.toml
index 39897cfcf2..553fccf7d4 100644
--- a/datafusion/proto/Cargo.toml
+++ b/datafusion/proto/Cargo.toml
@@ -39,7 +39,7 @@ name = "datafusion_proto"
[features]
default = ["parquet"]
-json = ["pbjson", "serde", "serde_json"]
+json = ["pbjson", "serde", "serde_json", "datafusion-proto-common/json"]
parquet = ["datafusion/parquet", "datafusion-common/parquet"]
avro = ["datafusion/avro", "datafusion-common/avro"]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
