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

PY-21180 PyUtil#getParametrizedCachedValue uses ConcurrentHashMap

Browse Source 
in case multiple read-only threads update the same cache simultaneously
This commit is contained in:
Mikhail Golubev
2017-03-06 14:03:44 +03:00
parent 851e4b8f79
commit b529a826e8
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/psi/PyUtil.java
+4 -11
View File
@@ -846,19 +846,12 @@ public class PyUtil {
});
}
private static final Object NULL_VALUE = new Object();
public static <T, P> T getParameterizedCachedValue(@NotNull PsiElement element, @Nullable P param, @NotNull NullableFunction<P, T> f) {
final Map<P, Object> cache = CachedValuesManager.getCachedValue(element, new CachedValueProvider<Map<P, Object>>() {
@Nullable
@Override
public Result<Map<P, Object>> compute() {
// TODO should be concurrent map instead
return Result.create(Maps.newHashMap(), PsiModificationTracker.MODIFICATION_COUNT);
}
final Map<Optional<P>, Optional<T>> cache = CachedValuesManager.getCachedValue(element, () -> {
// concurrent hash map is a null-hostile collection
return CachedValueProvider.Result.create(Maps.newConcurrentMap(), PsiModificationTracker.MODIFICATION_COUNT);
});
final Object wrapped = cache.computeIfAbsent(param, p -> ObjectUtils.notNull(f.fun(param), NULL_VALUE));
//noinspection unchecked
return (T)ObjectUtils.nullizeByCondition(wrapped, NULL_VALUE::equals);
return cache.computeIfAbsent(Optional.ofNullable(param), p -> Optional.ofNullable(f.fun(param))).orElse(null);
}
/**