MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-314136 PersistentFSImpl.clearIdCache is too slow

Browse Source 
GitOrigin-RevId: 3115c486c47a73e35083b2035dec8062edc73c89
This commit is contained in:
Alexey Kudravtsev
2023-03-13 17:41:48 +00:00
committed by intellij-monorepo-bot
parent 904d7f9953
commit 734367c4b5
2 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/PersistentFSImpl.java
+1 -1
View File
@@ -1810,7 +1810,7 @@ public final class PersistentFSImpl extends PersistentFS implements Disposable {
}
@TestOnly
@NotNull Collection<? extends VirtualFileSystemEntry> getDirCache() {
@NotNull Iterable<? extends VirtualFileSystemEntry> getDirCache() {
return myIdToDirCache.getCachedDirs();
}
platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/VirtualDirectoryCache.java
+31 -16
View File
@@ -4,48 +4,63 @@ package com.intellij.openapi.vfs.newvfs.persistent;
import com.intellij.concurrency.ConcurrentCollectionFactory;
import com.intellij.openapi.vfs.newvfs.impl.VirtualFileSystemEntry;
import com.intellij.util.containers.ConcurrentIntObjectMap;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collection;
import org.jetbrains.annotations.TestOnly;
final class VirtualDirectoryCache {
// FS roots must be in this map too. findFileById() relies on this.
private final ConcurrentIntObjectMap<VirtualFileSystemEntry> myIdToDirCache =
ConcurrentCollectionFactory.createConcurrentIntObjectSoftValueMap();
// FS roots only (dirs with .getParent()==null)
private final ConcurrentIntObjectMap<VirtualFileSystemEntry> myIdToRootCache = ConcurrentCollectionFactory.createConcurrentIntObjectMap();
// FS inner dirs only (dirs with .getParent()!=null), separated from the root cache to speedup clear
private final ConcurrentIntObjectMap<VirtualFileSystemEntry> myIdToDirCache = ConcurrentCollectionFactory.createConcurrentIntObjectSoftValueMap();
@NotNull VirtualFileSystemEntry getOrCacheDir(@NotNull VirtualFileSystemEntry newDir) {
@NotNull
VirtualFileSystemEntry getOrCacheDir(@NotNull VirtualFileSystemEntry newDir) {
int id = newDir.getId();
VirtualFileSystemEntry dir = myIdToDirCache.get(id);
ConcurrentIntObjectMap<VirtualFileSystemEntry> cache = getCache(newDir);
VirtualFileSystemEntry dir = cache.get(id);
if (dir != null) return dir;
return myIdToDirCache.cacheOrGet(id, newDir);
return cache.cacheOrGet(id, newDir);
}
private ConcurrentIntObjectMap<VirtualFileSystemEntry> getCache(@NotNull VirtualFileSystemEntry newDir) {
return newDir.getParent() == null ? myIdToRootCache : myIdToDirCache;
}
void cacheDir(@NotNull VirtualFileSystemEntry newDir) {
myIdToDirCache.put(newDir.getId(), newDir);
getCache(newDir).put(newDir.getId(), newDir);
}
@Nullable VirtualFileSystemEntry cacheDirIfAbsent(@NotNull VirtualFileSystemEntry newDir) {
return myIdToDirCache.putIfAbsent(newDir.getId(), newDir);
@Nullable
VirtualFileSystemEntry cacheDirIfAbsent(@NotNull VirtualFileSystemEntry newDir) {
return getCache(newDir).putIfAbsent(newDir.getId(), newDir);
}
@Nullable VirtualFileSystemEntry getCachedDir(int id) {
return myIdToDirCache.get(id);
@Nullable
VirtualFileSystemEntry getCachedDir(int id) {
VirtualFileSystemEntry dir = myIdToDirCache.get(id);
if (dir != null) return dir;
return myIdToRootCache.get(id);
}
void dropNonRootCachedDirs() {
myIdToDirCache.entrySet().removeIf(e -> e.getValue().getParent() != null);
myIdToDirCache.clear();
}
void remove(int id) {
myIdToDirCache.remove(id);
myIdToRootCache.remove(id);
}
@NotNull Collection<VirtualFileSystemEntry> getCachedDirs() {
return myIdToDirCache.values();
@TestOnly
@NotNull
Iterable<VirtualFileSystemEntry> getCachedDirs() {
return ContainerUtil.concat(myIdToDirCache.values(), myIdToRootCache.values());
}
void clear() {
myIdToDirCache.clear();
myIdToRootCache.clear();
}
}