From 611b129e3927708983e2f2dfdeb7d5282a74bde5 Mon Sep 17 00:00:00 2001 From: Raphael Taylor-Davies <1781103+tustvold@users.noreply.github.com> Date: Sun, 3 Sep 2023 23:09:42 +0100 Subject: [PATCH] Remove unused dyn_cmp_dict feature (#4766) --- .github/workflows/arrow.yml | 4 ++-- arrow-string/Cargo.toml | 6 ------ arrow-string/src/like.rs | 1 - arrow/Cargo.toml | 5 +---- arrow/README.md | 1 - 5 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/arrow.yml b/.github/workflows/arrow.yml index 8203c15afc6c..41a2722beff9 100644 --- a/.github/workflows/arrow.yml +++ b/.github/workflows/arrow.yml @@ -91,7 +91,7 @@ jobs: - name: Test arrow with default features run: cargo test -p arrow - name: Test arrow with all features apart from simd - run: cargo test -p arrow --features=force_validate,prettyprint,ipc_compression,ffi,dyn_cmp_dict,chrono-tz + run: cargo test -p arrow --features=force_validate,prettyprint,ipc_compression,ffi,chrono-tz - name: Run examples run: | # Test arrow examples @@ -211,7 +211,7 @@ jobs: - name: Clippy arrow-row with all features run: cargo clippy -p arrow-row --all-targets --all-features -- -D warnings - name: Clippy arrow with all features except SIMD - run: cargo clippy -p arrow --features=prettyprint,csv,ipc,test_utils,ffi,ipc_compression,dyn_cmp_dict,chrono-tz --all-targets -- -D warnings + run: cargo clippy -p arrow --features=prettyprint,csv,ipc,test_utils,ffi,ipc_compression,chrono-tz --all-targets -- -D warnings - name: Clippy arrow-integration-test with all features run: cargo clippy -p arrow-integration-test --all-targets --all-features -- -D warnings - name: Clippy arrow-integration-testing with all features diff --git a/arrow-string/Cargo.toml b/arrow-string/Cargo.toml index 0f88ffbac923..e1163dc03eab 100644 --- a/arrow-string/Cargo.toml +++ b/arrow-string/Cargo.toml @@ -42,9 +42,3 @@ arrow-select = { workspace = true } regex = { version = "1.7.0", default-features = false, features = ["std", "unicode", "perf"] } regex-syntax = { version = "0.7.1", default-features = false, features = ["unicode"] } num = { version = "0.4", default-features = false, features = ["std"] } - -[package.metadata.docs.rs] -all-features = true - -[features] -dyn_cmp_dict = [] diff --git a/arrow-string/src/like.rs b/arrow-string/src/like.rs index 412f1e6cc89a..279a4782009d 100644 --- a/arrow-string/src/like.rs +++ b/arrow-string/src/like.rs @@ -405,7 +405,6 @@ mod tests { macro_rules! test_dict_utf8 { ($test_name:ident, $left:expr, $right:expr, $op:expr, $expected:expr) => { #[test] - #[cfg(feature = "dyn_cmp_dict")] fn $test_name() { let expected = BooleanArray::from($expected); let left: DictionaryArray = $left.into_iter().collect(); diff --git a/arrow/Cargo.toml b/arrow/Cargo.toml index 9456dd4b012c..bc75207c2230 100644 --- a/arrow/Cargo.toml +++ b/arrow/Cargo.toml @@ -63,7 +63,7 @@ rand = { version = "0.8", default-features = false, features = ["std", "std_rng" pyo3 = { version = "0.19", default-features = false, optional = true } [package.metadata.docs.rs] -features = ["prettyprint", "ipc_compression", "dyn_cmp_dict", "ffi", "pyarrow"] +features = ["prettyprint", "ipc_compression", "ffi", "pyarrow"] [features] default = ["csv", "ipc", "json"] @@ -85,9 +85,6 @@ pyarrow = ["pyo3", "ffi"] force_validate = ["arrow-data/force_validate"] # Enable ffi support ffi = ["arrow-schema/ffi", "arrow-data/ffi"] -# Enable dyn-comparison of dictionary arrays with other arrays -# Note: this does not impact comparison against scalars -dyn_cmp_dict = ["arrow-string/dyn_cmp_dict"] chrono-tz = ["arrow-array/chrono-tz"] [dev-dependencies] diff --git a/arrow/README.md b/arrow/README.md index fb2119e3bc15..6a91bc951cc1 100644 --- a/arrow/README.md +++ b/arrow/README.md @@ -54,7 +54,6 @@ The `arrow` crate provides the following features which may be enabled in your ` - `chrono-tz` - support of parsing timezone using [chrono-tz](https://docs.rs/chrono-tz/0.6.0/chrono_tz/) - `ffi` - bindings for the Arrow C [C Data Interface](https://arrow.apache.org/docs/format/CDataInterface.html) - `pyarrow` - bindings for pyo3 to call arrow-rs from python -- `dyn_cmp_dict` - enables comparison of dictionary arrays within dyn comparison kernels ## Arrow Feature Status