You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by al...@apache.org on 2023/06/08 13:56:06 UTC
[arrow-datafusion] branch main updated: Minor: Remove some `use crate::` uses in physical_plan (#6573)
This is an automated email from the ASF dual-hosted git repository.
alamb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new d689daf83f Minor: Remove some `use crate::` uses in physical_plan (#6573)
d689daf83f is described below
commit d689daf83f387d7cf1895b2fad6b347d216e47fc
Author: Andrew Lamb <an...@nerdnetworks.org>
AuthorDate: Thu Jun 8 09:56:01 2023 -0400
Minor: Remove some `use crate::` uses in physical_plan (#6573)
* Update `use crate::error` to `use datafusion_common` in physical_plan
* More updates
---
datafusion/core/src/physical_plan/analyze.rs | 10 ++++------
datafusion/core/src/physical_plan/coalesce_batches.rs | 2 +-
datafusion/core/src/physical_plan/coalesce_partitions.rs | 2 +-
datafusion/core/src/physical_plan/common.rs | 4 ++--
datafusion/core/src/physical_plan/empty.rs | 2 +-
datafusion/core/src/physical_plan/explain.rs | 3 ++-
datafusion/core/src/physical_plan/filter.rs | 2 +-
datafusion/core/src/physical_plan/insert.rs | 2 +-
datafusion/core/src/physical_plan/joins/cross_join.rs | 2 +-
datafusion/core/src/physical_plan/joins/hash_join.rs | 10 +++++-----
datafusion/core/src/physical_plan/joins/hash_join_utils.rs | 2 +-
datafusion/core/src/physical_plan/joins/nested_loop_join.rs | 4 ++--
datafusion/core/src/physical_plan/joins/sort_merge_join.rs | 6 +++---
datafusion/core/src/physical_plan/joins/symmetric_hash_join.rs | 2 +-
datafusion/core/src/physical_plan/joins/utils.rs | 4 ++--
datafusion/core/src/physical_plan/limit.rs | 2 +-
datafusion/core/src/physical_plan/memory.rs | 2 +-
datafusion/core/src/physical_plan/metrics/baseline.rs | 2 +-
datafusion/core/src/physical_plan/mod.rs | 4 ++--
datafusion/core/src/physical_plan/projection.rs | 4 ++--
datafusion/core/src/physical_plan/repartition/mod.rs | 4 ++--
datafusion/core/src/physical_plan/sorts/builder.rs | 2 +-
datafusion/core/src/physical_plan/sorts/merge.rs | 2 +-
datafusion/core/src/physical_plan/sorts/sort.rs | 2 +-
.../core/src/physical_plan/sorts/sort_preserving_merge.rs | 4 ++--
datafusion/core/src/physical_plan/sorts/stream.rs | 2 +-
datafusion/core/src/physical_plan/stream.rs | 2 +-
datafusion/core/src/physical_plan/udaf.rs | 2 +-
datafusion/core/src/physical_plan/union.rs | 10 ++++------
datafusion/core/src/physical_plan/unnest.rs | 5 +----
datafusion/core/src/physical_plan/values.rs | 4 ++--
.../core/src/physical_plan/windows/bounded_window_agg_exec.rs | 2 +-
datafusion/core/src/physical_plan/windows/mod.rs | 4 ++--
datafusion/core/src/physical_plan/windows/window_agg_exec.rs | 2 +-
34 files changed, 56 insertions(+), 62 deletions(-)
diff --git a/datafusion/core/src/physical_plan/analyze.rs b/datafusion/core/src/physical_plan/analyze.rs
index 9be68337b2..3923033d2e 100644
--- a/datafusion/core/src/physical_plan/analyze.rs
+++ b/datafusion/core/src/physical_plan/analyze.rs
@@ -20,14 +20,12 @@
use std::sync::Arc;
use std::{any::Any, time::Instant};
-use crate::{
- error::{DataFusionError, Result},
- physical_plan::{
- display::DisplayableExecutionPlan, DisplayFormatType, ExecutionPlan,
- Partitioning, Statistics,
- },
+use crate::physical_plan::{
+ display::DisplayableExecutionPlan, DisplayFormatType, ExecutionPlan, Partitioning,
+ Statistics,
};
use arrow::{array::StringBuilder, datatypes::SchemaRef, record_batch::RecordBatch};
+use datafusion_common::{DataFusionError, Result};
use futures::StreamExt;
use super::expressions::PhysicalSortExpr;
diff --git a/datafusion/core/src/physical_plan/coalesce_batches.rs b/datafusion/core/src/physical_plan/coalesce_batches.rs
index 09ef972cb2..0ca01aacfa 100644
--- a/datafusion/core/src/physical_plan/coalesce_batches.rs
+++ b/datafusion/core/src/physical_plan/coalesce_batches.rs
@@ -23,11 +23,11 @@ use std::pin::Pin;
use std::sync::Arc;
use std::task::{Context, Poll};
-use crate::error::Result;
use crate::physical_plan::{
DisplayFormatType, EquivalenceProperties, ExecutionPlan, Partitioning,
RecordBatchStream, SendableRecordBatchStream,
};
+use datafusion_common::Result;
use arrow::datatypes::SchemaRef;
use arrow::error::Result as ArrowResult;
diff --git a/datafusion/core/src/physical_plan/coalesce_partitions.rs b/datafusion/core/src/physical_plan/coalesce_partitions.rs
index 66700cd9e7..d05c413caf 100644
--- a/datafusion/core/src/physical_plan/coalesce_partitions.rs
+++ b/datafusion/core/src/physical_plan/coalesce_partitions.rs
@@ -27,10 +27,10 @@ use super::expressions::PhysicalSortExpr;
use super::metrics::{BaselineMetrics, ExecutionPlanMetricsSet, MetricsSet};
use super::stream::{ObservedStream, RecordBatchReceiverStream};
use super::Statistics;
-use crate::error::{DataFusionError, Result};
use crate::physical_plan::{
DisplayFormatType, EquivalenceProperties, ExecutionPlan, Partitioning,
};
+use datafusion_common::{DataFusionError, Result};
use super::SendableRecordBatchStream;
use datafusion_execution::TaskContext;
diff --git a/datafusion/core/src/physical_plan/common.rs b/datafusion/core/src/physical_plan/common.rs
index 2f296ce462..031c2dd0f3 100644
--- a/datafusion/core/src/physical_plan/common.rs
+++ b/datafusion/core/src/physical_plan/common.rs
@@ -18,13 +18,13 @@
//! Defines common code used in execution plans
use super::SendableRecordBatchStream;
-use crate::error::{DataFusionError, Result};
-use crate::execution::memory_pool::MemoryReservation;
use crate::physical_plan::stream::RecordBatchReceiverStream;
use crate::physical_plan::{ColumnStatistics, ExecutionPlan, Statistics};
use arrow::datatypes::Schema;
use arrow::ipc::writer::{FileWriter, IpcWriteOptions};
use arrow::record_batch::RecordBatch;
+use datafusion_common::{DataFusionError, Result};
+use datafusion_execution::memory_pool::MemoryReservation;
use datafusion_physical_expr::expressions::{BinaryExpr, Column};
use datafusion_physical_expr::{PhysicalExpr, PhysicalSortExpr};
use futures::{Future, StreamExt, TryStreamExt};
diff --git a/datafusion/core/src/physical_plan/empty.rs b/datafusion/core/src/physical_plan/empty.rs
index c0c500053a..627444ffd9 100644
--- a/datafusion/core/src/physical_plan/empty.rs
+++ b/datafusion/core/src/physical_plan/empty.rs
@@ -20,13 +20,13 @@
use std::any::Any;
use std::sync::Arc;
-use crate::error::{DataFusionError, Result};
use crate::physical_plan::{
memory::MemoryStream, DisplayFormatType, ExecutionPlan, Partitioning,
};
use arrow::array::{ArrayRef, NullArray};
use arrow::datatypes::{DataType, Field, Fields, Schema, SchemaRef};
use arrow::record_batch::RecordBatch;
+use datafusion_common::{DataFusionError, Result};
use log::trace;
use super::expressions::PhysicalSortExpr;
diff --git a/datafusion/core/src/physical_plan/explain.rs b/datafusion/core/src/physical_plan/explain.rs
index 1b9e7809d5..fc70626d9b 100644
--- a/datafusion/core/src/physical_plan/explain.rs
+++ b/datafusion/core/src/physical_plan/explain.rs
@@ -20,8 +20,9 @@
use std::any::Any;
use std::sync::Arc;
+use datafusion_common::{DataFusionError, Result};
+
use crate::{
- error::{DataFusionError, Result},
logical_expr::StringifiedPlan,
physical_plan::{DisplayFormatType, ExecutionPlan, Partitioning, Statistics},
};
diff --git a/datafusion/core/src/physical_plan/filter.rs b/datafusion/core/src/physical_plan/filter.rs
index e615ece452..a6f00846de 100644
--- a/datafusion/core/src/physical_plan/filter.rs
+++ b/datafusion/core/src/physical_plan/filter.rs
@@ -25,7 +25,6 @@ use std::task::{Context, Poll};
use super::expressions::PhysicalSortExpr;
use super::{ColumnStatistics, RecordBatchStream, SendableRecordBatchStream, Statistics};
-use crate::error::{DataFusionError, Result};
use crate::physical_plan::{
metrics::{BaselineMetrics, ExecutionPlanMetricsSet, MetricsSet},
Column, DisplayFormatType, EquivalenceProperties, ExecutionPlan, Partitioning,
@@ -35,6 +34,7 @@ use arrow::compute::filter_record_batch;
use arrow::datatypes::{DataType, SchemaRef};
use arrow::record_batch::RecordBatch;
use datafusion_common::cast::as_boolean_array;
+use datafusion_common::{DataFusionError, Result};
use datafusion_expr::Operator;
use datafusion_physical_expr::expressions::BinaryExpr;
use datafusion_physical_expr::{split_conjunction, AnalysisContext};
diff --git a/datafusion/core/src/physical_plan/insert.rs b/datafusion/core/src/physical_plan/insert.rs
index c608b64e6f..6e02a54da2 100644
--- a/datafusion/core/src/physical_plan/insert.rs
+++ b/datafusion/core/src/physical_plan/insert.rs
@@ -21,13 +21,13 @@ use super::expressions::PhysicalSortExpr;
use super::{
DisplayFormatType, ExecutionPlan, Partitioning, SendableRecordBatchStream, Statistics,
};
-use crate::error::Result;
use arrow::datatypes::SchemaRef;
use arrow::record_batch::RecordBatch;
use arrow_array::{ArrayRef, UInt64Array};
use arrow_schema::{DataType, Field, Schema};
use async_trait::async_trait;
use core::fmt;
+use datafusion_common::Result;
use datafusion_physical_expr::PhysicalSortRequirement;
use futures::StreamExt;
use std::any::Any;
diff --git a/datafusion/core/src/physical_plan/joins/cross_join.rs b/datafusion/core/src/physical_plan/joins/cross_join.rs
index c445bfba2f..eb567ee130 100644
--- a/datafusion/core/src/physical_plan/joins/cross_join.rs
+++ b/datafusion/core/src/physical_plan/joins/cross_join.rs
@@ -32,9 +32,9 @@ use crate::physical_plan::{
ExecutionPlan, Partitioning, PhysicalSortExpr, RecordBatchStream,
SendableRecordBatchStream, Statistics,
};
-use crate::{error::Result, scalar::ScalarValue};
use async_trait::async_trait;
use datafusion_common::DataFusionError;
+use datafusion_common::{Result, ScalarValue};
use datafusion_execution::memory_pool::{MemoryConsumer, MemoryReservation};
use datafusion_execution::TaskContext;
diff --git a/datafusion/core/src/physical_plan/joins/hash_join.rs b/datafusion/core/src/physical_plan/joins/hash_join.rs
index a6cb1c6f82..0e62540d6d 100644
--- a/datafusion/core/src/physical_plan/joins/hash_join.rs
+++ b/datafusion/core/src/physical_plan/joins/hash_join.rs
@@ -53,10 +53,6 @@ use std::{any::Any, usize, vec};
use datafusion_common::cast::{as_dictionary_array, as_string_array};
use datafusion_execution::memory_pool::MemoryReservation;
-use crate::arrow::array::BooleanBufferBuilder;
-use crate::arrow::datatypes::TimeUnit;
-use crate::error::{DataFusionError, Result};
-use crate::execution::{context::TaskContext, memory_pool::MemoryConsumer};
use crate::physical_plan::joins::utils::{
adjust_indices_by_join_type, apply_join_filter_to_indices, build_batch_from_indices,
get_final_indices_from_bit_map, need_produce_result_in_final, JoinSide,
@@ -77,7 +73,11 @@ use crate::physical_plan::{
DisplayFormatType, Distribution, EquivalenceProperties, ExecutionPlan, Partitioning,
PhysicalExpr, RecordBatchStream, SendableRecordBatchStream, Statistics,
};
+use arrow::array::BooleanBufferBuilder;
+use arrow::datatypes::TimeUnit;
use datafusion_common::JoinType;
+use datafusion_common::{DataFusionError, Result};
+use datafusion_execution::{memory_pool::MemoryConsumer, TaskContext};
use super::{
utils::{OnceAsync, OnceFut},
@@ -1270,7 +1270,6 @@ mod tests {
use crate::{
assert_batches_sorted_eq,
common::assert_contains,
- execution::runtime_env::{RuntimeConfig, RuntimeEnv},
physical_plan::{
common,
expressions::Column,
@@ -1282,6 +1281,7 @@ mod tests {
test::exec::MockExec,
test::{build_table_i32, columns},
};
+ use datafusion_execution::runtime_env::{RuntimeConfig, RuntimeEnv};
use super::*;
diff --git a/datafusion/core/src/physical_plan/joins/hash_join_utils.rs b/datafusion/core/src/physical_plan/joins/hash_join_utils.rs
index f411370ef0..992de86dfe 100644
--- a/datafusion/core/src/physical_plan/joins/hash_join_utils.rs
+++ b/datafusion/core/src/physical_plan/joins/hash_join_utils.rs
@@ -32,8 +32,8 @@ use datafusion_physical_expr::{PhysicalExpr, PhysicalSortExpr};
use hashbrown::raw::RawTable;
use smallvec::SmallVec;
-use crate::common::Result;
use crate::physical_plan::joins::utils::{JoinFilter, JoinSide};
+use datafusion_common::Result;
// Maps a `u64` hash value based on the build side ["on" values] to a list of indices with this key's value.
//
diff --git a/datafusion/core/src/physical_plan/joins/nested_loop_join.rs b/datafusion/core/src/physical_plan/joins/nested_loop_join.rs
index 679ae5b3c5..82e677f720 100644
--- a/datafusion/core/src/physical_plan/joins/nested_loop_join.rs
+++ b/datafusion/core/src/physical_plan/joins/nested_loop_join.rs
@@ -48,8 +48,8 @@ use std::fmt::Formatter;
use std::sync::Arc;
use std::task::Poll;
-use crate::error::Result;
use crate::physical_plan::coalesce_batches::concat_batches;
+use datafusion_common::Result;
use datafusion_execution::memory_pool::MemoryConsumer;
use datafusion_execution::TaskContext;
@@ -726,6 +726,7 @@ impl RecordBatchStream for NestedLoopJoinStream {
#[cfg(test)]
mod tests {
+ use super::*;
use crate::physical_expr::expressions::BinaryExpr;
use crate::{
assert_batches_sorted_eq,
@@ -742,7 +743,6 @@ mod tests {
use arrow::datatypes::{DataType, Field};
use datafusion_expr::Operator;
- use super::*;
use crate::physical_plan::joins::utils::JoinSide;
use crate::prelude::SessionContext;
use datafusion_common::ScalarValue;
diff --git a/datafusion/core/src/physical_plan/joins/sort_merge_join.rs b/datafusion/core/src/physical_plan/joins/sort_merge_join.rs
index 67e111fd46..aa6a77925e 100644
--- a/datafusion/core/src/physical_plan/joins/sort_merge_join.rs
+++ b/datafusion/core/src/physical_plan/joins/sort_merge_join.rs
@@ -38,8 +38,6 @@ use arrow::record_batch::RecordBatch;
use datafusion_physical_expr::PhysicalSortRequirement;
use futures::{Stream, StreamExt};
-use crate::error::DataFusionError;
-use crate::error::Result;
use crate::physical_plan::expressions::Column;
use crate::physical_plan::expressions::PhysicalSortExpr;
use crate::physical_plan::joins::utils::{
@@ -51,7 +49,9 @@ use crate::physical_plan::{
metrics, DisplayFormatType, Distribution, EquivalenceProperties, ExecutionPlan,
Partitioning, PhysicalExpr, RecordBatchStream, SendableRecordBatchStream, Statistics,
};
+use datafusion_common::DataFusionError;
use datafusion_common::JoinType;
+use datafusion_common::Result;
use datafusion_execution::memory_pool::{MemoryConsumer, MemoryReservation};
use datafusion_execution::TaskContext;
@@ -1395,7 +1395,6 @@ mod tests {
use arrow::record_batch::RecordBatch;
use crate::common::assert_contains;
- use crate::error::Result;
use crate::physical_plan::expressions::Column;
use crate::physical_plan::joins::utils::JoinOn;
use crate::physical_plan::joins::SortMergeJoinExec;
@@ -1405,6 +1404,7 @@ mod tests {
use crate::test::{build_table_i32, columns};
use crate::{assert_batches_eq, assert_batches_sorted_eq};
use datafusion_common::JoinType;
+ use datafusion_common::Result;
use datafusion_execution::runtime_env::{RuntimeConfig, RuntimeEnv};
fn build_table(
diff --git a/datafusion/core/src/physical_plan/joins/symmetric_hash_join.rs b/datafusion/core/src/physical_plan/joins/symmetric_hash_join.rs
index eaaec759b9..7eac619687 100644
--- a/datafusion/core/src/physical_plan/joins/symmetric_hash_join.rs
+++ b/datafusion/core/src/physical_plan/joins/symmetric_hash_join.rs
@@ -50,7 +50,6 @@ use datafusion_common::{utils::bisect, ScalarValue};
use datafusion_execution::memory_pool::MemoryConsumer;
use datafusion_physical_expr::intervals::{ExprIntervalGraph, Interval, IntervalBound};
-use crate::error::{DataFusionError, Result};
use crate::physical_plan::common::SharedMemoryReservation;
use crate::physical_plan::joins::hash_join_utils::convert_sort_expr_with_filter_schema;
use crate::physical_plan::joins::hash_join_utils::JoinHashMap;
@@ -71,6 +70,7 @@ use crate::physical_plan::{
RecordBatchStream, SendableRecordBatchStream, Statistics,
};
use datafusion_common::JoinType;
+use datafusion_common::{DataFusionError, Result};
use datafusion_execution::TaskContext;
const HASHMAP_SHRINK_SCALE_FACTOR: usize = 4;
diff --git a/datafusion/core/src/physical_plan/joins/utils.rs b/datafusion/core/src/physical_plan/joins/utils.rs
index 88da4726ec..f7e81b5add 100644
--- a/datafusion/core/src/physical_plan/joins/utils.rs
+++ b/datafusion/core/src/physical_plan/joins/utils.rs
@@ -24,6 +24,7 @@ use arrow::array::{
use arrow::compute;
use arrow::datatypes::{Field, Schema, SchemaBuilder};
use arrow::record_batch::{RecordBatch, RecordBatchOptions};
+use datafusion_physical_expr::expressions::Column;
use futures::future::{BoxFuture, Shared};
use futures::{ready, FutureExt};
use parking_lot::Mutex;
@@ -41,9 +42,8 @@ use datafusion_common::{ScalarValue, SharedResult};
use datafusion_common::tree_node::{Transformed, TreeNode};
use datafusion_physical_expr::{EquivalentClass, PhysicalExpr};
-use crate::error::{DataFusionError, Result};
-use crate::physical_plan::expressions::Column;
use datafusion_common::JoinType;
+use datafusion_common::{DataFusionError, Result};
use crate::physical_plan::metrics::{self, ExecutionPlanMetricsSet, MetricBuilder};
use crate::physical_plan::SchemaRef;
diff --git a/datafusion/core/src/physical_plan/limit.rs b/datafusion/core/src/physical_plan/limit.rs
index ff13f92635..132bae6141 100644
--- a/datafusion/core/src/physical_plan/limit.rs
+++ b/datafusion/core/src/physical_plan/limit.rs
@@ -25,13 +25,13 @@ use std::pin::Pin;
use std::sync::Arc;
use std::task::{Context, Poll};
-use crate::error::{DataFusionError, Result};
use crate::physical_plan::{
DisplayFormatType, Distribution, EquivalenceProperties, ExecutionPlan, Partitioning,
};
use arrow::array::ArrayRef;
use arrow::datatypes::SchemaRef;
use arrow::record_batch::{RecordBatch, RecordBatchOptions};
+use datafusion_common::{DataFusionError, Result};
use super::expressions::PhysicalSortExpr;
use super::{
diff --git a/datafusion/core/src/physical_plan/memory.rs b/datafusion/core/src/physical_plan/memory.rs
index 02bab7b82a..38fa5d549c 100644
--- a/datafusion/core/src/physical_plan/memory.rs
+++ b/datafusion/core/src/physical_plan/memory.rs
@@ -22,10 +22,10 @@ use super::{
common, project_schema, DisplayFormatType, ExecutionPlan, Partitioning,
RecordBatchStream, SendableRecordBatchStream, Statistics,
};
-use crate::error::Result;
use arrow::datatypes::SchemaRef;
use arrow::record_batch::RecordBatch;
use core::fmt;
+use datafusion_common::Result;
use std::any::Any;
use std::sync::Arc;
use std::task::{Context, Poll};
diff --git a/datafusion/core/src/physical_plan/metrics/baseline.rs b/datafusion/core/src/physical_plan/metrics/baseline.rs
index fbbb689aee..7d72a6a9fa 100644
--- a/datafusion/core/src/physical_plan/metrics/baseline.rs
+++ b/datafusion/core/src/physical_plan/metrics/baseline.rs
@@ -22,7 +22,7 @@ use std::task::Poll;
use arrow::record_batch::RecordBatch;
use super::{Count, ExecutionPlanMetricsSet, MetricBuilder, Time, Timestamp};
-use crate::error::Result;
+use datafusion_common::Result;
/// Helper for creating and tracking common "baseline" metrics for
/// each operator
diff --git a/datafusion/core/src/physical_plan/mod.rs b/datafusion/core/src/physical_plan/mod.rs
index 2346452517..13a1888508 100644
--- a/datafusion/core/src/physical_plan/mod.rs
+++ b/datafusion/core/src/physical_plan/mod.rs
@@ -22,9 +22,9 @@ use self::metrics::MetricsSet;
use self::{
coalesce_partitions::CoalescePartitionsExec, display::DisplayableExecutionPlan,
};
-pub use crate::common::{ColumnStatistics, Statistics};
-use crate::error::Result;
use crate::physical_plan::expressions::PhysicalSortExpr;
+use datafusion_common::Result;
+pub use datafusion_common::{ColumnStatistics, Statistics};
use arrow::datatypes::SchemaRef;
use arrow::record_batch::RecordBatch;
diff --git a/datafusion/core/src/physical_plan/projection.rs b/datafusion/core/src/physical_plan/projection.rs
index 40096a5415..5eb578334e 100644
--- a/datafusion/core/src/physical_plan/projection.rs
+++ b/datafusion/core/src/physical_plan/projection.rs
@@ -26,13 +26,13 @@ use std::pin::Pin;
use std::sync::Arc;
use std::task::{Context, Poll};
-use crate::error::Result;
use crate::physical_plan::{
ColumnStatistics, DisplayFormatType, EquivalenceProperties, ExecutionPlan,
Partitioning, PhysicalExpr,
};
use arrow::datatypes::{Field, Schema, SchemaRef};
use arrow::record_batch::{RecordBatch, RecordBatchOptions};
+use datafusion_common::Result;
use datafusion_execution::TaskContext;
use futures::stream::{Stream, StreamExt};
use log::trace;
@@ -407,9 +407,9 @@ mod tests {
use crate::physical_plan::common::collect;
use crate::physical_plan::expressions::{self, col};
use crate::prelude::SessionContext;
- use crate::scalar::ScalarValue;
use crate::test::{self};
use crate::test_util;
+ use datafusion_common::ScalarValue;
use datafusion_expr::Operator;
use datafusion_physical_expr::expressions::binary;
use futures::future;
diff --git a/datafusion/core/src/physical_plan/repartition/mod.rs b/datafusion/core/src/physical_plan/repartition/mod.rs
index 369063dca4..47814a27de 100644
--- a/datafusion/core/src/physical_plan/repartition/mod.rs
+++ b/datafusion/core/src/physical_plan/repartition/mod.rs
@@ -23,8 +23,6 @@ use std::sync::Arc;
use std::task::{Context, Poll};
use std::{any::Any, vec};
-use crate::error::{DataFusionError, Result};
-use crate::execution::memory_pool::MemoryConsumer;
use crate::physical_plan::hash_utils::create_hashes;
use crate::physical_plan::repartition::distributor_channels::channels;
use crate::physical_plan::{
@@ -33,6 +31,8 @@ use crate::physical_plan::{
use arrow::array::{ArrayRef, UInt64Builder};
use arrow::datatypes::SchemaRef;
use arrow::record_batch::RecordBatch;
+use datafusion_common::{DataFusionError, Result};
+use datafusion_execution::memory_pool::MemoryConsumer;
use log::trace;
use self::distributor_channels::{DistributionReceiver, DistributionSender};
diff --git a/datafusion/core/src/physical_plan/sorts/builder.rs b/datafusion/core/src/physical_plan/sorts/builder.rs
index 52e896334e..1c5ec356ee 100644
--- a/datafusion/core/src/physical_plan/sorts/builder.rs
+++ b/datafusion/core/src/physical_plan/sorts/builder.rs
@@ -15,10 +15,10 @@
// specific language governing permissions and limitations
// under the License.
-use crate::common::Result;
use arrow::compute::interleave;
use arrow::datatypes::SchemaRef;
use arrow::record_batch::RecordBatch;
+use datafusion_common::Result;
#[derive(Debug, Copy, Clone, Default)]
struct BatchCursor {
diff --git a/datafusion/core/src/physical_plan/sorts/merge.rs b/datafusion/core/src/physical_plan/sorts/merge.rs
index e6a569c711..d8a3cdef4d 100644
--- a/datafusion/core/src/physical_plan/sorts/merge.rs
+++ b/datafusion/core/src/physical_plan/sorts/merge.rs
@@ -15,7 +15,6 @@
// specific language governing permissions and limitations
// under the License.
-use crate::common::Result;
use crate::physical_plan::metrics::BaselineMetrics;
use crate::physical_plan::sorts::builder::BatchBuilder;
use crate::physical_plan::sorts::cursor::Cursor;
@@ -28,6 +27,7 @@ use crate::physical_plan::{
use arrow::datatypes::{DataType, SchemaRef};
use arrow::record_batch::RecordBatch;
use arrow_array::*;
+use datafusion_common::Result;
use futures::Stream;
use std::pin::Pin;
use std::task::{ready, Context, Poll};
diff --git a/datafusion/core/src/physical_plan/sorts/sort.rs b/datafusion/core/src/physical_plan/sorts/sort.rs
index 53177310cc..83a9c90ebd 100644
--- a/datafusion/core/src/physical_plan/sorts/sort.rs
+++ b/datafusion/core/src/physical_plan/sorts/sort.rs
@@ -19,7 +19,6 @@
//! It will do in-memory sorting if it has enough memory budget
//! but spills to disk if needed.
-use crate::error::{DataFusionError, Result};
use crate::physical_plan::common::{batch_byte_size, spawn_buffered, IPCWriter};
use crate::physical_plan::expressions::PhysicalSortExpr;
use crate::physical_plan::metrics::{
@@ -36,6 +35,7 @@ use arrow::compute::{concat_batches, lexsort_to_indices, take};
use arrow::datatypes::SchemaRef;
use arrow::ipc::reader::FileReader;
use arrow::record_batch::RecordBatch;
+use datafusion_common::{DataFusionError, Result};
use datafusion_execution::memory_pool::{
human_readable_size, MemoryConsumer, MemoryReservation,
};
diff --git a/datafusion/core/src/physical_plan/sorts/sort_preserving_merge.rs b/datafusion/core/src/physical_plan/sorts/sort_preserving_merge.rs
index bf81d74395..9d93a5055e 100644
--- a/datafusion/core/src/physical_plan/sorts/sort_preserving_merge.rs
+++ b/datafusion/core/src/physical_plan/sorts/sort_preserving_merge.rs
@@ -23,7 +23,6 @@ use std::sync::Arc;
use arrow::datatypes::SchemaRef;
use log::{debug, trace};
-use crate::error::{DataFusionError, Result};
use crate::physical_plan::common::spawn_buffered;
use crate::physical_plan::metrics::{
BaselineMetrics, ExecutionPlanMetricsSet, MetricsSet,
@@ -33,6 +32,7 @@ use crate::physical_plan::{
expressions::PhysicalSortExpr, DisplayFormatType, Distribution, ExecutionPlan,
Partitioning, SendableRecordBatchStream, Statistics,
};
+use datafusion_common::{DataFusionError, Result};
use datafusion_execution::TaskContext;
use datafusion_physical_expr::{EquivalenceProperties, PhysicalSortRequirement};
@@ -233,7 +233,6 @@ mod tests {
use arrow::record_batch::RecordBatch;
use futures::{FutureExt, StreamExt};
- use crate::arrow::array::{Int32Array, StringArray, TimestampNanosecondArray};
use crate::from_slice::FromSlice;
use crate::physical_plan::coalesce_partitions::CoalescePartitionsExec;
use crate::physical_plan::expressions::col;
@@ -246,6 +245,7 @@ mod tests {
use crate::test::exec::{assert_strong_count_converges_to_zero, BlockingExec};
use crate::test::{self, assert_is_pending};
use crate::{assert_batches_eq, test_util};
+ use arrow::array::{Int32Array, StringArray, TimestampNanosecondArray};
use super::*;
diff --git a/datafusion/core/src/physical_plan/sorts/stream.rs b/datafusion/core/src/physical_plan/sorts/stream.rs
index 9de6e260db..97a3b85fa5 100644
--- a/datafusion/core/src/physical_plan/sorts/stream.rs
+++ b/datafusion/core/src/physical_plan/sorts/stream.rs
@@ -15,7 +15,6 @@
// specific language governing permissions and limitations
// under the License.
-use crate::common::Result;
use crate::physical_plan::sorts::cursor::{FieldArray, FieldCursor, RowCursor};
use crate::physical_plan::SendableRecordBatchStream;
use crate::physical_plan::{PhysicalExpr, PhysicalSortExpr};
@@ -23,6 +22,7 @@ use arrow::array::Array;
use arrow::datatypes::Schema;
use arrow::record_batch::RecordBatch;
use arrow::row::{RowConverter, SortField};
+use datafusion_common::Result;
use futures::stream::{Fuse, StreamExt};
use std::marker::PhantomData;
use std::sync::Arc;
diff --git a/datafusion/core/src/physical_plan/stream.rs b/datafusion/core/src/physical_plan/stream.rs
index 42ea967138..bdc2050b24 100644
--- a/datafusion/core/src/physical_plan/stream.rs
+++ b/datafusion/core/src/physical_plan/stream.rs
@@ -19,10 +19,10 @@
use std::sync::Arc;
-use crate::error::Result;
use crate::physical_plan::displayable;
use arrow::{datatypes::SchemaRef, record_batch::RecordBatch};
use datafusion_common::DataFusionError;
+use datafusion_common::Result;
use datafusion_execution::TaskContext;
use futures::stream::BoxStream;
use futures::{Future, Stream, StreamExt};
diff --git a/datafusion/core/src/physical_plan/udaf.rs b/datafusion/core/src/physical_plan/udaf.rs
index 07e5cc3e6d..d9f52eba77 100644
--- a/datafusion/core/src/physical_plan/udaf.rs
+++ b/datafusion/core/src/physical_plan/udaf.rs
@@ -27,8 +27,8 @@ use arrow::{
};
use super::{expressions::format_state_name, Accumulator, AggregateExpr};
-use crate::error::Result;
use crate::physical_plan::PhysicalExpr;
+use datafusion_common::Result;
pub use datafusion_expr::AggregateUDF;
use datafusion_physical_expr::aggregate::utils::down_cast_any_ref;
diff --git a/datafusion/core/src/physical_plan/union.rs b/datafusion/core/src/physical_plan/union.rs
index f2b936cf53..a81c43398c 100644
--- a/datafusion/core/src/physical_plan/union.rs
+++ b/datafusion/core/src/physical_plan/union.rs
@@ -42,10 +42,8 @@ use super::{
};
use crate::physical_plan::common::get_meet_of_orderings;
use crate::physical_plan::stream::ObservedStream;
-use crate::{
- error::Result,
- physical_plan::{expressions, metrics::BaselineMetrics},
-};
+use crate::physical_plan::{expressions, metrics::BaselineMetrics};
+use datafusion_common::Result;
use datafusion_execution::TaskContext;
use tokio::macros::support::thread_rng_n;
@@ -244,7 +242,7 @@ impl ExecutionPlan for UnionExec {
warn!("Error in Union: Partition {} not found", partition);
- Err(crate::error::DataFusionError::Execution(format!(
+ Err(DataFusionError::Execution(format!(
"Partition {partition} not found in Union"
)))
}
@@ -418,7 +416,7 @@ impl ExecutionPlan for InterleaveExec {
warn!("Error in InterleaveExec: Partition {} not found", partition);
- Err(crate::error::DataFusionError::Execution(format!(
+ Err(DataFusionError::Execution(format!(
"Partition {partition} not found in InterleaveExec"
)))
}
diff --git a/datafusion/core/src/physical_plan/unnest.rs b/datafusion/core/src/physical_plan/unnest.rs
index 3759e06b76..cd42c3305f 100644
--- a/datafusion/core/src/physical_plan/unnest.rs
+++ b/datafusion/core/src/physical_plan/unnest.rs
@@ -36,10 +36,7 @@ use crate::physical_plan::{
Distribution, EquivalenceProperties, ExecutionPlan, Partitioning, PhysicalExpr,
PhysicalSortExpr, RecordBatchStream, SendableRecordBatchStream, Statistics,
};
-use crate::{
- error::{DataFusionError, Result},
- scalar::ScalarValue,
-};
+use datafusion_common::{DataFusionError, Result, ScalarValue};
/// Unnest the given column by joining the row with each value in the nested type.
#[derive(Debug)]
diff --git a/datafusion/core/src/physical_plan/values.rs b/datafusion/core/src/physical_plan/values.rs
index cbc6dbf6b7..d1cf6927a2 100644
--- a/datafusion/core/src/physical_plan/values.rs
+++ b/datafusion/core/src/physical_plan/values.rs
@@ -19,15 +19,15 @@
use super::expressions::PhysicalSortExpr;
use super::{common, SendableRecordBatchStream, Statistics};
-use crate::error::{DataFusionError, Result};
use crate::physical_plan::{
memory::MemoryStream, ColumnarValue, DisplayFormatType, ExecutionPlan, Partitioning,
PhysicalExpr,
};
-use crate::scalar::ScalarValue;
use arrow::array::new_null_array;
use arrow::datatypes::SchemaRef;
use arrow::record_batch::RecordBatch;
+use datafusion_common::ScalarValue;
+use datafusion_common::{DataFusionError, Result};
use datafusion_execution::TaskContext;
use std::any::Any;
use std::sync::Arc;
diff --git a/datafusion/core/src/physical_plan/windows/bounded_window_agg_exec.rs b/datafusion/core/src/physical_plan/windows/bounded_window_agg_exec.rs
index 09d3a7cbb3..3a95308503 100644
--- a/datafusion/core/src/physical_plan/windows/bounded_window_agg_exec.rs
+++ b/datafusion/core/src/physical_plan/windows/bounded_window_agg_exec.rs
@@ -20,7 +20,6 @@
//! the input data seen so far), which makes it appropriate when processing
//! infinite inputs.
-use crate::error::Result;
use crate::physical_plan::expressions::PhysicalSortExpr;
use crate::physical_plan::metrics::{
BaselineMetrics, ExecutionPlanMetricsSet, MetricsSet,
@@ -32,6 +31,7 @@ use crate::physical_plan::{
ColumnStatistics, DisplayFormatType, Distribution, ExecutionPlan, Partitioning,
RecordBatchStream, SendableRecordBatchStream, Statistics, WindowExpr,
};
+use datafusion_common::Result;
use datafusion_execution::TaskContext;
use ahash::RandomState;
diff --git a/datafusion/core/src/physical_plan/windows/mod.rs b/datafusion/core/src/physical_plan/windows/mod.rs
index b4b2d6bc64..73a3eb10c2 100644
--- a/datafusion/core/src/physical_plan/windows/mod.rs
+++ b/datafusion/core/src/physical_plan/windows/mod.rs
@@ -17,7 +17,6 @@
//! Physical expressions for window functions
-use crate::error::{DataFusionError, Result};
use crate::physical_plan::{
aggregates,
expressions::{
@@ -26,9 +25,10 @@ use crate::physical_plan::{
},
udaf, ExecutionPlan, PhysicalExpr,
};
-use crate::scalar::ScalarValue;
use arrow::datatypes::Schema;
use arrow_schema::{SchemaRef, SortOptions};
+use datafusion_common::ScalarValue;
+use datafusion_common::{DataFusionError, Result};
use datafusion_expr::{
window_function::{BuiltInWindowFunction, WindowFunction},
WindowFrame,
diff --git a/datafusion/core/src/physical_plan/windows/window_agg_exec.rs b/datafusion/core/src/physical_plan/windows/window_agg_exec.rs
index 50aaf8b2fc..f57dfbc0b6 100644
--- a/datafusion/core/src/physical_plan/windows/window_agg_exec.rs
+++ b/datafusion/core/src/physical_plan/windows/window_agg_exec.rs
@@ -17,7 +17,6 @@
//! Stream and channel implementations for window function expressions.
-use crate::error::Result;
use crate::physical_plan::common::transpose;
use crate::physical_plan::expressions::PhysicalSortExpr;
use crate::physical_plan::metrics::{
@@ -41,6 +40,7 @@ use arrow::{
};
use datafusion_common::utils::{evaluate_partition_ranges, get_at_indices};
use datafusion_common::DataFusionError;
+use datafusion_common::Result;
use datafusion_execution::TaskContext;
use datafusion_physical_expr::{OrderingEquivalenceProperties, PhysicalSortRequirement};
use futures::stream::Stream;