Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ arrow versions as we can.
We allow selecting the version of arrow to use via feature flags. Currently we support the following
flags:

- `arrow-55`: Use arrow version 55
- `arrow-56`: Use arrow version 56
- `arrow-57`: Use arrow version 57
- `arrow`: Use the latest arrow version. Note that this is an _unstable_ flag: we will bump this to
Expand Down Expand Up @@ -171,4 +170,4 @@ Some design principles which should be considered:
[cargo-llvm-cov]: https://github.com/taiki-e/cargo-llvm-cov
[FFI]: ffi/
[Arrow]: https://arrow.apache.org/rust/arrow/index.html
[Tokio]: https://tokio.rs/
[Tokio]: https://tokio.rs/
1 change: 0 additions & 1 deletion kernel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ integration-test = ["hdfs-native-object-store/integration-test"]
arrow = ["arrow-57"] # latest arrow version
need-arrow = [] # need-arrow is a marker that the feature needs arrow dep

arrow-55 = ["dep:arrow_55", "dep:parquet_55", "object_store", "comfy-table"]
arrow-56 = ["dep:arrow_56", "dep:parquet_56", "object_store", "comfy-table"]
arrow-57 = ["dep:arrow_57", "dep:parquet_57", "object_store", "comfy-table"]
arrow-conversion = ["need-arrow"]
Expand Down
21 changes: 3 additions & 18 deletions kernel/src/arrow_compat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,20 @@ mod arrow_compat_shims {
pub use parquet_57 as parquet;
}

#[cfg(all(
feature = "arrow-56",
not(feature = "arrow-57"),
not(feature = "arrow-55")
))]
#[cfg(all(feature = "arrow-56", not(feature = "arrow-57"),))]
mod arrow_compat_shims {
pub use arrow_56 as arrow;
pub use parquet_56 as parquet;
}

#[cfg(all(
feature = "arrow-55",
not(feature = "arrow-57"),
not(feature = "arrow-56")
))]
mod arrow_compat_shims {
pub use arrow_55 as arrow;
pub use parquet_55 as parquet;
}

// if nothing is enabled but we need arrow because of some other feature flag, throw compile-time
// error
#[cfg(all(
feature = "need-arrow",
not(feature = "arrow-55"),
not(feature = "arrow-56"),
not(feature = "arrow-57")
))]
compile_error!("Requested a feature that needs arrow without enabling arrow. Please enable the `arrow-55`, `arrow-56`, or `arrow-57` feature");
compile_error!("Requested a feature that needs arrow without enabling arrow. Please enable the `arrow-56`, or `arrow-57` feature");

#[cfg(any(feature = "arrow-55", feature = "arrow-56", feature = "arrow-57"))]
#[cfg(any(feature = "arrow-56", feature = "arrow-57"))]
pub use arrow_compat_shims::*;
2 changes: 1 addition & 1 deletion kernel/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ pub use log_path::LogPath;
mod row_tracking;

mod arrow_compat;
#[cfg(any(feature = "arrow-55", feature = "arrow-56", feature = "arrow-57"))]
#[cfg(any(feature = "arrow-56", feature = "arrow-57"))]
pub use arrow_compat::*;

pub mod kernel_predicates;
Expand Down
Loading