Skip to content

HDDS-2591. No tailMap needed for startIndex 0 in ContainerSet#listContainer #254

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
bharatviswa504 merged 1 commit into from
Nov 22, 2019
Merged

HDDS-2591. No tailMap needed for startIndex 0 in ContainerSet#listContainer #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...ner-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public void listContainer(long startContainerId, long count,
"{}", startContainerId, count);
ConcurrentNavigableMap<Long, Container<?>> map;
if (startContainerId == 0) {
map = containerMap.tailMap(containerMap.firstKey(), true);
map = containerMap;
} else {
map = containerMap.tailMap(startContainerId, true);
}
Expand Down
39 changes: 31 additions & 8 deletions ...service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@
import java.util.Optional;
import java.util.Random;
import java.util.UUID;
import java.util.stream.LongStream;

import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
Expand All @@ -53,6 +55,8 @@
*/
public class TestContainerSet {

private static final int FIRST_ID = 2;

@Test
public void testAddGetRemoveContainer() throws StorageContainerException {
ContainerSet containerSet = new ContainerSet();
Expand Down Expand Up @@ -247,21 +251,40 @@ public void testGetContainerReport() throws IOException {
@Test
public void testListContainer() throws StorageContainerException {
ContainerSet containerSet = createContainerSet();
int count = 5;
int startId = FIRST_ID + 3;
List<ContainerData> result = new ArrayList<>(count);

List<ContainerData> result = new ArrayList<>();
containerSet.listContainer(2, 5, result);
containerSet.listContainer(startId, count, result);

assertEquals(5, result.size());
assertContainerIds(startId, count, result);
}

for(ContainerData containerData : result) {
assertTrue(containerData.getContainerID() >=2 && containerData
.getContainerID()<=6);
}
@Test
public void testListContainerFromFirstKey() throws StorageContainerException {
ContainerSet containerSet = createContainerSet();
int count = 6;
List<ContainerData> result = new ArrayList<>(count);

containerSet.listContainer(0, count, result);

assertContainerIds(FIRST_ID, count, result);
}

/**
* Verify that {@code result} contains {@code count} containers
* with IDs in increasing order starting at {@code startId}.
*/
private static void assertContainerIds(int startId, int count,
List<ContainerData> result) {
assertEquals(count, result.size());
assertArrayEquals(LongStream.range(startId, startId + count).toArray(),
result.stream().mapToLong(ContainerData::getContainerID).toArray());
}

private ContainerSet createContainerSet() throws StorageContainerException {
ContainerSet containerSet = new ContainerSet();
for (int i=0; i<10; i++) {
for (int i = FIRST_ID; i < FIRST_ID + 10; i++) {
KeyValueContainerData kvData = new KeyValueContainerData(i,
(long) StorageUnit.GB.toBytes(5), UUID.randomUUID().toString(),
UUID.randomUUID().toString());
Expand Down