diff --git a/datafusion/common/Cargo.toml b/datafusion/common/Cargo.toml index 3337747efe37..73fb93e535b5 100644 --- a/datafusion/common/Cargo.toml +++ b/datafusion/common/Cargo.toml @@ -34,16 +34,16 @@ path = "src/lib.rs" [features] avro = ["apache-avro"] +default = [] jit = ["cranelift-module"] -pyarrow = ["pyo3"] +pyarrow = ["pyo3", "arrow/pyarrow"] [dependencies] -apache-avro = { version = "0.14", features = ["snappy"], optional = true } -arrow = { version = "23.0.0", features = ["prettyprint"] } -avro-rs = { version = "0.13", features = ["snappy"], optional = true } +apache-avro = { version = "0.14", default-features = false, features = ["snappy"], optional = true } +arrow = { version = "23.0.0", default-features = false } cranelift-module = { version = "0.87.0", optional = true } -object_store = { version = "0.5.0", optional = true } +object_store = { version = "0.5.0", default-features = false, optional = true } ordered-float = "3.0" -parquet = { version = "23.0.0", features = ["arrow"], optional = true } +parquet = { version = "23.0.0", default-features = false, optional = true } pyo3 = { version = "0.17.1", optional = true } sqlparser = "0.23" diff --git a/datafusion/expr/Cargo.toml b/datafusion/expr/Cargo.toml index 6277091ed25b..101035a2ee37 100644 --- a/datafusion/expr/Cargo.toml +++ b/datafusion/expr/Cargo.toml @@ -36,6 +36,6 @@ path = "src/lib.rs" [dependencies] ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] } -arrow = { version = "23.0.0", features = ["prettyprint"] } +arrow = { version = "23.0.0", default-features = false } datafusion-common = { path = "../common", version = "12.0.0" } sqlparser = "0.23" diff --git a/datafusion/jit/Cargo.toml b/datafusion/jit/Cargo.toml index 428027cb4367..69ed9033b0b7 100644 --- a/datafusion/jit/Cargo.toml +++ b/datafusion/jit/Cargo.toml @@ -36,7 +36,7 @@ path = "src/lib.rs" jit = [] [dependencies] -arrow = "23.0.0" +arrow = { version = "23.0.0", default-features = false } cranelift = "0.87.0" cranelift-jit = "0.87.0" cranelift-module = "0.87.0" diff --git a/datafusion/sql/Cargo.toml b/datafusion/sql/Cargo.toml index b2da631827a5..769d74a0c96e 100644 --- a/datafusion/sql/Cargo.toml +++ b/datafusion/sql/Cargo.toml @@ -37,10 +37,7 @@ default = ["unicode_expressions"] unicode_expressions = [] [dependencies] -ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] } -arrow = { version = "23.0.0", features = ["prettyprint"] } +arrow = { version = "23.0.0", default-features = false } datafusion-common = { path = "../common", version = "12.0.0" } datafusion-expr = { path = "../expr", version = "12.0.0" } -hashbrown = "0.12" sqlparser = "0.23" -tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync", "fs", "parking_lot"] } diff --git a/datafusion/sql/src/planner.rs b/datafusion/sql/src/planner.rs index 541dc2520e93..a740d1af8f67 100644 --- a/datafusion/sql/src/planner.rs +++ b/datafusion/sql/src/planner.rs @@ -41,8 +41,7 @@ use datafusion_expr::{ use datafusion_expr::{ window_function::WindowFunction, BuiltinScalarFunction, TableSource, }; -use hashbrown::HashMap; -use std::collections::HashSet; +use std::collections::{HashMap, HashSet}; use std::str::FromStr; use std::sync::Arc; use std::{convert::TryInto, vec}; @@ -4995,8 +4994,8 @@ mod tests { quick_test(sql, expected); } - #[tokio::test] - async fn subquery_references_cte() { + #[test] + fn subquery_references_cte() { let sql = "WITH \ cte AS (SELECT * FROM person) \ SELECT * FROM person WHERE EXISTS (SELECT * FROM cte WHERE id = person.id)"; @@ -5013,8 +5012,8 @@ mod tests { quick_test(sql, expected) } - #[tokio::test] - async fn aggregate_with_rollup() { + #[test] + fn aggregate_with_rollup() { let sql = "SELECT id, state, age, COUNT(*) FROM person GROUP BY id, ROLLUP (state, age)"; let expected = "Projection: #person.id, #person.state, #person.age, #COUNT(UInt8(1))\ \n Aggregate: groupBy=[[#person.id, ROLLUP (#person.state, #person.age)]], aggr=[[COUNT(UInt8(1))]]\ @@ -5022,8 +5021,8 @@ mod tests { quick_test(sql, expected); } - #[tokio::test] - async fn aggregate_with_rollup_with_grouping() { + #[test] + fn aggregate_with_rollup_with_grouping() { let sql = "SELECT id, state, age, grouping(state), grouping(age), grouping(state) + grouping(age), COUNT(*) \ FROM person GROUP BY id, ROLLUP (state, age)"; let expected = "Projection: #person.id, #person.state, #person.age, #GROUPING(person.state), #GROUPING(person.age), #GROUPING(person.state) + #GROUPING(person.age), #COUNT(UInt8(1))\ @@ -5032,8 +5031,8 @@ mod tests { quick_test(sql, expected); } - #[tokio::test] - async fn rank_partition_grouping() { + #[test] + fn rank_partition_grouping() { let sql = "select sum(age) as total_sum, state, @@ -5054,8 +5053,8 @@ mod tests { quick_test(sql, expected); } - #[tokio::test] - async fn aggregate_with_cube() { + #[test] + fn aggregate_with_cube() { let sql = "SELECT id, state, age, COUNT(*) FROM person GROUP BY id, CUBE (state, age)"; let expected = "Projection: #person.id, #person.state, #person.age, #COUNT(UInt8(1))\ @@ -5064,8 +5063,8 @@ mod tests { quick_test(sql, expected); } - #[tokio::test] - async fn round_decimal() { + #[test] + fn round_decimal() { let sql = "SELECT round(price/3, 2) FROM test_decimal"; let expected = "Projection: round(#test_decimal.price / Int64(3), Int64(2))\ \n TableScan: test_decimal"; @@ -5073,8 +5072,8 @@ mod tests { } #[ignore] // see https://github.com/apache/arrow-datafusion/issues/2469 - #[tokio::test] - async fn aggregate_with_grouping_sets() { + #[test] + fn aggregate_with_grouping_sets() { let sql = "SELECT id, state, age, COUNT(*) FROM person GROUP BY id, GROUPING SETS ((state), (state, age), (id, state))"; let expected = "TBD"; quick_test(sql, expected);