Skip to content

Fix build with --no-default-features #1219

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
Nov 2, 2021
Merged

Fix build with --no-default-features #1219

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
f54bdc3
Check build works without default features
alamb Nov 1, 2021
e9d2383
Fix lazy static use
alamb Nov 1, 2021
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
6 changes: 6 additions & 0 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,12 @@ jobs:
env:
CARGO_HOME: "/github/home/.cargo"
CARGO_TARGET_DIR: "/github/home/target"
- name: Check DataFusion Build without default features
Copy link
Contributor Author

@alamb alamb Nov 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested in #1218 / https://github.com/apache/arrow-datafusion/runs/4072959374?check_suite_focus=true

Copy link
Contributor Author

@alamb alamb Nov 1, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can see it fail with the same symptoms reported on the bug: https://github.com/apache/arrow-datafusion/runs/4072959374?check_suite_focus=true#step:8:99

run: |
cargo check --no-default-features -p datafusion
env:
CARGO_HOME: "/github/home/.cargo"
CARGO_TARGET_DIR: "/github/home/target"

# test the crate
linux-test:
Expand Down
4 changes: 2 additions & 2 deletions datafusion/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ path = "src/lib.rs"
default = ["crypto_expressions", "regex_expressions", "unicode_expressions"]
simd = ["arrow/simd"]
crypto_expressions = ["md-5", "sha2", "blake2", "blake3"]
regex_expressions = ["regex", "lazy_static"]
regex_expressions = ["regex"]
unicode_expressions = ["unicode-segmentation"]
# Used for testing ONLY: causes all values to hash to the same value (test for collisions)
force_hash_collisions = []
Expand Down Expand Up @@ -70,7 +70,7 @@ blake3 = { version = "1.0", optional = true }
ordered-float = "2.0"
unicode-segmentation = { version = "^1.7.1", optional = true }
regex = { version = "^1.4.3", optional = true }
lazy_static = { version = "^1.4.0", optional = true }
lazy_static = { version = "^1.4.0" }
smallvec = { version = "1.6", features = ["union"] }
rand = "0.8"
avro-rs = { version = "0.13", features = ["snappy"], optional = true }
Expand Down
4 changes: 0 additions & 4 deletions datafusion/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,5 @@ pub(crate) mod field_util;
pub mod test;
pub mod test_util;

#[macro_use]
#[cfg(feature = "regex_expressions")]
extern crate lazy_static;

#[cfg(doctest)]
doc_comment::doctest!("../../README.md", readme_example_test);
1 change: 1 addition & 0 deletions datafusion/src/physical_plan/file_format/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ use crate::{
datasource::{object_store::ObjectStore, PartitionedFile},
scalar::ScalarValue,
};
use lazy_static::lazy_static;
use std::{
collections::HashMap,
fmt::{Display, Formatter, Result as FmtResult},
Expand Down
1 change: 1 addition & 0 deletions datafusion/src/physical_plan/regex_expressions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ use crate::error::{DataFusionError, Result};
use arrow::array::{ArrayRef, GenericStringArray, StringOffsetSizeTrait};
use arrow::compute;
use hashbrown::HashMap;
use lazy_static::lazy_static;
use regex::Regex;

macro_rules! downcast_string_arg {
Expand Down