Skip to content
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

Jump to bottom

ref: use new prepare code and remove some old #778

Merged
merged 7 commits into from
Sep 27, 2023
Merged

ref: use new prepare code and remove some old #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e5d8a3
use order preserving cast
jordanrfrazier Sep 26, 2023
9cd4a9e
Remove column behavior and use new prepare batch
jordanrfrazier Sep 26, 2023
ff2e57c
Fix batch naming
jordanrfrazier Sep 27, 2023
eb7820f
go back to non-order-preserving cast
jordanrfrazier Sep 27, 2023
4a306b9
update subsorts for all tests
jordanrfrazier Sep 27, 2023
15bc824
fix a few more tests
jordanrfrazier Sep 27, 2023
1b2bf06
move atomic subsort outside of loop in execute stream case
jordanrfrazier Sep 27, 2023
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
654 changes: 327 additions & 327 deletions crates/sparrow-main/tests/e2e/aggregation_tests.rs
View file
Open in desktop

Large diffs are not rendered by default.

166 changes: 83 additions & 83 deletions crates/sparrow-main/tests/e2e/cast_tests.rs
View file
Open in desktop

Large diffs are not rendered by default.

122 changes: 61 additions & 61 deletions crates/sparrow-main/tests/e2e/coalesce_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ use crate::QueryFixture;
async fn test_coalesce_two_boolean() {
insta::assert_snapshot!(QueryFixture::new("{ a: Booleans.a, b: Booleans.b, coalesce_a_b: Booleans.a | coalesce($input, Booleans.b) }").run_to_csv(&boolean_data_fixture().await).await.unwrap(), @r###"
_time,_subsort,_key_hash,_key,a,b,coalesce_a_b
1996-12-20T00:39:57.000000000,9223372036854775808,12960666915911099378,A,true,true,true
1996-12-20T00:40:57.000000000,9223372036854775808,2867199309159137213,B,false,false,false
1996-12-20T00:41:57.000000000,9223372036854775808,2867199309159137213,B,,true,true
1996-12-20T00:42:57.000000000,9223372036854775808,2867199309159137213,B,true,false,true
1996-12-20T00:43:57.000000000,9223372036854775808,2867199309159137213,B,false,true,false
1996-12-20T00:44:57.000000000,9223372036854775808,2867199309159137213,B,false,,false
1996-12-20T00:45:57.000000000,9223372036854775808,2867199309159137213,B,,,
1996-12-20T00:39:57.000000000,0,12960666915911099378,A,true,true,true
1996-12-20T00:40:57.000000000,0,2867199309159137213,B,false,false,false
1996-12-20T00:41:57.000000000,0,2867199309159137213,B,,true,true
1996-12-20T00:42:57.000000000,0,2867199309159137213,B,true,false,true
1996-12-20T00:43:57.000000000,0,2867199309159137213,B,false,true,false
1996-12-20T00:44:57.000000000,0,2867199309159137213,B,false,,false
1996-12-20T00:45:57.000000000,0,2867199309159137213,B,,,
"###);
}

Expand Down Expand Up @@ -45,116 +45,116 @@ async fn test_coalesce_zero() {
async fn test_coalesce_one_i64() {
insta::assert_snapshot!(QueryFixture::new("{ m: Numbers.m, coalesce_m: coalesce(Numbers.m) }").run_to_csv(&i64_data_fixture().await).await.unwrap(), @r###"
_time,_subsort,_key_hash,_key,m,coalesce_m
1996-12-20T00:39:57.000000000,9223372036854775808,12960666915911099378,A,5,5
1996-12-20T00:39:58.000000000,9223372036854775808,2867199309159137213,B,24,24
1996-12-20T00:39:59.000000000,9223372036854775808,12960666915911099378,A,17,17
1996-12-20T00:40:00.000000000,9223372036854775808,12960666915911099378,A,,
1996-12-20T00:40:01.000000000,9223372036854775808,12960666915911099378,A,12,12
1996-12-20T00:40:02.000000000,9223372036854775808,12960666915911099378,A,,
1996-12-20T00:39:57.000000000,0,12960666915911099378,A,5,5
1996-12-20T00:39:58.000000000,0,2867199309159137213,B,24,24
1996-12-20T00:39:59.000000000,0,12960666915911099378,A,17,17
1996-12-20T00:40:00.000000000,0,12960666915911099378,A,,
1996-12-20T00:40:01.000000000,0,12960666915911099378,A,12,12
1996-12-20T00:40:02.000000000,0,12960666915911099378,A,,
"###);
}

#[tokio::test]
async fn test_coalesce_one_i64_one_literal_i64() {
insta::assert_snapshot!(QueryFixture::new("{ n: Times.n, coalesce_n_literal: coalesce(Times.n, 12345) }").run_to_csv(&timestamp_ns_data_fixture().await).await.unwrap(), @r###"
_time,_subsort,_key_hash,_key,n,coalesce_n_literal
1994-12-20T00:39:57.000000000,9223372036854775808,12960666915911099378,A,2,2
1995-10-20T00:40:57.000000000,9223372036854775808,2867199309159137213,B,4,4
1996-08-20T00:41:57.000000000,9223372036854775808,2867199309159137213,B,5,5
1997-12-12T00:42:57.000000000,9223372036854775808,2867199309159137213,B,,12345
1998-12-13T00:43:57.000000000,9223372036854775808,2867199309159137213,B,8,8
2004-12-06T00:44:57.000000000,9223372036854775808,2867199309159137213,B,23,23
1994-12-20T00:39:57.000000000,0,12960666915911099378,A,2,2
1995-10-20T00:40:57.000000000,0,2867199309159137213,B,4,4
1996-08-20T00:41:57.000000000,0,2867199309159137213,B,5,5
1997-12-12T00:42:57.000000000,0,2867199309159137213,B,,12345
1998-12-13T00:43:57.000000000,0,2867199309159137213,B,8,8
2004-12-06T00:44:57.000000000,0,2867199309159137213,B,23,23
"###);
}

#[tokio::test]
async fn test_coalesce_one_i64_one_literal_f64() {
insta::assert_snapshot!(QueryFixture::new("{ n: Times.n, coalesce_n_literal: coalesce(Times.n, 12345.7) }").run_to_csv(&timestamp_ns_data_fixture().await).await.unwrap(), @r###"
_time,_subsort,_key_hash,_key,n,coalesce_n_literal
1994-12-20T00:39:57.000000000,9223372036854775808,12960666915911099378,A,2,2.0
1995-10-20T00:40:57.000000000,9223372036854775808,2867199309159137213,B,4,4.0
1996-08-20T00:41:57.000000000,9223372036854775808,2867199309159137213,B,5,5.0
1997-12-12T00:42:57.000000000,9223372036854775808,2867199309159137213,B,,12345.7
1998-12-13T00:43:57.000000000,9223372036854775808,2867199309159137213,B,8,8.0
2004-12-06T00:44:57.000000000,9223372036854775808,2867199309159137213,B,23,23.0
1994-12-20T00:39:57.000000000,0,12960666915911099378,A,2,2.0
1995-10-20T00:40:57.000000000,0,2867199309159137213,B,4,4.0
1996-08-20T00:41:57.000000000,0,2867199309159137213,B,5,5.0
1997-12-12T00:42:57.000000000,0,2867199309159137213,B,,12345.7
1998-12-13T00:43:57.000000000,0,2867199309159137213,B,8,8.0
2004-12-06T00:44:57.000000000,0,2867199309159137213,B,23,23.0
"###);
}

#[tokio::test]
async fn test_coalesce_two_i64() {
insta::assert_snapshot!(QueryFixture::new("{ m: Numbers.m, n: Numbers.n, coalesce_m_n: coalesce(Numbers.m, Numbers.n) }").run_to_csv(&i64_data_fixture().await).await.unwrap(), @r###"
_time,_subsort,_key_hash,_key,m,n,coalesce_m_n
1996-12-20T00:39:57.000000000,9223372036854775808,12960666915911099378,A,5,10,5
1996-12-20T00:39:58.000000000,9223372036854775808,2867199309159137213,B,24,3,24
1996-12-20T00:39:59.000000000,9223372036854775808,12960666915911099378,A,17,6,17
1996-12-20T00:40:00.000000000,9223372036854775808,12960666915911099378,A,,9,9
1996-12-20T00:40:01.000000000,9223372036854775808,12960666915911099378,A,12,,12
1996-12-20T00:40:02.000000000,9223372036854775808,12960666915911099378,A,,,
1996-12-20T00:39:57.000000000,0,12960666915911099378,A,5,10,5
1996-12-20T00:39:58.000000000,0,2867199309159137213,B,24,3,24
1996-12-20T00:39:59.000000000,0,12960666915911099378,A,17,6,17
1996-12-20T00:40:00.000000000,0,12960666915911099378,A,,9,9
1996-12-20T00:40:01.000000000,0,12960666915911099378,A,12,,12
1996-12-20T00:40:02.000000000,0,12960666915911099378,A,,,
"###);
}

#[tokio::test]
async fn test_coalesce_two_i64_one_literal() {
insta::assert_snapshot!(QueryFixture::new("{ m: Numbers.m, n: Numbers.n, coalesce_m_n: coalesce(Numbers.m, Numbers.n, 42) }").run_to_csv(&i64_data_fixture().await).await.unwrap(), @r###"
_time,_subsort,_key_hash,_key,m,n,coalesce_m_n
1996-12-20T00:39:57.000000000,9223372036854775808,12960666915911099378,A,5,10,5
1996-12-20T00:39:58.000000000,9223372036854775808,2867199309159137213,B,24,3,24
1996-12-20T00:39:59.000000000,9223372036854775808,12960666915911099378,A,17,6,17
1996-12-20T00:40:00.000000000,9223372036854775808,12960666915911099378,A,,9,9
1996-12-20T00:40:01.000000000,9223372036854775808,12960666915911099378,A,12,,12
1996-12-20T00:40:02.000000000,9223372036854775808,12960666915911099378,A,,,42
1996-12-20T00:39:57.000000000,0,12960666915911099378,A,5,10,5
1996-12-20T00:39:58.000000000,0,2867199309159137213,B,24,3,24
1996-12-20T00:39:59.000000000,0,12960666915911099378,A,17,6,17
1996-12-20T00:40:00.000000000,0,12960666915911099378,A,,9,9
1996-12-20T00:40:01.000000000,0,12960666915911099378,A,12,,12
1996-12-20T00:40:02.000000000,0,12960666915911099378,A,,,42
"###);
}

#[tokio::test]
async fn test_coalesce_two_f64() {
insta::assert_snapshot!(QueryFixture::new("{ m: Numbers.m, n: Numbers.n, coalesce_m_n: coalesce(Numbers.m, Numbers.n) }").run_to_csv(&f64_data_fixture().await).await.unwrap(), @r###"
_time,_subsort,_key_hash,_key,m,n,coalesce_m_n
1996-12-20T00:39:57.000000000,9223372036854775808,12960666915911099378,A,5.2,10.0,5.2
1996-12-20T00:39:58.000000000,9223372036854775808,2867199309159137213,B,24.3,3.9,24.3
1996-12-20T00:39:59.000000000,9223372036854775808,12960666915911099378,A,17.6,6.2,17.6
1996-12-20T00:40:00.000000000,9223372036854775808,12960666915911099378,A,,9.25,9.25
1996-12-20T00:40:01.000000000,9223372036854775808,12960666915911099378,A,12.4,,12.4
1996-12-20T00:40:02.000000000,9223372036854775808,12960666915911099378,A,,,
1996-12-20T00:39:57.000000000,0,12960666915911099378,A,5.2,10.0,5.2
1996-12-20T00:39:58.000000000,0,2867199309159137213,B,24.3,3.9,24.3
1996-12-20T00:39:59.000000000,0,12960666915911099378,A,17.6,6.2,17.6
1996-12-20T00:40:00.000000000,0,12960666915911099378,A,,9.25,9.25
1996-12-20T00:40:01.000000000,0,12960666915911099378,A,12.4,,12.4
1996-12-20T00:40:02.000000000,0,12960666915911099378,A,,,
"###);
}

#[tokio::test]
async fn test_coalesce_two_string() {
insta::assert_snapshot!(QueryFixture::new("{ s: Strings.s, t: Strings.t, coalesce_s_t: coalesce(Strings.s, Strings.t) }").run_to_csv(&strings_data_fixture().await).await.unwrap(), @r###"
_time,_subsort,_key_hash,_key,s,t,coalesce_s_t
1996-12-20T00:39:57.000000000,9223372036854775808,12960666915911099378,A,hEllo,hEllo,hEllo
1996-12-20T00:40:57.000000000,9223372036854775808,2867199309159137213,B,World,world,World
1996-12-20T00:41:57.000000000,9223372036854775808,2867199309159137213,B,hello world,hello world,hello world
1996-12-20T00:42:57.000000000,9223372036854775808,2867199309159137213,B,,greetings,
1996-12-20T00:43:57.000000000,9223372036854775808,2867199309159137213,B,,salutations,
1996-12-20T00:44:57.000000000,9223372036854775808,2867199309159137213,B,goodbye,,goodbye
1996-12-20T00:39:57.000000000,0,12960666915911099378,A,hEllo,hEllo,hEllo
1996-12-20T00:40:57.000000000,0,2867199309159137213,B,World,world,World
1996-12-20T00:41:57.000000000,0,2867199309159137213,B,hello world,hello world,hello world
1996-12-20T00:42:57.000000000,0,2867199309159137213,B,,greetings,
1996-12-20T00:43:57.000000000,0,2867199309159137213,B,,salutations,
1996-12-20T00:44:57.000000000,0,2867199309159137213,B,goodbye,,goodbye
"###);
}

#[tokio::test]
async fn test_coalesce_two_timestamp_ns() {
insta::assert_snapshot!(QueryFixture::new("{ m: Times.m, n: Times.n, coalesce_m_n: coalesce(Times.m, Times.n) }").run_to_csv(&timestamp_ns_data_fixture().await).await.unwrap(), @r###"
_time,_subsort,_key_hash,_key,m,n,coalesce_m_n
1994-12-20T00:39:57.000000000,9223372036854775808,12960666915911099378,A,4,2,4
1995-10-20T00:40:57.000000000,9223372036854775808,2867199309159137213,B,3,4,3
1996-08-20T00:41:57.000000000,9223372036854775808,2867199309159137213,B,,5,5
1997-12-12T00:42:57.000000000,9223372036854775808,2867199309159137213,B,,,
1998-12-13T00:43:57.000000000,9223372036854775808,2867199309159137213,B,8,8,8
2004-12-06T00:44:57.000000000,9223372036854775808,2867199309159137213,B,11,23,11
1994-12-20T00:39:57.000000000,0,12960666915911099378,A,4,2,4
1995-10-20T00:40:57.000000000,0,2867199309159137213,B,3,4,3
1996-08-20T00:41:57.000000000,0,2867199309159137213,B,,5,5
1997-12-12T00:42:57.000000000,0,2867199309159137213,B,,,
1998-12-13T00:43:57.000000000,0,2867199309159137213,B,8,8,8
2004-12-06T00:44:57.000000000,0,2867199309159137213,B,11,23,11
"###);
}

#[tokio::test]
async fn test_coalesce_two_record() {
insta::assert_snapshot!(QueryFixture::new("{ m: Times.m, n: Times.n, coalesce_times_times: coalesce(Times, Times) | $input.n }").run_to_csv(&timestamp_ns_data_fixture().await).await.unwrap(), @r###"
_time,_subsort,_key_hash,_key,m,n,coalesce_times_times
1994-12-20T00:39:57.000000000,9223372036854775808,12960666915911099378,A,4,2,2
1995-10-20T00:40:57.000000000,9223372036854775808,2867199309159137213,B,3,4,4
1996-08-20T00:41:57.000000000,9223372036854775808,2867199309159137213,B,,5,5
1997-12-12T00:42:57.000000000,9223372036854775808,2867199309159137213,B,,,
1998-12-13T00:43:57.000000000,9223372036854775808,2867199309159137213,B,8,8,8
2004-12-06T00:44:57.000000000,9223372036854775808,2867199309159137213,B,11,23,23
1994-12-20T00:39:57.000000000,0,12960666915911099378,A,4,2,2
1995-10-20T00:40:57.000000000,0,2867199309159137213,B,3,4,4
1996-08-20T00:41:57.000000000,0,2867199309159137213,B,,5,5
1997-12-12T00:42:57.000000000,0,2867199309159137213,B,,,
1998-12-13T00:43:57.000000000,0,2867199309159137213,B,8,8,8
2004-12-06T00:44:57.000000000,0,2867199309159137213,B,11,23,23
"###);
}

Expand Down
Loading
Loading