Skip to content

Migrate physical plan tests to insta (Part-1) #15313

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
alamb merged 16 commits into from
Mar 22, 2025
Merged

Migrate physical plan tests to insta (Part-1) #15313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2b89ca2
Basic setup done for physical plan insta tests
Shreyaskr1409 Mar 17, 2025
437db0b
Migrated tests to insta in aggregate/mod.rs
Shreyaskr1409 Mar 19, 2025
7485b22
Migrated tests to insta in aggregate/topk/priority_map.rs
Shreyaskr1409 Mar 19, 2025
0202be9
Migrated tests to insta in joins
Shreyaskr1409 Mar 19, 2025
b152ec5
Fallback to previous implementation in a test due to an issue (#15312)
Shreyaskr1409 Mar 19, 2025
5bdf25f
Merge branch 'main' into insta_physical_plan
Shreyaskr1409 Mar 19, 2025
c33d477
Fix formatting
Shreyaskr1409 Mar 19, 2025
92edb3a
Update Cargo.toml
Shreyaskr1409 Mar 19, 2025
fdf5a03
Revert any Cargo.lock changes
Shreyaskr1409 Mar 19, 2025
aab9551
Clean workspace and attempt fixing failing build test
Shreyaskr1409 Mar 20, 2025
e4569ab
format Cargo.toml
Shreyaskr1409 Mar 20, 2025
d67e82a
Add insta as a dev-dependency instead
Shreyaskr1409 Mar 20, 2025
dcc0a91
Update datafusion/physical-plan/src/aggregates/mod.rs
Shreyaskr1409 Mar 21, 2025
e43b377
Preserved comments from aggregates/mod.rs
Shreyaskr1409 Mar 22, 2025
ad4d308
Merge branch 'main' into insta_physical_plan
Shreyaskr1409 Mar 22, 2025
e325655
Resolved errors regarding dependencies and formatting
Shreyaskr1409 Mar 22, 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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions datafusion/physical-plan/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ tokio = { workspace = true }
criterion = { workspace = true, features = ["async_futures"] }
datafusion-functions-aggregate = { workspace = true }
datafusion-functions-window = { workspace = true }
insta = { workspace = true }
rand = { workspace = true }
rstest = { workspace = true }
rstest_reuse = "0.7.0"
Expand Down
382 changes: 200 additions & 182 deletions datafusion/physical-plan/src/aggregates/mod.rs
View file
Open in desktop

Large diffs are not rendered by default.

53 changes: 23 additions & 30 deletions datafusion/physical-plan/src/aggregates/topk/priority_map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ mod tests {
};
use arrow::datatypes::{Field, Schema, SchemaRef};
use arrow::util::pretty::pretty_format_batches;
use insta::assert_snapshot;
use std::sync::Arc;

#[test]
Expand Down Expand Up @@ -180,15 +181,15 @@ mod tests {
let cols = agg.emit()?;
let batch = RecordBatch::try_new(test_schema(), cols)?;
let actual = format!("{}", pretty_format_batches(&[batch])?);
let expected = r#"

assert_snapshot!(actual, @r#"
+----------+--------------+
| trace_id | timestamp_ms |
+----------+--------------+
| 1 | 1 |
+----------+--------------+
"#
.trim();
assert_eq!(actual, expected);
);

Ok(())
}
Expand All @@ -205,15 +206,15 @@ mod tests {
let cols = agg.emit()?;
let batch = RecordBatch::try_new(test_schema(), cols)?;
let actual = format!("{}", pretty_format_batches(&[batch])?);
let expected = r#"

assert_snapshot!(actual, @r#"
+----------+--------------+
| trace_id | timestamp_ms |
+----------+--------------+
| 1 | 1 |
+----------+--------------+
"#
.trim();
assert_eq!(actual, expected);
);

Ok(())
}
Expand All @@ -230,15 +231,14 @@ mod tests {
let cols = agg.emit()?;
let batch = RecordBatch::try_new(test_schema(), cols)?;
let actual = format!("{}", pretty_format_batches(&[batch])?);
let expected = r#"
assert_snapshot!(actual, @r#"
+----------+--------------+
| trace_id | timestamp_ms |
+----------+--------------+
| 2 | 2 |
+----------+--------------+
"#
.trim();
assert_eq!(actual, expected);
);

Ok(())
}
Expand All @@ -255,15 +255,14 @@ mod tests {
let cols = agg.emit()?;
let batch = RecordBatch::try_new(test_schema(), cols)?;
let actual = format!("{}", pretty_format_batches(&[batch])?);
let expected = r#"
assert_snapshot!(actual, @r#"
+----------+--------------+
| trace_id | timestamp_ms |
+----------+--------------+
| 1 | 1 |
+----------+--------------+
"#
.trim();
assert_eq!(actual, expected);
);

Ok(())
}
Expand All @@ -280,15 +279,14 @@ mod tests {
let cols = agg.emit()?;
let batch = RecordBatch::try_new(test_schema(), cols)?;
let actual = format!("{}", pretty_format_batches(&[batch])?);
let expected = r#"
assert_snapshot!(actual, @r#"
+----------+--------------+
| trace_id | timestamp_ms |
+----------+--------------+
| 1 | 2 |
+----------+--------------+
"#
.trim();
assert_eq!(actual, expected);
);

Ok(())
}
Expand All @@ -305,15 +303,14 @@ mod tests {
let cols = agg.emit()?;
let batch = RecordBatch::try_new(test_schema(), cols)?;
let actual = format!("{}", pretty_format_batches(&[batch])?);
let expected = r#"
assert_snapshot!(actual, @r#"
+----------+--------------+
| trace_id | timestamp_ms |
+----------+--------------+
| 1 | 1 |
+----------+--------------+
"#
.trim();
assert_eq!(actual, expected);
);

Ok(())
}
Expand All @@ -330,15 +327,14 @@ mod tests {
let cols = agg.emit()?;
let batch = RecordBatch::try_new(test_schema(), cols)?;
let actual = format!("{}", pretty_format_batches(&[batch])?);
let expected = r#"
assert_snapshot!(actual, @r#"
+----------+--------------+
| trace_id | timestamp_ms |
+----------+--------------+
| 2 | 2 |
+----------+--------------+
"#
.trim();
assert_eq!(actual, expected);
);

Ok(())
}
Expand All @@ -355,15 +351,14 @@ mod tests {
let cols = agg.emit()?;
let batch = RecordBatch::try_new(test_schema(), cols)?;
let actual = format!("{}", pretty_format_batches(&[batch])?);
let expected = r#"
assert_snapshot!(actual, @r#"
+----------+--------------+
| trace_id | timestamp_ms |
+----------+--------------+
| 1 | 1 |
+----------+--------------+
"#
.trim();
assert_eq!(actual, expected);
);

Ok(())
}
Expand All @@ -380,15 +375,14 @@ mod tests {
let cols = agg.emit()?;
let batch = RecordBatch::try_new(test_schema(), cols)?;
let actual = format!("{}", pretty_format_batches(&[batch])?);
let expected = r#"
assert_snapshot!(actual, @r#"
+----------+--------------+
| trace_id | timestamp_ms |
+----------+--------------+
| 1 | 2 |
+----------+--------------+
"#
.trim();
assert_eq!(actual, expected);
);

Ok(())
}
Expand All @@ -406,16 +400,15 @@ mod tests {
let cols = agg.emit()?;
let batch = RecordBatch::try_new(test_schema(), cols)?;
let actual = format!("{}", pretty_format_batches(&[batch])?);
let expected = r#"
assert_snapshot!(actual, @r#"
+----------+--------------+
| trace_id | timestamp_ms |
+----------+--------------+
| | 3 |
| 1 | 1 |
+----------+--------------+
"#
.trim();
assert_eq!(actual, expected);
);

Ok(())
}
Expand Down
30 changes: 15 additions & 15 deletions datafusion/physical-plan/src/joins/cross_join.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,8 +645,9 @@ mod tests {
use crate::common;
use crate::test::build_table_scan_i32;

use datafusion_common::{assert_batches_sorted_eq, assert_contains};
use datafusion_common::{assert_contains, test_util::batches_to_sort_string};
use datafusion_execution::runtime_env::RuntimeEnvBuilder;
use insta::assert_snapshot;

async fn join_collect(
left: Arc<dyn ExecutionPlan>,
Expand Down Expand Up @@ -829,20 +830,19 @@ mod tests {
let (columns, batches) = join_collect(left, right, task_ctx).await?;

assert_eq!(columns, vec!["a1", "b1", "c1", "a2", "b2", "c2"]);
let expected = [
"+----+----+----+----+----+----+",
"| a1 | b1 | c1 | a2 | b2 | c2 |",
"+----+----+----+----+----+----+",
"| 1 | 4 | 7 | 10 | 12 | 14 |",
"| 1 | 4 | 7 | 11 | 13 | 15 |",
"| 2 | 5 | 8 | 10 | 12 | 14 |",
"| 2 | 5 | 8 | 11 | 13 | 15 |",
"| 3 | 6 | 9 | 10 | 12 | 14 |",
"| 3 | 6 | 9 | 11 | 13 | 15 |",
"+----+----+----+----+----+----+",
];

assert_batches_sorted_eq!(expected, &batches);

assert_snapshot!(batches_to_sort_string(&batches), @r#"
+----+----+----+----+----+----+
| a1 | b1 | c1 | a2 | b2 | c2 |
+----+----+----+----+----+----+
| 1 | 4 | 7 | 10 | 12 | 14 |
| 1 | 4 | 7 | 11 | 13 | 15 |
| 2 | 5 | 8 | 10 | 12 | 14 |
| 2 | 5 | 8 | 11 | 13 | 15 |
| 3 | 6 | 9 | 10 | 12 | 14 |
| 3 | 6 | 9 | 11 | 13 | 15 |
+----+----+----+----+----+----+
"#);

Ok(())
}
Expand Down
Loading