Skip to content

Commit e8ad5e5

Browse files
mnpwalamb
andauthored
chore: move SanityChecker into physical-optimizer crate (#14083)
* chore: move into crate * chore: move SanityChecker tests out to datafusion/core/tests * chore: update datafusion-cli/Cargo.lock * fix cargo doc --------- Co-authored-by: Andrew Lamb <[email protected]>
1 parent 5fa8b3b commit e8ad5e5

File tree

15 files changed

+1187
-1125
lines changed

15 files changed

+1187
-1125
lines changed

datafusion-cli/Cargo.lock

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

datafusion/core/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ async-trait = { workspace = true }
141141
criterion = { version = "0.5", features = ["async_tokio"] }
142142
ctor = { workspace = true }
143143
datafusion-functions-window-common = { workspace = true }
144+
datafusion-physical-optimizer = { workspace = true }
144145
doc-comment = { workspace = true }
145146
env_logger = { workspace = true }
146147
paste = "^1.0"

datafusion/core/src/physical_optimizer/enforce_distribution.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1416,9 +1416,6 @@ pub(crate) mod tests {
14161416
use crate::datasource::object_store::ObjectStoreUrl;
14171417
use crate::datasource::physical_plan::{CsvExec, FileScanConfig, ParquetExec};
14181418
use crate::physical_optimizer::enforce_sorting::EnforceSorting;
1419-
use crate::physical_optimizer::test_utils::{
1420-
check_integrity, coalesce_partitions_exec, repartition_exec,
1421-
};
14221419
use crate::physical_plan::coalesce_batches::CoalesceBatchesExec;
14231420
use crate::physical_plan::expressions::col;
14241421
use crate::physical_plan::filter::FilterExec;
@@ -1427,6 +1424,9 @@ pub(crate) mod tests {
14271424
use crate::physical_plan::sorts::sort::SortExec;
14281425
use crate::physical_plan::{displayable, DisplayAs, DisplayFormatType, Statistics};
14291426
use datafusion_physical_optimizer::output_requirements::OutputRequirements;
1427+
use datafusion_physical_optimizer::test_utils::{
1428+
check_integrity, coalesce_partitions_exec, repartition_exec,
1429+
};
14301430

14311431
use arrow::datatypes::{DataType, Field, Schema, SchemaRef};
14321432
use datafusion_common::ScalarValue;

datafusion/core/src/physical_optimizer/enforce_sorting.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -658,17 +658,17 @@ fn get_sort_exprs(
658658
mod tests {
659659
use super::*;
660660
use crate::physical_optimizer::enforce_distribution::EnforceDistribution;
661-
use crate::physical_optimizer::test_utils::{
662-
aggregate_exec, bounded_window_exec, check_integrity, coalesce_batches_exec,
663-
coalesce_partitions_exec, filter_exec, global_limit_exec, hash_join_exec,
664-
limit_exec, local_limit_exec, memory_exec, parquet_exec, parquet_exec_sorted,
665-
repartition_exec, sort_exec, sort_expr, sort_expr_options, sort_merge_join_exec,
666-
sort_preserving_merge_exec, spr_repartition_exec, union_exec,
667-
RequirementsTestExec,
668-
};
661+
use crate::physical_optimizer::test_utils::{parquet_exec, parquet_exec_sorted};
669662
use crate::physical_plan::{displayable, get_plan_string, Partitioning};
670663
use crate::prelude::{SessionConfig, SessionContext};
671664
use crate::test::{csv_exec_ordered, csv_exec_sorted, stream_exec_ordered};
665+
use datafusion_physical_optimizer::test_utils::{
666+
aggregate_exec, bounded_window_exec, check_integrity, coalesce_batches_exec,
667+
coalesce_partitions_exec, filter_exec, global_limit_exec, hash_join_exec,
668+
limit_exec, local_limit_exec, memory_exec, repartition_exec, sort_exec,
669+
sort_expr, sort_expr_options, sort_merge_join_exec, sort_preserving_merge_exec,
670+
spr_repartition_exec, union_exec, RequirementsTestExec,
671+
};
672672

673673
use arrow::compute::SortOptions;
674674
use arrow::datatypes::{DataType, Field, Schema, SchemaRef};

datafusion/core/src/physical_optimizer/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ pub mod enforce_sorting;
2727
pub mod optimizer;
2828
pub mod projection_pushdown;
2929
pub mod replace_with_order_preserving_variants;
30-
pub mod sanity_checker;
3130
#[cfg(test)]
3231
pub mod test_utils;
3332

datafusion/core/src/physical_optimizer/replace_with_order_preserving_variants.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ mod tests {
286286
use super::*;
287287

288288
use crate::execution::TaskContext;
289-
use crate::physical_optimizer::test_utils::check_integrity;
290289
use crate::physical_plan::coalesce_batches::CoalesceBatchesExec;
291290
use crate::physical_plan::filter::FilterExec;
292291
use crate::physical_plan::joins::{HashJoinExec, PartitionMode};
@@ -296,6 +295,7 @@ mod tests {
296295
};
297296
use crate::prelude::{SessionConfig, SessionContext};
298297
use crate::test::TestStreamPartition;
298+
use datafusion_physical_optimizer::test_utils::check_integrity;
299299

300300
use arrow::array::{ArrayRef, Int32Array};
301301
use arrow::compute::SortOptions;

0 commit comments

Comments
 (0)