From 08a0027af093879f8b1b5d78fb7ab9b46ec7a02b Mon Sep 17 00:00:00 2001 From: Owen Leung Date: Wed, 12 Mar 2025 12:28:27 +0800 Subject: [PATCH 1/3] Fix datafusion proto crate json feature Fix datafusion proto crate json feature --- datafusion/proto/Cargo.toml | 2 +- datafusion/proto/src/physical_plan/mod.rs | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/datafusion/proto/Cargo.toml b/datafusion/proto/Cargo.toml index 39897cfcf2de..553fccf7d428 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"] diff --git a/datafusion/proto/src/physical_plan/mod.rs b/datafusion/proto/src/physical_plan/mod.rs index 60972ac54ba7..5dc26e535bbe 100644 --- a/datafusion/proto/src/physical_plan/mod.rs +++ b/datafusion/proto/src/physical_plan/mod.rs @@ -66,7 +66,6 @@ use datafusion::physical_plan::windows::{BoundedWindowAggExec, WindowAggExec}; use datafusion::physical_plan::{ ExecutionPlan, InputOrderMode, PhysicalExpr, WindowExpr, }; -use datafusion_common::config::TableParquetOptions; use datafusion_common::{internal_err, not_impl_err, DataFusionError, Result}; use datafusion_expr::{AggregateUDF, ScalarUDF, WindowUDF}; @@ -74,7 +73,6 @@ use crate::common::{byte_to_string, str_to_byte}; use crate::physical_plan::from_proto::{ parse_physical_expr, parse_physical_sort_expr, parse_physical_sort_exprs, parse_physical_window_expr, parse_protobuf_file_scan_config, - parse_protobuf_file_scan_schema, }; use crate::physical_plan::to_proto::{ serialize_file_scan_config, serialize_maybe_filter, serialize_physical_aggr_expr, From d03f137d07e4c9d8b270d17914e487a42dcf637d Mon Sep 17 00:00:00 2001 From: Owen Leung Date: Wed, 12 Mar 2025 12:36:38 +0800 Subject: [PATCH 2/3] Revert changes that remove the imports --- datafusion/proto/src/physical_plan/mod.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/datafusion/proto/src/physical_plan/mod.rs b/datafusion/proto/src/physical_plan/mod.rs index 5dc26e535bbe..60972ac54ba7 100644 --- a/datafusion/proto/src/physical_plan/mod.rs +++ b/datafusion/proto/src/physical_plan/mod.rs @@ -66,6 +66,7 @@ use datafusion::physical_plan::windows::{BoundedWindowAggExec, WindowAggExec}; use datafusion::physical_plan::{ ExecutionPlan, InputOrderMode, PhysicalExpr, WindowExpr, }; +use datafusion_common::config::TableParquetOptions; use datafusion_common::{internal_err, not_impl_err, DataFusionError, Result}; use datafusion_expr::{AggregateUDF, ScalarUDF, WindowUDF}; @@ -73,6 +74,7 @@ use crate::common::{byte_to_string, str_to_byte}; use crate::physical_plan::from_proto::{ parse_physical_expr, parse_physical_sort_expr, parse_physical_sort_exprs, parse_physical_window_expr, parse_protobuf_file_scan_config, + parse_protobuf_file_scan_schema, }; use crate::physical_plan::to_proto::{ serialize_file_scan_config, serialize_maybe_filter, serialize_physical_aggr_expr, From a4441bb9a3a33af6edf3de381fb0141711d41a65 Mon Sep 17 00:00:00 2001 From: Andrew Lamb Date: Thu, 13 Mar 2025 08:46:15 -0400 Subject: [PATCH 3/3] Enable CI check --- .github/workflows/rust.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index dfdc13057d4e..ac9b7d14c59f 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)