adoroszlai commented on code in PR #8083:
URL: https://github.com/apache/ozone/pull/8083#discussion_r1996074025
##########
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/states/ContainerAttribute.java:
##########
@@ -103,25 +97,28 @@ public void clearSet(T key) {
}
/**
- * Removes a container ID from the set pointed by the key.
+ * Removes a container for the given id.
*
* @param key - key to identify the set.
* @param value - Container ID
+ * @return the info if there was a mapping for the id; otherwise, return null
*/
- public boolean remove(T key, ContainerID value) {
+ public ContainerInfo remove(T key, ContainerID value) {
Objects.requireNonNull(value, "value == null");
+ return get(key).remove(value);
+ }
- if (!get(key).remove(value)) {
- LOG.debug("Container {} not found in {} attribute", value, key);
- return false;
- }
- return true;
+ /** Remove an existing {@link ContainerInfo}. */
+ public void removeExisting(T key, ContainerInfo existing) {
+ Objects.requireNonNull(existing, "existing == null");
+ final ContainerInfo removed = remove(key, existing.containerID());
+ Preconditions.assertSame(existing, removed, "removed");
}
- NavigableSet<ContainerID> get(T attribute) {
+ NavigableMap<ContainerID, ContainerInfo> get(T attribute) {
Objects.requireNonNull(attribute, "attribute == null");
- final NavigableSet<ContainerID> set = attributeMap.get(attribute);
+ final NavigableMap<ContainerID, ContainerInfo> set =
attributeMap.get(attribute);
Review Comment:
Rename `set` to `map`?
##########
hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/states/ContainerAttribute.java:
##########
@@ -60,37 +61,30 @@
* @param <T> Attribute type
*/
public class ContainerAttribute<T extends Enum<T>> {
- private static final Logger LOG =
- LoggerFactory.getLogger(ContainerAttribute.class);
-
private final Class<T> attributeClass;
- private final ImmutableMap<T, NavigableSet<ContainerID>> attributeMap;
+ private final ImmutableMap<T, NavigableMap<ContainerID, ContainerInfo>>
attributeMap;
/**
* Create an empty Container Attribute map.
*/
public ContainerAttribute(Class<T> attributeClass) {
this.attributeClass = attributeClass;
- final EnumMap<T, NavigableSet<ContainerID>> map = new
EnumMap<>(attributeClass);
+ final EnumMap<T, NavigableMap<ContainerID, ContainerInfo>> map = new
EnumMap<>(attributeClass);
for (T t : attributeClass.getEnumConstants()) {
- map.put(t, new TreeSet<>());
+ map.put(t, new TreeMap<>());
}
this.attributeMap = Maps.immutableEnumMap(map);
}
/**
- * Insert the value in the Attribute map, keep the original value if it
exists
- * already.
- *
- * @param key - The key to the set where the ContainerID should exist.
- * @param value - Actual Container ID.
- * @return true if the value is added;
- * otherwise, the value already exists, return false.
+ * Add the given non-existing {@link ContainerInfo} to this attribute.
+ * @throws IllegalStateException if it already exists.
*/
- public boolean insert(T key, ContainerID value) {
- Objects.requireNonNull(value, "value == null");
- return get(key).add(value);
+ public void addNonExisting(T key, ContainerInfo info) {
+ Objects.requireNonNull(info, "value == null");
+ final ContainerInfo previous = get(key).put(info.containerID(), info);
Review Comment:
Should we use `putIfAbsent` to avoid overwriting?
##########
hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/states/TestContainerAttribute.java:
##########
@@ -43,32 +45,35 @@ static <T extends Enum<T>> boolean
hasContainerID(ContainerAttribute<T> attribut
}
static <T extends Enum<T>> boolean hasContainerID(ContainerAttribute<T>
attribute, T key, ContainerID id) {
- final NavigableSet<ContainerID> set = attribute.get(key);
- return set != null && set.contains(id);
+ final NavigableMap<ContainerID, ContainerInfo> map = attribute.get(key);
+ return map != null && map.containsKey(id);
}
@Test
- public void testInsert() {
+ public void testAddNonExisting() {
ContainerAttribute<Key> containerAttribute = new
ContainerAttribute<>(Key.class);
- ContainerID id = ContainerID.valueOf(42);
- containerAttribute.insert(key1, id);
+ ContainerInfo info = new
ContainerInfo.Builder().setContainerID(42).build();
+ ContainerID id = info.containerID();
+ containerAttribute.addNonExisting(key1, info);
assertEquals(1, containerAttribute.getCollection(key1).size());
- assertThat(containerAttribute.getCollection(key1)).contains(id);
-
- // Insert again and verify that the new ContainerId is inserted.
- ContainerID newId =
- ContainerID.valueOf(42);
- containerAttribute.insert(key1, newId);
- assertEquals(1, containerAttribute.getCollection(key1).size());
- assertThat(containerAttribute.getCollection(key1)).contains(newId);
+ assertThat(containerAttribute.get(key1)).containsKey(id);
+
+ // Adding it again should fail.
+ try {
+ containerAttribute.addNonExisting(key1, info);
+ fail();
+ } catch (IllegalStateException e) {
+ e.printStackTrace(System.out);
+ }
Review Comment:
Can we use `assertThrows`?
```java
assertThrows(IllegalStateException.class, () ->
containerAttribute.addNonExisting(key1, info));
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
