Skip to content

Commit 7f45ee8

Browse files
committed
test: update tests for OOM output
1 parent c7e869f commit 7f45ee8

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

datafusion/physical-plan/src/joins/hash_join/exec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4381,13 +4381,13 @@ mod tests {
43814381
// Asserting that stream-level reservation attempting to overallocate
43824382
assert_contains!(
43834383
err.to_string(),
4384-
"Resources exhausted: Additional allocation failed for HashJoinInput[1] with top memory consumers (across reservations) as:\n HashJoinInput[1]"
4384+
"Resources exhausted: Additional allocation failed for HashJoinInput[partition=1] with top memory consumers (across reservations) as:\n HashJoinInput[partition=1]"
43854385

43864386
);
43874387

43884388
assert_contains!(
43894389
err.to_string(),
4390-
"Failed to allocate additional 120.0 B for HashJoinInput[1]"
4390+
"Failed to allocate additional 120.0 B for HashJoinInput[partition=1]"
43914391
);
43924392
}
43934393

datafusion/physical-plan/src/joins/nested_loop_join.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2475,7 +2475,7 @@ pub(crate) mod tests {
24752475

24762476
assert_contains!(
24772477
err.to_string(),
2478-
"Resources exhausted: Additional allocation failed for NestedLoopJoinLoad[0] with top memory consumers (across reservations) as:\n NestedLoopJoinLoad[0]"
2478+
"Resources exhausted: Additional allocation failed for NestedLoopJoinLoad[partition=0] with top memory consumers (across reservations) as:\n NestedLoopJoinLoad[partition=0]"
24792479
);
24802480
}
24812481

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1799,7 +1799,7 @@ async fn overallocation_single_batch_no_spill() -> Result<()> {
17991799
let err = common::collect(stream).await.unwrap_err();
18001800

18011801
assert_contains!(err.to_string(), "Failed to allocate additional");
1802-
assert_contains!(err.to_string(), "SMJStream[0]");
1802+
assert_contains!(err.to_string(), "SMJStream[partition=0]");
18031803
assert_contains!(err.to_string(), "Disk spilling disabled");
18041804
assert!(join.metrics().is_some());
18051805
assert_eq!(join.metrics().unwrap().spill_count(), Some(0));
@@ -1879,7 +1879,7 @@ async fn overallocation_multi_batch_no_spill() -> Result<()> {
18791879
let err = common::collect(stream).await.unwrap_err();
18801880

18811881
assert_contains!(err.to_string(), "Failed to allocate additional");
1882-
assert_contains!(err.to_string(), "SMJStream[0]");
1882+
assert_contains!(err.to_string(), "SMJStream[partition=0]");
18831883
assert_contains!(err.to_string(), "Disk spilling disabled");
18841884
assert!(join.metrics().is_some());
18851885
assert_eq!(join.metrics().unwrap().spill_count(), Some(0));

0 commit comments

Comments
 (0)