Skip to content

Commit

Permalink
[sqllogictests] Port orderby.rs to sqllogictests (#5062)
Browse files Browse the repository at this point in the history 
* [sqllogictests] Port orderby.rs to sqllogictests

* Apply suggestions from code review

Co-authored-by: Yevhenii Melnyk <[email protected]>

* restore lost test

Co-authored-by: Yevhenii Melnyk <[email protected]>
  • Loading branch information
@alamb @melgenek
alamb and melgenek authored Jan 26, 2023
1 parent 556fffb commit d588b47
Show file tree
Hide file tree
Showing 6 changed files with 209 additions and 193 deletions.
11 changes: 11 additions & 0 deletions datafusion/core/tests/data/partitioned_csv/partition-0.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
0,0,true
0,1,false
0,2,true
0,3,false
0,4,true
0,5,false
0,6,true
0,7,false
0,8,true
0,9,false
0,10,true
11 changes: 11 additions & 0 deletions datafusion/core/tests/data/partitioned_csv/partition-1.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1,0,true
1,1,false
1,2,true
1,3,false
1,4,true
1,5,false
1,6,true
1,7,false
1,8,true
1,9,false
1,10,true
11 changes: 11 additions & 0 deletions datafusion/core/tests/data/partitioned_csv/partition-2.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
2,0,true
2,1,false
2,2,true
2,3,false
2,4,true
2,5,false
2,6,true
2,7,false
2,8,true
2,9,false
2,10,true
11 changes: 11 additions & 0 deletions datafusion/core/tests/data/partitioned_csv/partition-3.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
3,0,true
3,1,false
3,2,true
3,3,false
3,4,true
3,5,false
3,6,true
3,7,false
3,8,true
3,9,false
3,10,true
193 changes: 0 additions & 193 deletions datafusion/core/tests/sql/order.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,199 +18,6 @@
use super::*;
use test_utils::{batches_to_vec, partitions_to_sorted_vec};

#[tokio::test]
async fn test_sort_unprojected_col() -> Result<()> {
let ctx = SessionContext::new();
register_alltypes_parquet(&ctx).await;
// execute the query
let sql = "SELECT id FROM alltypes_plain ORDER BY int_col, double_col";
let actual = execute_to_batches(&ctx, sql).await;
#[rustfmt::skip]
let expected = vec![
"+----+",
"| id |",
"+----+",
"| 4 |",
"| 6 |",
"| 2 |",
"| 0 |",
"| 5 |",
"| 7 |",
"| 3 |",
"| 1 |",
"+----+",
];
assert_batches_eq!(expected, &actual);
Ok(())
}

#[tokio::test]
async fn test_order_by_agg_expr() -> Result<()> {
let ctx = SessionContext::new();
register_aggregate_csv(&ctx).await?;
let sql = "SELECT MIN(c12) FROM aggregate_test_100 ORDER BY MIN(c12)";
let actual = execute_to_batches(&ctx, sql).await;
let expected = vec![
"+-----------------------------+",
"| MIN(aggregate_test_100.c12) |",
"+-----------------------------+",
"| 0.01479305307777301 |",
"+-----------------------------+",
];
assert_batches_eq!(expected, &actual);

let sql = "SELECT MIN(c12) FROM aggregate_test_100 ORDER BY MIN(c12) + 0.1";
let actual = execute_to_batches(&ctx, sql).await;
assert_batches_eq!(expected, &actual);
Ok(())
}

#[tokio::test]
async fn test_nulls_first_asc() -> Result<()> {
let ctx = SessionContext::new();
let sql = "SELECT * FROM (VALUES (1, 'one'), (2, 'two'), (null, 'three')) AS t (num,letter) ORDER BY num";
let actual = execute_to_batches(&ctx, sql).await;
let expected = vec![
"+-----+--------+",
"| num | letter |",
"+-----+--------+",
"| 1 | one |",
"| 2 | two |",
"| | three |",
"+-----+--------+",
];
assert_batches_eq!(expected, &actual);
Ok(())
}

#[tokio::test]
async fn test_nulls_first_desc() -> Result<()> {
let ctx = SessionContext::new();
let sql = "SELECT * FROM (VALUES (1, 'one'), (2, 'two'), (null, 'three')) AS t (num,letter) ORDER BY num DESC";
let actual = execute_to_batches(&ctx, sql).await;
let expected = vec![
"+-----+--------+",
"| num | letter |",
"+-----+--------+",
"| | three |",
"| 2 | two |",
"| 1 | one |",
"+-----+--------+",
];
assert_batches_eq!(expected, &actual);
Ok(())
}

#[tokio::test]
async fn test_specific_nulls_last_desc() -> Result<()> {
let ctx = SessionContext::new();
let sql = "SELECT * FROM (VALUES (1, 'one'), (2, 'two'), (null, 'three')) AS t (num,letter) ORDER BY num DESC NULLS LAST";
let actual = execute_to_batches(&ctx, sql).await;
let expected = vec![
"+-----+--------+",
"| num | letter |",
"+-----+--------+",
"| 2 | two |",
"| 1 | one |",
"| | three |",
"+-----+--------+",
];
assert_batches_eq!(expected, &actual);
Ok(())
}

#[tokio::test]
async fn test_specific_nulls_first_asc() -> Result<()> {
let ctx = SessionContext::new();
let sql = "SELECT * FROM (VALUES (1, 'one'), (2, 'two'), (null, 'three')) AS t (num,letter) ORDER BY num ASC NULLS FIRST";
let actual = execute_to_batches(&ctx, sql).await;
let expected = vec![
"+-----+--------+",
"| num | letter |",
"+-----+--------+",
"| | three |",
"| 1 | one |",
"| 2 | two |",
"+-----+--------+",
];
assert_batches_eq!(expected, &actual);
Ok(())
}

#[tokio::test]
async fn sort() -> Result<()> {
let results =
partitioned_csv::execute("SELECT c1, c2 FROM test ORDER BY c1 DESC, c2 ASC", 4)
.await?;
assert_eq!(results.len(), 1);

let expected: Vec<&str> = vec![
"+----+----+",
"| c1 | c2 |",
"+----+----+",
"| 3 | 1 |",
"| 3 | 2 |",
"| 3 | 3 |",
"| 3 | 4 |",
"| 3 | 5 |",
"| 3 | 6 |",
"| 3 | 7 |",
"| 3 | 8 |",
"| 3 | 9 |",
"| 3 | 10 |",
"| 2 | 1 |",
"| 2 | 2 |",
"| 2 | 3 |",
"| 2 | 4 |",
"| 2 | 5 |",
"| 2 | 6 |",
"| 2 | 7 |",
"| 2 | 8 |",
"| 2 | 9 |",
"| 2 | 10 |",
"| 1 | 1 |",
"| 1 | 2 |",
"| 1 | 3 |",
"| 1 | 4 |",
"| 1 | 5 |",
"| 1 | 6 |",
"| 1 | 7 |",
"| 1 | 8 |",
"| 1 | 9 |",
"| 1 | 10 |",
"| 0 | 1 |",
"| 0 | 2 |",
"| 0 | 3 |",
"| 0 | 4 |",
"| 0 | 5 |",
"| 0 | 6 |",
"| 0 | 7 |",
"| 0 | 8 |",
"| 0 | 9 |",
"| 0 | 10 |",
"+----+----+",
];

// Note it is important to NOT use assert_batches_sorted_eq
// here as we are testing the sortedness of the output
assert_batches_eq!(expected, &results);

Ok(())
}

#[tokio::test]
async fn sort_empty() -> Result<()> {
// The predicate on this query purposely generates no results
let results = partitioned_csv::execute(
"SELECT c1, c2 FROM test WHERE c1 > 100000 ORDER BY c1 DESC, c2 ASC",
4,
)
.await
.unwrap();
assert_eq!(results.len(), 0);
Ok(())
}

#[tokio::test]
async fn sort_with_lots_of_repetition_values() -> Result<()> {
let ctx = SessionContext::new();
Expand Down
Loading

0 comments on commit d588b47

Please sign in to comment.