Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/docs_pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ jobs:
rust-version: stable
# Note: this does not include dictionary_expressions to reduce codegen
- name: Run doctests
run: cargo test --doc --features avro,jit,scheduler,json
run: cargo test --doc --features avro,scheduler,json
- name: Verify Working Directory Clean
run: git diff --exit-code
10 changes: 5 additions & 5 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:

# Note: this does not include dictionary_expressions to reduce codegen
- name: Check workspace with all features
run: cargo check --workspace --benches --features avro,jit,scheduler,json
run: cargo check --workspace --benches --features avro,scheduler,json

- name: Check Cargo.lock for datafusion-cli
run: |
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
with:
rust-version: stable
- name: Run tests (excluding doctests)
run: cargo test --lib --tests --bins --features avro,jit,scheduler,json,dictionary_expressions
run: cargo test --lib --tests --bins --features avro,scheduler,json,dictionary_expressions
- name: Verify Working Directory Clean
run: git diff --exit-code

Expand Down Expand Up @@ -153,7 +153,7 @@ jobs:
rust-version: stable
# Note: this does not include dictionary_expressions to reduce codegen
- name: Run doctests
run: cargo test --doc --features avro,jit,scheduler,json
run: cargo test --doc --features avro,scheduler,json
- name: Verify Working Directory Clean
run: git diff --exit-code

Expand Down Expand Up @@ -272,7 +272,7 @@ jobs:
shell: bash
run: |
export PATH=$PATH:$HOME/d/protoc/bin
cargo test --lib --tests --bins --features avro,jit,scheduler,json,dictionary_expressions
cargo test --lib --tests --bins --features avro,scheduler,json,dictionary_expressions
env:
# do not produce debug symbols to keep memory usage down
RUSTFLAGS: "-C debuginfo=0"
Expand Down Expand Up @@ -305,7 +305,7 @@ jobs:
- name: Run tests (excluding doctests)
shell: bash
run: |
cargo test --lib --tests --bins --features avro,jit,scheduler,json,dictionary_expressions
cargo test --lib --tests --bins --features avro,scheduler,json,dictionary_expressions
env:
# do not produce debug symbols to keep memory usage down
RUSTFLAGS: "-C debuginfo=0"
Expand Down
1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ members = [
"datafusion/core",
"datafusion/expr",
"datafusion/execution",
"datafusion/jit",
"datafusion/optimizer",
"datafusion/physical-expr",
"datafusion/proto",
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/rust_clippy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
# under the License.

set -ex
cargo clippy --all-targets --workspace --features avro,jit,pyarrow,scheduler -- -D warnings
cargo clippy --all-targets --workspace --features avro,pyarrow,scheduler -- -D warnings
1 change: 0 additions & 1 deletion datafusion/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ path = "src/lib.rs"
[features]
avro = ["apache-avro"]
default = []
jit = ["cranelift-module"]
pyarrow = ["pyo3", "arrow/pyarrow"]

[dependencies]
Expand Down
18 changes: 0 additions & 18 deletions datafusion/common/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ use crate::{Column, DFSchema, OwnedTableReference};
#[cfg(feature = "avro")]
use apache_avro::Error as AvroError;
use arrow::error::ArrowError;
#[cfg(feature = "jit")]
use cranelift_module::ModuleError;
#[cfg(feature = "parquet")]
use parquet::errors::ParquetError;
use sqlparser::parser::ParserError;
Expand Down Expand Up @@ -85,9 +83,6 @@ pub enum DataFusionError {
/// Errors originating from outside DataFusion's core codebase.
/// For example, a custom S3Error from the crate datafusion-objectstore-s3
External(GenericError),
#[cfg(feature = "jit")]
/// Error occurs during code generation
JITError(ModuleError),
/// Error with additional context
Context(String, Box<DataFusionError>),
/// Errors originating from either mapping LogicalPlans to/from Substrait plans
Expand Down Expand Up @@ -281,13 +276,6 @@ impl From<ParserError> for DataFusionError {
}
}

#[cfg(feature = "jit")]
impl From<ModuleError> for DataFusionError {
fn from(e: ModuleError) -> Self {
DataFusionError::JITError(e)
}
}

impl From<GenericError> for DataFusionError {
fn from(err: GenericError) -> Self {
DataFusionError::External(err)
Expand Down Expand Up @@ -332,10 +320,6 @@ impl Display for DataFusionError {
DataFusionError::External(ref desc) => {
write!(f, "External error: {desc}")
}
#[cfg(feature = "jit")]
DataFusionError::JITError(ref desc) => {
write!(f, "JIT error: {desc}")
}
#[cfg(feature = "object_store")]
DataFusionError::ObjectStore(ref desc) => {
write!(f, "Object Store error: {desc}")
Expand Down Expand Up @@ -369,8 +353,6 @@ impl Error for DataFusionError {
DataFusionError::Execution(_) => None,
DataFusionError::ResourcesExhausted(_) => None,
DataFusionError::External(e) => Some(e.as_ref()),
#[cfg(feature = "jit")]
DataFusionError::JITError(e) => Some(e),
DataFusionError::Context(_, e) => Some(e.as_ref()),
DataFusionError::Substrait(_) => None,
}
Expand Down
8 changes: 0 additions & 8 deletions datafusion/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ default = ["crypto_expressions", "regex_expressions", "unicode_expressions", "co
dictionary_expressions = ["datafusion-physical-expr/dictionary_expressions", "datafusion-optimizer/dictionary_expressions"]
# Used for testing ONLY: causes all values to hash to the same value (test for collisions)
force_hash_collisions = []
# Used to enable JIT code generation
jit = ["datafusion-jit", "datafusion-row/jit"]
pyarrow = ["datafusion-common/pyarrow"]
regex_expressions = ["datafusion-physical-expr/regex_expressions", "datafusion-optimizer/regex_expressions"]
# Used to enable scheduler
Expand All @@ -68,7 +66,6 @@ dashmap = "5.4.0"
datafusion-common = { path = "../common", version = "23.0.0", features = ["parquet", "object_store"] }
datafusion-execution = { path = "../execution", version = "23.0.0" }
datafusion-expr = { path = "../expr", version = "23.0.0" }
datafusion-jit = { path = "../jit", version = "23.0.0", optional = true }
datafusion-optimizer = { path = "../optimizer", version = "23.0.0", default-features = false }
datafusion-physical-expr = { path = "../physical-expr", version = "23.0.0", default-features = false }
datafusion-row = { path = "../row", version = "23.0.0" }
Expand Down Expand Up @@ -159,11 +156,6 @@ required-features = ["scheduler"]
harness = false
name = "sql_planner"

[[bench]]
harness = false
name = "jit"
required-features = ["jit"]

[[bench]]
harness = false
name = "sort"
Expand Down
53 changes: 0 additions & 53 deletions datafusion/core/benches/jit.rs

This file was deleted.

3 changes: 0 additions & 3 deletions datafusion/core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -439,9 +439,6 @@ pub use datafusion_physical_expr as physical_expr;
pub use datafusion_row as row;
pub use datafusion_sql as sql;

#[cfg(feature = "jit")]
pub use datafusion_jit as jit;

pub use common::from_slice;

#[cfg(test)]
Expand Down
47 changes: 0 additions & 47 deletions datafusion/jit/Cargo.toml

This file was deleted.

26 changes: 0 additions & 26 deletions datafusion/jit/README.md

This file was deleted.

Loading