You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ji...@apache.org on 2022/02/09 10:07:48 UTC
[arrow-datafusion] branch physical-plan created (now e5d417e)
This is an automated email from the ASF dual-hosted git repository.
jiayuliu pushed a change to branch physical-plan
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git.
at e5d417e remove reference to logical plan in physical plan
This branch includes the following new commits:
new e5d417e remove reference to logical plan in physical plan
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[arrow-datafusion] 01/01: remove reference to logical plan in physical plan
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiayuliu pushed a commit to branch physical-plan
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
commit e5d417ebbf9a3052d006c3a83d68c8e6df356ef4
Author: Jiayu Liu <ji...@hey.com>
AuthorDate: Wed Feb 9 18:07:30 2022 +0800
remove reference to logical plan in physical plan
---
datafusion/src/physical_plan/coercion_rule/binary_rule.rs | 4 ++--
datafusion/src/physical_plan/expressions/binary.rs | 2 +-
datafusion/src/physical_plan/expressions/case.rs | 2 +-
datafusion/src/physical_plan/file_format/parquet.rs | 13 +++++++------
datafusion/src/physical_plan/filter.rs | 3 ++-
datafusion/src/physical_plan/planner.rs | 7 ++++---
datafusion/src/physical_plan/windows/aggregate.rs | 2 +-
datafusion/src/physical_plan/windows/mod.rs | 2 +-
8 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/datafusion/src/physical_plan/coercion_rule/binary_rule.rs b/datafusion/src/physical_plan/coercion_rule/binary_rule.rs
index 426d59f..7d4dd55 100644
--- a/datafusion/src/physical_plan/coercion_rule/binary_rule.rs
+++ b/datafusion/src/physical_plan/coercion_rule/binary_rule.rs
@@ -19,8 +19,8 @@
use crate::arrow::datatypes::DataType;
use crate::error::{DataFusionError, Result};
-use crate::logical_plan::Operator;
use crate::scalar::{MAX_PRECISION_FOR_DECIMAL128, MAX_SCALE_FOR_DECIMAL128};
+use datafusion_expr::Operator;
/// Coercion rules for all binary operators. Returns the output type
/// of applying `op` to an argument of `lhs_type` and `rhs_type`.
@@ -494,7 +494,7 @@ mod tests {
use super::*;
use crate::arrow::datatypes::DataType;
use crate::error::{DataFusionError, Result};
- use crate::logical_plan::Operator;
+ use datafusion_expr::Operator;
#[test]
diff --git a/datafusion/src/physical_plan/expressions/binary.rs b/datafusion/src/physical_plan/expressions/binary.rs
index d1fc3bc..9f007a2 100644
--- a/datafusion/src/physical_plan/expressions/binary.rs
+++ b/datafusion/src/physical_plan/expressions/binary.rs
@@ -59,11 +59,11 @@ use arrow::error::ArrowError::DivideByZero;
use arrow::record_batch::RecordBatch;
use crate::error::{DataFusionError, Result};
-use crate::logical_plan::Operator;
use crate::physical_plan::coercion_rule::binary_rule::coerce_types;
use crate::physical_plan::expressions::try_cast;
use crate::physical_plan::{ColumnarValue, PhysicalExpr};
use crate::scalar::ScalarValue;
+use datafusion_expr::Operator;
// Simple (low performance) kernels until optimized kernels are added to arrow
// See https://github.com/apache/arrow-rs/issues/960
diff --git a/datafusion/src/physical_plan/expressions/case.rs b/datafusion/src/physical_plan/expressions/case.rs
index 2a680d3..d990d74 100644
--- a/datafusion/src/physical_plan/expressions/case.rs
+++ b/datafusion/src/physical_plan/expressions/case.rs
@@ -456,12 +456,12 @@ mod tests {
use super::*;
use crate::{
error::Result,
- logical_plan::Operator,
physical_plan::expressions::{binary, col, lit},
scalar::ScalarValue,
};
use arrow::array::StringArray;
use arrow::datatypes::*;
+ use datafusion_expr::Operator;
#[test]
fn case_with_expr() -> Result<()> {
diff --git a/datafusion/src/physical_plan/file_format/parquet.rs b/datafusion/src/physical_plan/file_format/parquet.rs
index 40acf5a..0f4255e 100644
--- a/datafusion/src/physical_plan/file_format/parquet.rs
+++ b/datafusion/src/physical_plan/file_format/parquet.rs
@@ -26,7 +26,6 @@ use crate::datasource::object_store::ObjectStore;
use crate::datasource::PartitionedFile;
use crate::{
error::{DataFusionError, Result},
- logical_plan::{Column, Expr},
physical_optimizer::pruning::{PruningPredicate, PruningStatistics},
physical_plan::{
file_format::FileScanConfig,
@@ -37,6 +36,8 @@ use crate::{
},
scalar::ScalarValue,
};
+use datafusion_common::Column;
+use datafusion_expr::Expr;
use arrow::{
array::ArrayRef,
@@ -919,7 +920,7 @@ mod tests {
#[test]
fn row_group_pruning_predicate_simple_expr() -> Result<()> {
- use crate::logical_plan::{col, lit};
+ use datafusion_expr::{col, lit};
// int > 1 => c1_max > 1
let expr = col("c1").gt(lit(15));
let schema = Schema::new(vec![Field::new("c1", DataType::Int32, false)]);
@@ -952,7 +953,7 @@ mod tests {
#[test]
fn row_group_pruning_predicate_missing_stats() -> Result<()> {
- use crate::logical_plan::{col, lit};
+ use datafusion_expr::{col, lit};
// int > 1 => c1_max > 1
let expr = col("c1").gt(lit(15));
let schema = Schema::new(vec![Field::new("c1", DataType::Int32, false)]);
@@ -987,7 +988,7 @@ mod tests {
#[test]
fn row_group_pruning_predicate_partial_expr() -> Result<()> {
- use crate::logical_plan::{col, lit};
+ use datafusion_expr::{col, lit};
// test row group predicate with partially supported expression
// int > 1 and int % 2 => c1_max > 1 and true
let expr = col("c1").gt(lit(15)).and(col("c2").modulus(lit(2)));
@@ -1073,7 +1074,7 @@ mod tests {
#[test]
fn row_group_pruning_predicate_null_expr() -> Result<()> {
- use crate::logical_plan::{col, lit};
+ use datafusion_expr::{col, lit};
// int > 1 and IsNull(bool) => c1_max > 1 and bool_null_count > 0
let expr = col("c1").gt(lit(15)).and(col("c2").is_null());
let schema = Arc::new(Schema::new(vec![
@@ -1101,7 +1102,7 @@ mod tests {
#[test]
fn row_group_pruning_predicate_eq_null_expr() -> Result<()> {
- use crate::logical_plan::{col, lit};
+ use datafusion_expr::{col, lit};
// test row group predicate with an unknown (Null) expr
//
// int > 1 and bool = NULL => c1_max > 1 and null
diff --git a/datafusion/src/physical_plan/filter.rs b/datafusion/src/physical_plan/filter.rs
index a48d112..b600b1b 100644
--- a/datafusion/src/physical_plan/filter.rs
+++ b/datafusion/src/physical_plan/filter.rs
@@ -228,13 +228,14 @@ mod tests {
use super::*;
use crate::datasource::object_store::local::LocalFileSystem;
+ use crate::physical_plan::collect;
use crate::physical_plan::expressions::*;
use crate::physical_plan::file_format::{CsvExec, FileScanConfig};
use crate::physical_plan::ExecutionPlan;
use crate::scalar::ScalarValue;
use crate::test;
use crate::test_util;
- use crate::{logical_plan::Operator, physical_plan::collect};
+ use datafusion_expr::Operator;
use std::iter::Iterator;
#[tokio::test]
diff --git a/datafusion/src/physical_plan/planner.rs b/datafusion/src/physical_plan/planner.rs
index bf8be3d..ee5266d 100644
--- a/datafusion/src/physical_plan/planner.rs
+++ b/datafusion/src/physical_plan/planner.rs
@@ -1430,17 +1430,18 @@ mod tests {
use crate::execution::options::CsvReadOptions;
use crate::execution::runtime_env::RuntimeEnv;
use crate::logical_plan::plan::Extension;
- use crate::logical_plan::{DFField, DFSchema, DFSchemaRef};
use crate::physical_plan::{
expressions, DisplayFormatType, Partitioning, Statistics,
};
use crate::scalar::ScalarValue;
use crate::{
- logical_plan::{col, lit, sum, LogicalPlanBuilder},
- physical_plan::SendableRecordBatchStream,
+ logical_plan::LogicalPlanBuilder, physical_plan::SendableRecordBatchStream,
};
use arrow::datatypes::{DataType, Field, SchemaRef};
use async_trait::async_trait;
+ use datafusion_common::{DFField, DFSchema, DFSchemaRef};
+ use datafusion_expr::sum;
+ use datafusion_expr::{col, lit};
use fmt::Debug;
use std::convert::TryFrom;
use std::{any::Any, fmt};
diff --git a/datafusion/src/physical_plan/windows/aggregate.rs b/datafusion/src/physical_plan/windows/aggregate.rs
index f7c29ba..4c97e2b 100644
--- a/datafusion/src/physical_plan/windows/aggregate.rs
+++ b/datafusion/src/physical_plan/windows/aggregate.rs
@@ -18,7 +18,6 @@
//! Physical exec for aggregate window function expressions.
use crate::error::{DataFusionError, Result};
-use crate::logical_plan::window_frames::{WindowFrame, WindowFrameUnits};
use crate::physical_plan::windows::find_ranges_in_range;
use crate::physical_plan::{
expressions::PhysicalSortExpr, Accumulator, AggregateExpr, PhysicalExpr, WindowExpr,
@@ -26,6 +25,7 @@ use crate::physical_plan::{
use arrow::compute::concat;
use arrow::record_batch::RecordBatch;
use arrow::{array::ArrayRef, datatypes::Field};
+use datafusion_expr::{WindowFrame, WindowFrameUnits};
use std::any::Any;
use std::iter::IntoIterator;
use std::ops::Range;
diff --git a/datafusion/src/physical_plan/windows/mod.rs b/datafusion/src/physical_plan/windows/mod.rs
index 243c571..b3bf9ce 100644
--- a/datafusion/src/physical_plan/windows/mod.rs
+++ b/datafusion/src/physical_plan/windows/mod.rs
@@ -18,7 +18,6 @@
//! Physical expressions for window functions
use crate::error::{DataFusionError, Result};
-use crate::logical_plan::window_frames::WindowFrame;
use crate::physical_plan::{
aggregates,
expressions::{
@@ -34,6 +33,7 @@ use crate::physical_plan::{
};
use crate::scalar::ScalarValue;
use arrow::datatypes::Schema;
+use datafusion_expr::WindowFrame;
use std::convert::TryInto;
use std::ops::Range;
use std::sync::Arc;