backport: #33515
This commit is contained in:
@ -288,6 +288,21 @@ public class FederationBackendPolicyTest {
|
||||
|
||||
}
|
||||
|
||||
public static void sortSplits(List<Split> splits) {
|
||||
splits.sort((split1, split2) -> {
|
||||
int pathComparison = split1.getPathString().compareTo(split2.getPathString());
|
||||
if (pathComparison != 0) {
|
||||
return pathComparison;
|
||||
}
|
||||
|
||||
int startComparison = Long.compare(split1.getStart(), split2.getStart());
|
||||
if (startComparison != 0) {
|
||||
return startComparison;
|
||||
}
|
||||
return Long.compare(split1.getLength(), split2.getLength());
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testGenerateRandomly() throws UserException {
|
||||
SystemInfoService service = new SystemInfoService();
|
||||
@ -367,7 +382,7 @@ public class FederationBackendPolicyTest {
|
||||
List<Split> totalSplits = new ArrayList<>();
|
||||
totalSplits.addAll(remoteSplits);
|
||||
totalSplits.addAll(localSplits);
|
||||
Collections.shuffle(totalSplits);
|
||||
sortSplits(totalSplits);
|
||||
Multimap<Backend, Split> assignment = policy.computeScanRangeAssignment(totalSplits);
|
||||
if (i == 0) {
|
||||
result = ArrayListMultimap.create(assignment);
|
||||
@ -489,7 +504,7 @@ public class FederationBackendPolicyTest {
|
||||
List<Split> totalSplits = new ArrayList<>();
|
||||
totalSplits.addAll(remoteSplits);
|
||||
totalSplits.addAll(localSplits);
|
||||
Collections.shuffle(totalSplits);
|
||||
sortSplits(totalSplits);
|
||||
Multimap<Backend, Split> assignment = policy.computeScanRangeAssignment(totalSplits);
|
||||
if (i == 0) {
|
||||
result = ArrayListMultimap.create(assignment);
|
||||
|
||||
Reference in New Issue
Block a user