Skip to content

Migrate user_defined tests to insta #15255

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 13 commits into from
Mar 18, 2025
Merged

Migrate user_defined tests to insta #15255

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1d7de54
migrate user_defined tests to insta
shruti2522 Mar 15, 2025
b35d630
Merge branch 'main' into insta_user
shruti2522 Mar 15, 2025
b0d18df
fix tests
shruti2522 Mar 15, 2025
46bb92f
test
shruti2522 Mar 16, 2025
40b9a12
fmt
shruti2522 Mar 16, 2025
1e4d20f
update snaps
shruti2522 Mar 16, 2025
08ebef5
add snaps
shruti2522 Mar 16, 2025
d695e53
add snaps
shruti2522 Mar 16, 2025
259aedd
add inline snapshots
shruti2522 Mar 17, 2025
fe1447c
fix
shruti2522 Mar 17, 2025
5d4ada3
remove snaps
shruti2522 Mar 17, 2025
c6cdabd
Reuse batches_to_stirng
alamb Mar 18, 2025
6f86fe5
Merge remote-tracking branch 'apache/main' into insta_user
alamb Mar 18, 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
40 changes: 13 additions & 27 deletions datafusion/core/tests/user_defined/expr_planner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
use arrow::array::RecordBatch;
use std::sync::Arc;

use datafusion::common::{assert_batches_eq, DFSchema};
use datafusion::common::DFSchema;
use datafusion::error::Result;
use datafusion::execution::FunctionRegistry;
use datafusion::logical_expr::Operator;
Expand Down Expand Up @@ -73,52 +73,38 @@ async fn plan_and_collect(sql: &str) -> Result<Vec<RecordBatch>> {
ctx.sql(sql).await?.collect().await
}

fn fmt_batches(batches: &[RecordBatch]) -> String {
use arrow::util::pretty::pretty_format_batches;
match pretty_format_batches(batches) {
Ok(formatted) => formatted.to_string(),
Err(e) => format!("Error formatting record batches: {}", e),
}
}

@blaginin blaginin Mar 18, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we use batches_to_string for that?


#[tokio::test]
async fn test_custom_operators_arrow() {
let actual = plan_and_collect("select 'foo'->'bar';").await.unwrap();
let expected = [
"+----------------------------+",
"| Utf8(\"foo\") || Utf8(\"bar\") |",
"+----------------------------+",
"| foobar |",
"+----------------------------+",
];
assert_batches_eq!(&expected, &actual);
insta::assert_snapshot!(fmt_batches(&actual));
}

#[tokio::test]
async fn test_custom_operators_long_arrow() {
let actual = plan_and_collect("select 1->>2;").await.unwrap();
let expected = [
"+---------------------+",
"| Int64(1) + Int64(2) |",
"+---------------------+",
"| 3 |",
"+---------------------+",
];
assert_batches_eq!(&expected, &actual);
insta::assert_snapshot!(fmt_batches(&actual));
}

#[tokio::test]
async fn test_question_select() {
let actual = plan_and_collect("select a ? 2 from (select 1 as a);")
.await
.unwrap();
let expected = [
"+--------------+",
"| a ? Int64(2) |",
"+--------------+",
"| true |",
"+--------------+",
];
assert_batches_eq!(&expected, &actual);
insta::assert_snapshot!(fmt_batches(&actual));
}

