big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-13970. Use MultiMap for CacheManager Directives to simplify the code. Contributed by BELUGA BEHR.

Browse Source
This commit is contained in:
Akira Ajisaka 2018-12-14 14:36:26 +09:00
parent 4aa0609fb0
commit ca379e1c43
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50
2 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/CacheDirective.java
View File

@ -21,7 +21,6 @@
import java.util.Date;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hdfs.DFSUtil;
@ -158,7 +157,7 @@ public boolean equals(Object o) {
@Override
public int hashCode() {
return new HashCodeBuilder().append(id).toHashCode();
return Long.hashCode(id);
}
//

38
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/CacheManager.java
View File

@ -37,7 +37,6 @@
import java.util.Date;
import java.util.EnumSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map.Entry;
import java.util.SortedMap;
@ -91,7 +90,9 @@
import org.slf4j.LoggerFactory;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
/**
* The Cache Manager handles caching on DataNodes.
@ -125,8 +126,7 @@ public class CacheManager {
* listCacheDirectives relies on the ordering of elements in this map
* to track what has already been listed by the client.
*/
private final TreeMap<Long, CacheDirective> directivesById =
new TreeMap<Long, CacheDirective>();
private final TreeMap<Long, CacheDirective> directivesById = new TreeMap<>();
/**
* The directive ID to use for a new directive. IDs always increase, and are
@ -135,10 +135,10 @@ public class CacheManager {
private long nextDirectiveId;
/**
* Cache directives, sorted by path
* Cache directives
*/
private final TreeMap<String, List<CacheDirective>> directivesByPath =
new TreeMap<String, List<CacheDirective>>();
private final Multimap<String, CacheDirective> directivesByPath =
HashMultimap.create();
/**
* Cache pools, sorted by name.
@ -515,12 +515,7 @@ private void addInternal(CacheDirective directive, CachePool pool) {
assert addedDirective;
directivesById.put(directive.getId(), directive);
String path = directive.getPath();
List<CacheDirective> directives = directivesByPath.get(path);
if (directives == null) {
directives = new ArrayList<CacheDirective>(1);
directivesByPath.put(path, directives);
}
directives.add(directive);
directivesByPath.put(path, directive);
// Fix up pool stats
CacheDirectiveStats stats =
computeNeeded(directive.getPath(), directive.getReplication());
@ -681,13 +676,9 @@ private void removeInternal(CacheDirective directive)
assert namesystem.hasWriteLock();
// Remove the corresponding entry in directivesByPath.
String path = directive.getPath();
List<CacheDirective> directives = directivesByPath.get(path);
if (directives == null || !directives.remove(directive)) {
throw new InvalidRequestException("Failed to locate entry " +
directive.getId() + " by path " + directive.getPath());
}
if (directives.size() == 0) {
directivesByPath.remove(path);
if (!directivesByPath.remove(path, directive)) {
throw new InvalidRequestException("Failed to locate entry "
+ directive.getId() + " by path " + directive.getPath());
}
// Fix up the stats from removing the pool
final CachePool pool = directive.getPool();
@ -906,7 +897,7 @@ public void removeCachePool(String poolName)
Iterator<CacheDirective> iter = pool.getDirectiveList().iterator();
while (iter.hasNext()) {
CacheDirective directive = iter.next();
directivesByPath.remove(directive.getPath());
directivesByPath.removeAll(directive.getPath());
directivesById.remove(directive.getId());
iter.remove();
}
@ -1171,12 +1162,7 @@ private void addCacheDirective(final String poolName,
throw new IOException("A directive with ID " + directive.getId()
+ " already exists");
}
List<CacheDirective> directives = directivesByPath.get(directive.getPath());
if (directives == null) {
directives = new LinkedList<CacheDirective>();
directivesByPath.put(directive.getPath(), directives);
}
directives.add(directive);
directivesByPath.put(directive.getPath(), directive);
}
private final class SerializerCompat {