Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
alamb committed Nov 7, 2023
1 parent c3430d7 commit f84940c
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 13 deletions.
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ datafusion-physical-plan = { path = "datafusion/physical-plan" }
datafusion-execution = { path = "datafusion/execution" }
datafusion-proto = { path = "datafusion/proto" }
datafusion-sqllogictest = { path = "datafusion/sqllogictest" }
datafusion-statistics = { path = "datafusion/statistics" }
datafusion-substrait = { path = "datafusion/substrait" }
dashmap = "5.4.0"
doc-comment = "0.3"
Expand Down
1 change: 1 addition & 0 deletions datafusion/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ datafusion-expr = { workspace = true }
datafusion-optimizer = { path = "../optimizer", version = "33.0.0", default-features = false }
datafusion-physical-expr = { path = "../physical-expr", version = "33.0.0", default-features = false }
datafusion-physical-plan = { workspace = true }
datafusion-statistics = { workspace = true }
datafusion-sql = { workspace = true }
flate2 = { version = "1.0.24", optional = true }
futures = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions datafusion/execution/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ chrono = { version = "0.4", default-features = false }
dashmap = { workspace = true }
datafusion-common = { workspace = true }
datafusion-expr = { workspace = true }
datafusion-statistics = { workspace = true }
futures = { workspace = true }
hashbrown = { version = "0.14", features = ["raw"] }
log = { workspace = true }
Expand Down
3 changes: 2 additions & 1 deletion datafusion/execution/src/cache/cache_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
// under the License.

use crate::cache::CacheAccessor;
use datafusion_common::{Result, Statistics};
use datafusion_common::Result;
use datafusion_statistics::Statistics;
use object_store::path::Path;
use object_store::ObjectMeta;
use std::fmt::{Debug, Formatter};
Expand Down
2 changes: 1 addition & 1 deletion datafusion/execution/src/cache/cache_unit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use std::sync::Arc;

use crate::cache::CacheAccessor;

use datafusion_common::Statistics;
use datafusion_statistics::Statistics;

use dashmap::DashMap;
use object_store::path::Path;
Expand Down
1 change: 1 addition & 0 deletions datafusion/physical-expr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ blake3 = { version = "1.0", optional = true }
chrono = { workspace = true }
datafusion-common = { workspace = true }
datafusion-expr = { workspace = true }
datafusion-statistics = { workspace = true }
half = { version = "2.1", default-features = false }
hashbrown = { version = "0.14", features = ["raw"] }
hex = { version = "0.4", optional = true }
Expand Down
6 changes: 2 additions & 4 deletions datafusion/physical-expr/src/analysis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@ use crate::utils::collect_columns;
use crate::PhysicalExpr;

use arrow::datatypes::Schema;
use datafusion_common::stats::Precision;
use datafusion_common::{
internal_err, ColumnStatistics, DataFusionError, Result, ScalarValue,
};
use datafusion_common::{internal_err, DataFusionError, Result, ScalarValue};
use datafusion_statistics::{ColumnStatistics, Precision};

