Skip to content

Commit ec3ca20

Browse files
committed
fmt
1 parent c529340 commit ec3ca20

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

datafusion/physical-plan/src/joins/sort_merge_join/stream.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1584,7 +1584,7 @@ impl SortMergeJoinStream {
15841584
left_columns.extend(right_columns);
15851585
left_columns
15861586
}
1587-
_ => exec_err!("Did not expect join type {}", self.join_type)?
1587+
_ => exec_err!("Did not expect join type {}", self.join_type)?,
15881588
};
15891589

15901590
// Push the streamed/buffered batch joined nulls to the output

datafusion/physical-plan/src/joins/sort_merge_join/tests.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,6 @@ async fn join_right_one() -> Result<()> {
646646

647647
#[tokio::test]
648648
async fn join_right_different_columns_count_with_filter() -> Result<()> {
649-
650649
// select *
651650
// from t1
652651
// right join t2 on t1.b1 = t2.b1 and t1.a1 > t2.a2
@@ -706,7 +705,6 @@ async fn join_right_different_columns_count_with_filter() -> Result<()> {
706705

707706
#[tokio::test]
708707
async fn join_left_different_columns_count_with_filter() -> Result<()> {
709-
710708
// select *
711709
// from t2
712710
// left join t1 on t2.b1 = t1.b1 and t2.a2 > t1.a1
@@ -766,7 +764,6 @@ async fn join_left_different_columns_count_with_filter() -> Result<()> {
766764

767765
#[tokio::test]
768766
async fn join_left_mark_different_columns_count_with_filter() -> Result<()> {
769-
770767
// select *
771768
// from t2
772769
// left mark join t1 on t2.b1 = t1.b1 and t2.a2 > t1.a1
@@ -809,7 +806,8 @@ async fn join_left_mark_different_columns_count_with_filter() -> Result<()> {
809806
])),
810807
);
811808

812-
let (_, batches) = join_collect_with_filter(left, right, on, filter, LeftMark).await?;
809+
let (_, batches) =
810+
join_collect_with_filter(left, right, on, filter, LeftMark).await?;
813811

814812
// The output order is important as SMJ preserves sortedness
815813
// LeftMark returns all left rows with a boolean mark column
@@ -827,7 +825,6 @@ async fn join_left_mark_different_columns_count_with_filter() -> Result<()> {
827825

828826
#[tokio::test]
829827
async fn join_right_mark_different_columns_count_with_filter() -> Result<()> {
830-
831828
// select *
832829
// from t1
833830
// right mark join t2 on t1.b1 = t2.b1 and t1.a1 > t2.a2
@@ -870,7 +867,8 @@ async fn join_right_mark_different_columns_count_with_filter() -> Result<()> {
870867
])),
871868
);
872869

873-
let (_, batches) = join_collect_with_filter(left, right, on, filter, RightMark).await?;
870+
let (_, batches) =
871+
join_collect_with_filter(left, right, on, filter, RightMark).await?;
874872

875873
// The output order is important as SMJ preserves sortedness
876874
// RightMark returns all right rows with a boolean mark column

0 commit comments

Comments
 (0)