#[tokio::test]
async fn test_question_filter() {
let actual = plan_and_collect("select a from (select 1 as a) where a ? 2;")
.await
.unwrap();
let expected = ["+---+", "| a |", "+---+", "| 1 |", "+---+"];
assert_batches_eq!(&expected, &actual);
insta::assert_snapshot!(fmt_batches(&actual));
}
9 changes: 9 additions & 0 deletions ...apshots/user_defined_integration__user_defined__expr_planner__custom_operators_arrow.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/expr_planner.rs
expression: fmt_batches(&actual)
---
+----------------------------+
| Utf8("foo") || Utf8("bar") |
+----------------------------+
| foobar |
+----------------------------+
9 changes: 9 additions & 0 deletions ...ts/user_defined_integration__user_defined__expr_planner__custom_operators_long_arrow.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/expr_planner.rs
expression: fmt_batches(&actual)
---
+---------------------+
| Int64(1) + Int64(2) |
+---------------------+
| 3 |
+---------------------+
9 changes: 9 additions & 0 deletions ...ined/snapshots/user_defined_integration__user_defined__expr_planner__question_filter.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/expr_planner.rs
expression: fmt_batches(&actual)
---
+---+
| a |
+---+
| 1 |
+---+
9 changes: 9 additions & 0 deletions ...ined/snapshots/user_defined_integration__user_defined__expr_planner__question_select.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/expr_planner.rs
expression: fmt_batches(&actual)
---
+--------------+
| a ? Int64(2) |
+--------------+
| true |
+--------------+
9 changes: 9 additions & 0 deletions ...defined__user_defined_aggregates__case_sensitive_identifiers_user_defined_aggregates.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/user_defined_aggregates.rs
expression: fmt_batches(&result)
---
+-------------+
| MY_AVG(t.i) |
+-------------+
| 1.0 |
+-------------+
9 changes: 9 additions & 0 deletions ...ined_integration__user_defined__user_defined_aggregates__parameterized_aggregate_udf.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/user_defined_aggregates.rs
expression: fmt_batches(&actual)
---
+------+---+---+
| text | a | b |
+------+---+---+
| foo | 1 | 2 |
+------+---+---+
13 changes: 13 additions & 0 deletions ...ned/snapshots/user_defined_integration__user_defined__user_defined_aggregates__setup.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
source: datafusion/core/tests/user_defined/user_defined_aggregates.rs
expression: fmt_batches(&actual)
---
+-------+----------------------------+
| value | time |
+-------+----------------------------+
| 2.0 | 1970-01-01T00:00:00.000002 |
| 3.0 | 1970-01-01T00:00:00.000003 |
| 1.0 | 1970-01-01T00:00:00.000004 |
| 5.0 | 1970-01-01T00:00:00.000005 |
| 5.0 | 1970-01-01T00:00:00.000005 |
+-------+----------------------------+
9 changes: 9 additions & 0 deletions ...apshots/user_defined_integration__user_defined__user_defined_aggregates__simple_udaf.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/user_defined_aggregates.rs
expression: fmt_batches(&result)
---
+-------------+
| my_avg(t.a) |
+-------------+
| 3.0 |
+-------------+
9 changes: 9 additions & 0 deletions ...ined/snapshots/user_defined_integration__user_defined__user_defined_aggregates__udaf.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/user_defined_aggregates.rs
expression: fmt_batches(&actual)
---
+----------------------------+
| time_sum(t.time) |
+----------------------------+
| 1970-01-01T00:00:00.000019 |
+----------------------------+
13 changes: 13 additions & 0 deletions ...hots/user_defined_integration__user_defined__user_defined_aggregates__udaf_as_window.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
source: datafusion/core/tests/user_defined/user_defined_aggregates.rs
expression: fmt_batches(&actual)
---
+----------------------------+
| time_sum |
+----------------------------+
| 1970-01-01T00:00:00.000019 |
| 1970-01-01T00:00:00.000019 |
| 1970-01-01T00:00:00.000019 |
| 1970-01-01T00:00:00.000019 |
| 1970-01-01T00:00:00.000019 |
+----------------------------+
13 changes: 13 additions & 0 deletions ...efined_integration__user_defined__user_defined_aggregates__udaf_as_window_with_frame.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
source: datafusion/core/tests/user_defined/user_defined_aggregates.rs
expression: fmt_batches(&actual)
---
+----------------------------+
| time_sum |
+----------------------------+
| 1970-01-01T00:00:00.000005 |
| 1970-01-01T00:00:00.000009 |
| 1970-01-01T00:00:00.000012 |
| 1970-01-01T00:00:00.000014 |
| 1970-01-01T00:00:00.000010 |
+----------------------------+
9 changes: 9 additions & 0 deletions ...er_defined_integration__user_defined__user_defined_aggregates__udaf_returning_struct.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/user_defined_aggregates.rs
expression: fmt_batches(&actual)
---
+------------------------------------------------+
| first(t.value,t.time) |
+------------------------------------------------+
| {value: 2.0, time: 1970-01-01T00:00:00.000002} |
+------------------------------------------------+
9 changes: 9 additions & 0 deletions ...d_integration__user_defined__user_defined_aggregates__udaf_returning_struct_subquery.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/user_defined_aggregates.rs
expression: fmt_batches(&actual)
---
+-----------------+----------------------------+
| sq.first[value] | sq.first[time] |
+-----------------+----------------------------+
| 2.0 | 1970-01-01T00:00:00.000002 |
+-----------------+----------------------------+
9 changes: 9 additions & 0 deletions ...efined_integration__user_defined__user_defined_aggregates__udaf_shadows_builtin_fn-2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/user_defined_aggregates.rs
expression: fmt_batches(&actual)
---
+----------------------------+
| sum(t.time) |
+----------------------------+
| 1970-01-01T00:00:00.000019 |
+----------------------------+
9 changes: 9 additions & 0 deletions ..._defined_integration__user_defined__user_defined_aggregates__udaf_shadows_builtin_fn.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/user_defined_aggregates.rs
expression: fmt_batches(&actual)
---
+---------------------------------------+
| sum(arrow_cast(t.time,Utf8("Int64"))) |
+---------------------------------------+
| 19000 |
+---------------------------------------+
9 changes: 9 additions & 0 deletions ...egration__user_defined__user_defined_aggregates__user_defined_functions_with_alias-2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/user_defined_aggregates.rs
expression: fmt_batches(&alias_result)
---
+------------+
| dummy(t.i) |
+------------+
| 1.0 |
+------------+
9 changes: 9 additions & 0 deletions ...ntegration__user_defined__user_defined_aggregates__user_defined_functions_with_alias.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/user_defined_aggregates.rs
expression: fmt_batches(&result)
---
+------------+
| dummy(t.i) |
+------------+
| 1.0 |
+------------+
12 changes: 12 additions & 0 deletions ...ots/user_defined_integration__user_defined__user_defined_plan__query_Default_context.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
source: datafusion/core/tests/user_defined/user_defined_plan.rs
description: Default context
expression: actual
---
+-------------+---------+
| customer_id | revenue |
+-------------+---------+
| paul | 300 |
| jorge | 200 |
| andy | 150 |
+-------------+---------+
12 changes: 12 additions & 0 deletions ..._integration__user_defined__user_defined_plan__query_Default_context_without_schemas.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
source: datafusion/core/tests/user_defined/user_defined_plan.rs
description: Default context without schemas
expression: actual
---
+----------+----------+
| column_1 | column_2 |
+----------+----------+
| andrew | 100 |
| jorge | 200 |
| andy | 150 |
+----------+----------+
10 changes: 10 additions & 0 deletions ...hots/user_defined_integration__user_defined__user_defined_plan__query_MyAnalyzerRule.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
source: datafusion/core/tests/user_defined/user_defined_plan.rs
description: MyAnalyzerRule
expression: actual
---
+------------+--------------------------+
| UInt64(42) | arrow_typeof(UInt64(42)) |
+------------+--------------------------+
| 42 | UInt64 |
+------------+--------------------------+
12 changes: 12 additions & 0 deletions ...pshots/user_defined_integration__user_defined__user_defined_plan__query_Topk_context.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
source: datafusion/core/tests/user_defined/user_defined_plan.rs
description: Topk context
expression: actual
---
+-------------+---------+
| customer_id | revenue |
+-------------+---------+
| paul | 300 |
| jorge | 200 |
| andy | 150 |
+-------------+---------+
9 changes: 9 additions & 0 deletions ...ed__user_defined_scalar_functions__case_sensitive_identifiers_user_defined_functions.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/user_defined_scalar_functions.rs
expression: fmt_batches(&result)
---
+--------------+
| MY_FUNC(t.i) |
+--------------+
| 1 |
+--------------+
9 changes: 9 additions & 0 deletions ...defined_integration__user_defined__user_defined_scalar_functions__csv_query_avg_sqrt.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/user_defined_scalar_functions.rs
expression: fmt_batches(&actual)
---
+------------------------------------------+
| avg(custom_sqrt(aggregate_test_100.c12)) |
+------------------------------------------+
| 0.6706002946036459 |
+------------------------------------------+
9 changes: 9 additions & 0 deletions ...gration__user_defined__user_defined_scalar_functions__csv_query_custom_udf_with_cast.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/user_defined_scalar_functions.rs
expression: fmt_batches(&actual)
---
+------------------------------------------+
| avg(custom_sqrt(aggregate_test_100.c11)) |
+------------------------------------------+
| 0.6584408483418835 |
+------------------------------------------+
12 changes: 12 additions & 0 deletions ...ts/user_defined_integration__user_defined__user_defined_scalar_functions__scalar_udf.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
source: datafusion/core/tests/user_defined/user_defined_scalar_functions.rs
expression: fmt_batches(&result)
---
+-----+-----+-----------------+
| a | b | my_add(t.a,t.b) |
+-----+-----+-----------------+
| 1 | 2 | 3 |
| 10 | 12 | 22 |
| 10 | 12 | 22 |
| 100 | 120 | 220 |
+-----+-----+-----------------+
9 changes: 9 additions & 0 deletions ...defined__user_defined_scalar_functions__scalar_udf_override_built_in_scalar_function.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/user_defined_scalar_functions.rs
expression: fmt_batches(&result)
---
+---+
| a |
+---+
| 1 |
+---+
9 changes: 9 additions & 0 deletions ...d_integration__user_defined__user_defined_scalar_functions__scalar_udf_zero_params-2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/user_defined_scalar_functions.rs
expression: fmt_batches(&result)
---
+-----+
| a |
+-----+
| 100 |
+-----+
6 changes: 6 additions & 0 deletions ...d_integration__user_defined__user_defined_scalar_functions__scalar_udf_zero_params-3.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
source: datafusion/core/tests/user_defined/user_defined_scalar_functions.rs
expression: fmt_batches(&result)
---
++
++
12 changes: 12 additions & 0 deletions ...ned_integration__user_defined__user_defined_scalar_functions__scalar_udf_zero_params.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
source: datafusion/core/tests/user_defined/user_defined_scalar_functions.rs
expression: fmt_batches(&result)
---
+-----+
| a |
+-----+
| 100 |
| 100 |
| 100 |
| 100 |
+-----+
9 changes: 9 additions & 0 deletions ...on__user_defined__user_defined_scalar_functions__user_defined_functions_with_alias-2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
source: datafusion/core/tests/user_defined/user_defined_scalar_functions.rs
expression: fmt_batches(&alias_result)
---
+------------+
| dummy(t.i) |
+------------+
| 1 |
+------------+
Loading