From eed534286b5d2afc039137c889c27816878c7d89 Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Tue, 10 May 2022 17:04:35 -0600 Subject: [PATCH] reduce crate dependencies --- dask_planner/Cargo.toml | 2 -- dask_planner/src/expression.rs | 4 ++-- dask_planner/src/sql.rs | 2 +- dask_planner/src/sql/logical.rs | 2 +- dask_planner/src/sql/logical/aggregate.rs | 4 ++-- dask_planner/src/sql/logical/filter.rs | 4 ++-- dask_planner/src/sql/logical/join.rs | 4 ++-- dask_planner/src/sql/logical/projection.rs | 4 ++-- dask_planner/src/sql/table.rs | 2 +- 9 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dask_planner/Cargo.toml b/dask_planner/Cargo.toml index e50a3c377..ec123f8b7 100644 --- a/dask_planner/Cargo.toml +++ b/dask_planner/Cargo.toml @@ -13,10 +13,8 @@ tokio = { version = "1.0", features = ["macros", "rt", "rt-multi-thread", "sync" rand = "0.7" pyo3 = { version = "0.16", features = ["extension-module", "abi3", "abi3-py38"] } datafusion = { git="https://github.com/apache/arrow-datafusion/", rev = "0ce942aa014c29d6b43ac9251b8406a9a18a8022" } -datafusion-expr = { git="https://github.com/apache/arrow-datafusion/", rev = "0ce942aa014c29d6b43ac9251b8406a9a18a8022" } uuid = { version = "0.8", features = ["v4"] } mimalloc = { version = "*", default-features = false } -sqlparser = "0.14.0" parking_lot = "0.12" async-trait = "0.1.41" diff --git a/dask_planner/src/expression.rs b/dask_planner/src/expression.rs index 39164212b..bb9e60b2a 100644 --- a/dask_planner/src/expression.rs +++ b/dask_planner/src/expression.rs @@ -7,11 +7,11 @@ use std::convert::{From, Into}; use datafusion::error::{DataFusionError, Result}; use datafusion::arrow::datatypes::DataType; -use datafusion_expr::{lit, BuiltinScalarFunction, Expr}; +use datafusion::logical_expr::{lit, BuiltinScalarFunction, Expr}; use datafusion::scalar::ScalarValue; -pub use datafusion_expr::LogicalPlan; +pub use datafusion::logical_expr::LogicalPlan; use datafusion::prelude::Column; diff --git a/dask_planner/src/sql.rs b/dask_planner/src/sql.rs index 4dec6f599..7112ead55 100644 --- a/dask_planner/src/sql.rs +++ b/dask_planner/src/sql.rs @@ -12,11 +12,11 @@ use crate::sql::exceptions::ParsingException; use datafusion::arrow::datatypes::{Field, Schema}; use datafusion::catalog::{ResolvedTableReference, TableReference}; use datafusion::error::DataFusionError; +use datafusion::logical_expr::ScalarFunctionImplementation; use datafusion::physical_plan::udaf::AggregateUDF; use datafusion::physical_plan::udf::ScalarUDF; use datafusion::sql::parser::DFParser; use datafusion::sql::planner::{ContextProvider, SqlToRel}; -use datafusion_expr::ScalarFunctionImplementation; use std::collections::HashMap; use std::sync::Arc; diff --git a/dask_planner/src/sql/logical.rs b/dask_planner/src/sql/logical.rs index bb4ff53b0..34a7621ce 100644 --- a/dask_planner/src/sql/logical.rs +++ b/dask_planner/src/sql/logical.rs @@ -8,7 +8,7 @@ mod filter; mod join; pub mod projection; -pub use datafusion_expr::LogicalPlan; +pub use datafusion::logical_expr::LogicalPlan; use datafusion::common::Result; use datafusion::prelude::Column; diff --git a/dask_planner/src/sql/logical/aggregate.rs b/dask_planner/src/sql/logical/aggregate.rs index 726a73552..3953f4c47 100644 --- a/dask_planner/src/sql/logical/aggregate.rs +++ b/dask_planner/src/sql/logical/aggregate.rs @@ -1,7 +1,7 @@ use crate::expression::PyExpr; -use datafusion_expr::{logical_plan::Aggregate, Expr}; -pub use datafusion_expr::{logical_plan::JoinType, LogicalPlan}; +use datafusion::logical_expr::{logical_plan::Aggregate, Expr}; +pub use datafusion::logical_expr::{logical_plan::JoinType, LogicalPlan}; use pyo3::prelude::*; diff --git a/dask_planner/src/sql/logical/filter.rs b/dask_planner/src/sql/logical/filter.rs index 4474ad1c6..1cba535a6 100644 --- a/dask_planner/src/sql/logical/filter.rs +++ b/dask_planner/src/sql/logical/filter.rs @@ -1,7 +1,7 @@ use crate::expression::PyExpr; -use datafusion_expr::logical_plan::Filter; -pub use datafusion_expr::LogicalPlan; +use datafusion::logical_expr::logical_plan::Filter; +pub use datafusion::logical_expr::LogicalPlan; use pyo3::prelude::*; diff --git a/dask_planner/src/sql/logical/join.rs b/dask_planner/src/sql/logical/join.rs index ccb77ef6b..da779c343 100644 --- a/dask_planner/src/sql/logical/join.rs +++ b/dask_planner/src/sql/logical/join.rs @@ -1,7 +1,7 @@ use crate::sql::column; -use datafusion_expr::logical_plan::Join; -pub use datafusion_expr::{logical_plan::JoinType, LogicalPlan}; +use datafusion::logical_expr::logical_plan::Join; +pub use datafusion::logical_expr::{logical_plan::JoinType, LogicalPlan}; use pyo3::prelude::*; diff --git a/dask_planner/src/sql/logical/projection.rs b/dask_planner/src/sql/logical/projection.rs index c3144a15b..6f04c7d9f 100644 --- a/dask_planner/src/sql/logical/projection.rs +++ b/dask_planner/src/sql/logical/projection.rs @@ -1,7 +1,7 @@ use crate::expression::PyExpr; -pub use datafusion_expr::LogicalPlan; -use datafusion_expr::{logical_plan::Projection, Expr}; +pub use datafusion::logical_expr::LogicalPlan; +use datafusion::logical_expr::{logical_plan::Projection, Expr}; use pyo3::prelude::*; diff --git a/dask_planner/src/sql/table.rs b/dask_planner/src/sql/table.rs index eebc6ff7f..09645be0b 100644 --- a/dask_planner/src/sql/table.rs +++ b/dask_planner/src/sql/table.rs @@ -9,8 +9,8 @@ use async_trait::async_trait; use datafusion::arrow::datatypes::{DataType, Field, SchemaRef}; pub use datafusion::datasource::TableProvider; use datafusion::error::DataFusionError; +use datafusion::logical_expr::{Expr, LogicalPlan, TableSource}; use datafusion::physical_plan::{empty::EmptyExec, project_schema, ExecutionPlan}; -use datafusion_expr::{Expr, LogicalPlan, TableSource}; use pyo3::prelude::*;