From 38e9f30c182d278edb71bc2560996e7f5cbd9d8f Mon Sep 17 00:00:00 2001 From: Matthijs Brobbel Date: Thu, 1 Dec 2022 15:29:59 +0100 Subject: [PATCH] Make `datafusion-sql` depend on `arrow-schema` instead of `arrow` (#4456) * Make `datafusion-sql` depend on `arrow-schema` instead of `arrow` * Update Cargo.lock file of `datafusion-cli` --- datafusion-cli/Cargo.lock | 10 +++++----- datafusion/sql/Cargo.toml | 4 ++-- datafusion/sql/examples/sql.rs | 2 +- datafusion/sql/src/planner.rs | 2 +- datafusion/sql/src/utils.rs | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/datafusion-cli/Cargo.lock b/datafusion-cli/Cargo.lock index d2dadb58d018..01b2d7106579 100644 --- a/datafusion-cli/Cargo.lock +++ b/datafusion-cli/Cargo.lock @@ -797,7 +797,7 @@ dependencies = [ name = "datafusion-sql" version = "14.0.0" dependencies = [ - "arrow", + "arrow-schema", "datafusion-common", "datafusion-expr", "sqlparser", @@ -2359,9 +2359,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "syn" -version = "1.0.104" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae548ec36cf198c0ef7710d3c230987c2d6d7bd98ad6edc0274462724c585ce" +checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" dependencies = [ "proc-macro2", "quote", @@ -2482,9 +2482,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.8.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9724f9a975fb987ef7a3cd9be0350edcbe130698af5b8f7a631e23d42d052484" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", diff --git a/datafusion/sql/Cargo.toml b/datafusion/sql/Cargo.toml index 294ee53a6d53..3a255b2db880 100644 --- a/datafusion/sql/Cargo.toml +++ b/datafusion/sql/Cargo.toml @@ -24,7 +24,7 @@ repository = "https://github.com/apache/arrow-datafusion" readme = "README.md" authors = ["Apache Arrow "] license = "Apache-2.0" -keywords = [ "datafusion", "sql", "parser", "planner" ] +keywords = ["datafusion", "sql", "parser", "planner"] edition = "2021" rust-version = "1.62" @@ -37,7 +37,7 @@ default = ["unicode_expressions"] unicode_expressions = [] [dependencies] -arrow = { version = "28.0.0", default-features = false } +arrow-schema = "28.0.0" datafusion-common = { path = "../common", version = "14.0.0" } datafusion-expr = { path = "../expr", version = "14.0.0" } sqlparser = "0.27" diff --git a/datafusion/sql/examples/sql.rs b/datafusion/sql/examples/sql.rs index bc47348d5032..c2e4d257b2ba 100644 --- a/datafusion/sql/examples/sql.rs +++ b/datafusion/sql/examples/sql.rs @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -use arrow::datatypes::{DataType, Field, Schema}; +use arrow_schema::{DataType, Field, Schema}; use datafusion_common::{DataFusionError, Result}; use datafusion_expr::{ logical_plan::builder::LogicalTableSource, AggregateUDF, ScalarUDF, TableSource, diff --git a/datafusion/sql/src/planner.rs b/datafusion/sql/src/planner.rs index d52dfa08aa97..f2f5acd71a7b 100644 --- a/datafusion/sql/src/planner.rs +++ b/datafusion/sql/src/planner.rs @@ -22,7 +22,7 @@ use std::str::FromStr; use std::sync::Arc; use std::{convert::TryInto, vec}; -use arrow::datatypes::*; +use arrow_schema::*; use sqlparser::ast::TimezoneInfo; use sqlparser::ast::{ArrayAgg, ExactNumberInfo, SetQuantifier}; use sqlparser::ast::{ diff --git a/datafusion/sql/src/utils.rs b/datafusion/sql/src/utils.rs index f12578fbb75f..1cc6c1f00086 100644 --- a/datafusion/sql/src/utils.rs +++ b/datafusion/sql/src/utils.rs @@ -17,7 +17,7 @@ //! SQL Utility Functions -use arrow::datatypes::{DataType, DECIMAL128_MAX_PRECISION, DECIMAL_DEFAULT_SCALE}; +use arrow_schema::{DataType, DECIMAL128_MAX_PRECISION, DECIMAL_DEFAULT_SCALE}; use sqlparser::ast::Ident; use datafusion_common::{DataFusionError, Result, ScalarValue};