Skip to content

[Improvement] Refactor getPartitionRange to calculate range directly #447

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
advancedxy merged 6 commits into from
Dec 28, 2022
Merged

[Improvement] Refactor getPartitionRange to calculate range directly #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ea9515
[Improvement] Refactor getPartitionRange to calculate range directly …
a-li Dec 24, 2022
f0819a7
Fix checkstyle
a-li Dec 25, 2022
a88efab
Add more unit tests
a-li Dec 26, 2022
54869ba
Add more unit tests
a-li Dec 26, 2022
b323f1c
Return null when partitionId == partitionNum
a-li Dec 27, 2022
afa5678
Clean up
a-li Dec 28, 2022
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
15 changes: 6 additions & 9 deletions storage/src/main/java/org/apache/uniffle/storage/util/ShuffleStorageUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,12 @@ public static String getShuffleDataPathWithRange(

public static int[] getPartitionRange(int partitionId, int partitionNumPerRange, int partitionNum) {
int[] range = null;
int prNum = partitionNum % partitionNumPerRange == 0
? partitionNum / partitionNumPerRange : partitionNum / partitionNumPerRange + 1;
for (int i = 0; i < prNum; i++) {
int start = i * partitionNumPerRange;
int end = (i + 1) * partitionNumPerRange - 1;
if (partitionId >= start && partitionId <= end) {
range = new int[]{start, end};
break;
}
int prNum = partitionId / partitionNumPerRange;
if (partitionId < 0 || partitionId >= partitionNum) {
LOG.warn("Invalid partitionId. partitionId:{} ,partitionNumPerRange: {}, partitionNum: {}",
partitionId, partitionNumPerRange, partitionNum);
} else {
range = new int[]{partitionNumPerRange * prNum, partitionNumPerRange * (prNum + 1) - 1};
}
return range;
}
Expand Down
47 changes: 47 additions & 0 deletions storage/src/test/java/org/apache/uniffle/storage/util/ShuffleStorageUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@ public void getPartitionRangeTest() {
int[] range = ShuffleStorageUtils.getPartitionRange(0, 1, 5);
assertEquals(0, range[0]);
assertEquals(0, range[1]);
range = ShuffleStorageUtils.getPartitionRange(5, 1, 5);
assertEquals(null, range);
range = ShuffleStorageUtils.getPartitionRange(0, 2, 5);
assertEquals(0, range[0]);
assertEquals(1, range[1]);
Expand All @@ -266,5 +268,50 @@ public void getPartitionRangeTest() {
range = ShuffleStorageUtils.getPartitionRange(2, 3, 5);
assertEquals(0, range[0]);
assertEquals(2, range[1]);
range = ShuffleStorageUtils.getPartitionRange(-1, 3, 5);
assertEquals(null, range);
range = ShuffleStorageUtils.getPartitionRange(1, 3, 0);
assertEquals(null, range);
range = ShuffleStorageUtils.getPartitionRange(4, 2, 3);
assertEquals(null, range);
range = ShuffleStorageUtils.getPartitionRange(4, 2, 5);
assertEquals(4, range[0]);
assertEquals(5, range[1]);
range = ShuffleStorageUtils.getPartitionRange(3, 2, 2);
assertEquals(null, range);
range = ShuffleStorageUtils.getPartitionRange(0, 2, 2);
assertEquals(0, range[0]);
assertEquals(1, range[1]);
range = ShuffleStorageUtils.getPartitionRange(3, 2, 4);
assertEquals(2, range[0]);
assertEquals(3, range[1]);
range = ShuffleStorageUtils.getPartitionRange(4, 3, 5);
assertEquals(3, range[0]);
assertEquals(5, range[1]);
range = ShuffleStorageUtils.getPartitionRange(5, 3, 5);
assertEquals(null, range);
range = ShuffleStorageUtils.getPartitionRange(0, 3, 5);
assertEquals(0, range[0]);
assertEquals(2, range[1]);
range = ShuffleStorageUtils.getPartitionRange(9, 3, 11);
assertEquals(9, range[0]);
assertEquals(11, range[1]);
range = ShuffleStorageUtils.getPartitionRange(9, 3, 12);
assertEquals(9, range[0]);
assertEquals(11, range[1]);
range = ShuffleStorageUtils.getPartitionRange(0, 7, 12);
assertEquals(0, range[0]);
assertEquals(6, range[1]);
range = ShuffleStorageUtils.getPartitionRange(3, 7, 12);
assertEquals(0, range[0]);
assertEquals(6, range[1]);
range = ShuffleStorageUtils.getPartitionRange(7, 7, 12);
assertEquals(7, range[0]);
assertEquals(13, range[1]);
range = ShuffleStorageUtils.getPartitionRange(8, 7, 12);
assertEquals(7, range[0]);
assertEquals(13, range[1]);
range = ShuffleStorageUtils.getPartitionRange(12, 7, 12);
assertEquals(null, range);
}
}