/// The shared context used during the analysis of an expression. Includes
/// the boundaries for all known columns.
Expand Down
1 change: 1 addition & 0 deletions datafusion/physical-plan/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ datafusion-common = { workspace = true }
datafusion-execution = { workspace = true }
datafusion-expr = { workspace = true }
datafusion-physical-expr = { workspace = true }
datafusion-statistics = { workspace = true }
futures = { workspace = true }
half = { version = "2.1", default-features = false }
hashbrown = { version = "0.14", features = ["raw"] }
Expand Down
2 changes: 1 addition & 1 deletion datafusion/physical-plan/src/aggregates/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ use crate::{
use arrow::array::ArrayRef;
use arrow::datatypes::{Field, Schema, SchemaRef};
use arrow::record_batch::RecordBatch;
use datafusion_common::stats::Precision;
use datafusion_common::{not_impl_err, plan_err, DataFusionError, Result};
use datafusion_execution::TaskContext;
use datafusion_expr::Accumulator;
Expand All @@ -49,6 +48,7 @@ use datafusion_physical_expr::{
physical_exprs_contains, reverse_order_bys, AggregateExpr, EquivalenceProperties,
LexOrdering, LexRequirement, PhysicalExpr, PhysicalSortExpr, PhysicalSortRequirement,
};
use datafusion_statistics::Precision;

use itertools::{izip, Itertools};

Expand Down
2 changes: 1 addition & 1 deletion datafusion/physical-plan/src/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ use crate::{ColumnStatistics, ExecutionPlan, Statistics};
use arrow::datatypes::Schema;
use arrow::ipc::writer::{FileWriter, IpcWriteOptions};
use arrow::record_batch::RecordBatch;
use datafusion_common::stats::Precision;
use datafusion_common::{plan_err, DataFusionError, Result};
use datafusion_execution::memory_pool::MemoryReservation;
use datafusion_physical_expr::expressions::{BinaryExpr, Column};
use datafusion_physical_expr::{PhysicalExpr, PhysicalSortExpr};
use datafusion_statistics::Precision;

use futures::{Future, StreamExt, TryStreamExt};
use parking_lot::Mutex;
Expand Down
2 changes: 1 addition & 1 deletion datafusion/physical-plan/src/filter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ 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::stats::Precision;
use datafusion_common::{plan_err, DataFusionError, Result};
use datafusion_execution::TaskContext;
use datafusion_expr::Operator;
Expand All @@ -48,6 +47,7 @@ use datafusion_physical_expr::{
analyze, split_conjunction, AnalysisContext, EquivalenceProperties, ExprBoundaries,
PhysicalExpr,
};
use datafusion_statistics::Precision;

use futures::stream::{Stream, StreamExt};
use log::trace;
Expand Down
2 changes: 1 addition & 1 deletion datafusion/physical-plan/src/joins/cross_join.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ use crate::{
use arrow::datatypes::{Fields, Schema, SchemaRef};
use arrow::record_batch::RecordBatch;
use arrow_array::RecordBatchOptions;
use datafusion_common::stats::Precision;
use datafusion_common::{plan_err, DataFusionError, JoinType, Result, ScalarValue};
use datafusion_execution::memory_pool::{MemoryConsumer, MemoryReservation};
use datafusion_execution::TaskContext;
use datafusion_physical_expr::equivalence::join_equivalence_properties;
use datafusion_physical_expr::EquivalenceProperties;
use datafusion_statistics::Precision;

use async_trait::async_trait;
use futures::{ready, Stream, StreamExt, TryStreamExt};
Expand Down
3 changes: 2 additions & 1 deletion datafusion/physical-plan/src/joins/nested_loop_join.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,13 @@ use arrow::array::{
use arrow::datatypes::{Schema, SchemaRef};
use arrow::record_batch::RecordBatch;
use arrow::util::bit_util;
use datafusion_common::{exec_err, DataFusionError, JoinSide, Result, Statistics};
use datafusion_common::{exec_err, DataFusionError, JoinSide, Result};
use datafusion_execution::memory_pool::{MemoryConsumer, MemoryReservation};
use datafusion_execution::TaskContext;
use datafusion_expr::JoinType;
use datafusion_physical_expr::equivalence::join_equivalence_properties;
use datafusion_physical_expr::{EquivalenceProperties, PhysicalSortExpr};
use datafusion_statstics::Statistics;

use futures::{ready, Stream, StreamExt, TryStreamExt};

Expand Down
3 changes: 1 addition & 2 deletions datafusion/statistics/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,5 @@
// under the License.

/// Statistics for DataFusion

mod statistics;
pub use statistics::{Statistics, Precision, ColumnStatistics};
pub use statistics::{ColumnStatistics, Precision, Statistics};

0 comments on commit f84940c

Please sign in to comment.