Skip to content

Migrate physical plan tests to insta (Part-3 / Final) #15399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 24, 2025
Merged

Migrate physical plan tests to insta (Part-3 / Final) #15399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
39a421c
Migrated tests to insta in sorts/partial_sort.rs
Shreyaskr1409 Mar 24, 2025
f0442b8
Migrated tests to insta in sorts/sort.rs and sorts/sort_preserving_me…
Shreyaskr1409 Mar 24, 2025
5bb219e
Migrated tests to insta in windows/bounded_window_agg_exec.rs
Shreyaskr1409 Mar 24, 2025
d1c2ff9
Removed unused imports
Shreyaskr1409 Mar 24, 2025
184d119
Fixes for failing tests
Shreyaskr1409 Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
116 changes: 59 additions & 57 deletions datafusion/physical-plan/src/sorts/partial_sort.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,11 +467,12 @@ mod tests {
use arrow::array::*;
use arrow::compute::SortOptions;
use arrow::datatypes::*;
use datafusion_common::test_util::batches_to_string;
use futures::FutureExt;
use insta::allow_duplicates;
use insta::assert_snapshot;
use itertools::Itertools;

use datafusion_common::assert_batches_eq;

use crate::collect;
use crate::expressions::col;
use crate::expressions::PhysicalSortExpr;
Expand Down Expand Up @@ -522,20 +523,21 @@ mod tests {

let result = collect(partial_sort_exec, Arc::clone(&task_ctx)).await?;

let expected_after_sort = [
"+---+---+---+",
"| a | b | c |",
"+---+---+---+",
"| 0 | 1 | 0 |",
"| 0 | 1 | 1 |",
"| 0 | 2 | 5 |",
"| 1 | 2 | 4 |",
"| 1 | 3 | 2 |",
"| 1 | 3 | 3 |",
"+---+---+---+",
];
assert_eq!(2, result.len());
assert_batches_eq!(expected_after_sort, &result);
allow_duplicates! {
assert_snapshot!(batches_to_string(&result), @r#"
+---+---+---+
| a | b | c |
+---+---+---+
| 0 | 1 | 0 |
| 0 | 1 | 1 |
| 0 | 2 | 5 |
| 1 | 2 | 4 |
| 1 | 3 | 2 |
| 1 | 3 | 3 |
+---+---+---+
"#);
}
assert_eq!(
task_ctx.runtime_env().memory_pool.reserved(),
0,
Expand Down Expand Up @@ -588,18 +590,19 @@ mod tests {

let result = collect(partial_sort_exec, Arc::clone(&task_ctx)).await?;

let expected_after_sort = [
"+---+---+---+",
"| a | b | c |",
"+---+---+---+",
"| 0 | 1 | 4 |",
"| 0 | 2 | 3 |",
"| 1 | 2 | 2 |",
"| 1 | 3 | 0 |",
"+---+---+---+",
];
assert_eq!(2, result.len());
assert_batches_eq!(expected_after_sort, &result);
allow_duplicates! {
assert_snapshot!(batches_to_string(&result), @r#"
+---+---+---+
| a | b | c |
+---+---+---+
| 0 | 1 | 4 |
| 0 | 2 | 3 |
| 1 | 2 | 2 |
| 1 | 3 | 0 |
+---+---+---+
"#);
}
assert_eq!(
task_ctx.runtime_env().memory_pool.reserved(),
0,
Expand Down Expand Up @@ -663,21 +666,22 @@ mod tests {
0,
"The sort should have returned all memory used back to the memory manager"
);
let expected = [
"+---+---+---+",
"| a | b | c |",
"+---+---+---+",
"| 0 | 1 | 6 |",
"| 0 | 1 | 7 |",
"| 0 | 3 | 4 |",
"| 0 | 3 | 5 |",
"| 1 | 2 | 0 |",
"| 1 | 2 | 1 |",
"| 1 | 4 | 2 |",
"| 1 | 4 | 3 |",
"+---+---+---+",
];
assert_batches_eq!(expected, &result);
allow_duplicates! {
assert_snapshot!(batches_to_string(&result), @r#"
+---+---+---+
| a | b | c |
+---+---+---+
| 0 | 1 | 6 |
| 0 | 1 | 7 |
| 0 | 3 | 4 |
| 0 | 3 | 5 |
| 1 | 2 | 0 |
| 1 | 2 | 1 |
| 1 | 4 | 2 |
| 1 | 4 | 3 |
+---+---+---+
"#);
}
}
Ok(())
}
Expand Down Expand Up @@ -1000,21 +1004,6 @@ mod tests {
2,
));

let expected = [
"+-----+------+-------+",
"| a | b | c |",
"+-----+------+-------+",
"| 1.0 | 20.0 | 20.0 |",
"| 1.0 | 20.0 | 10.0 |",
"| 1.0 | 40.0 | 10.0 |",
"| 2.0 | 40.0 | 100.0 |",
"| 2.0 | NaN | NaN |",
"| 3.0 | | |",
"| 3.0 | | 100.0 |",
"| 3.0 | NaN | NaN |",
"+-----+------+-------+",
];

assert_eq!(
DataType::Float32,
*partial_sort_exec.schema().field(0).data_type()
Expand All @@ -1033,7 +1022,20 @@ mod tests {
task_ctx,
)
.await?;
assert_batches_eq!(expected, &result);
assert_snapshot!(batches_to_string(&result), @r#"
+-----+------+-------+
| a | b | c |
+-----+------+-------+
| 1.0 | 20.0 | 20.0 |
| 1.0 | 20.0 | 10.0 |
| 1.0 | 40.0 | 10.0 |
| 2.0 | 40.0 | 100.0 |
| 2.0 | NaN | NaN |
| 3.0 | | |
| 3.0 | | 100.0 |
| 3.0 | NaN | NaN |
+-----+------+-------+
"#);
assert_eq!(result.len(), 2);
let metrics = partial_sort_exec.metrics().unwrap();
assert!(metrics.elapsed_compute().unwrap() > 0);
Expand Down
35 changes: 18 additions & 17 deletions datafusion/physical-plan/src/sorts/sort.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1244,14 +1244,16 @@ mod tests {
use arrow::compute::SortOptions;
use arrow::datatypes::*;
use datafusion_common::cast::as_primitive_array;
use datafusion_common::{assert_batches_eq, Result, ScalarValue};
use datafusion_common::test_util::batches_to_string;
use datafusion_common::{Result, ScalarValue};
use datafusion_execution::config::SessionConfig;
use datafusion_execution::runtime_env::RuntimeEnvBuilder;
use datafusion_execution::RecordBatchStream;
use datafusion_physical_expr::expressions::{Column, Literal};
use datafusion_physical_expr::EquivalenceProperties;

use futures::{FutureExt, Stream};
use insta::assert_snapshot;

#[derive(Debug, Clone)]
pub struct SortedUnboundedExec {
Expand Down Expand Up @@ -1913,22 +1915,21 @@ mod tests {
plan = plan.with_fetch(Some(9));

let batches = collect(Arc::new(plan), task_ctx).await?;
#[rustfmt::skip]
let expected = [
"+----+",
"| c1 |",
"+----+",
"| 0 |",
"| 1 |",
"| 2 |",
"| 3 |",
"| 4 |",
"| 5 |",
"| 6 |",
"| 7 |",
"| 8 |",
"+----+",];
assert_batches_eq!(expected, &batches);
assert_snapshot!(batches_to_string(&batches), @r#"
+----+
| c1 |
+----+
| 0 |
| 1 |
| 2 |
| 3 |
| 4 |
| 5 |
| 6 |
| 7 |
| 8 |
+----+
"#);
Ok(())
}
}
Loading