opendev/gerrit
Code Issues Proposed changes

PerThreadCache: Add static convenience method

Browse Source 
Change-Id: Id599161b12c7b0e2c39ed28f01ff769d9f71b91e
This commit is contained in:
Dave Borowitz
2018-04-18 16:17:02 +02:00
parent 81f373de9e
commit f474dbcc78
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/com/google/gerrit/server/cache/PerThreadCache.java vendored
View File

@@ -104,6 +104,11 @@ public class PerThreadCache implements AutoCloseable {
return CACHE.get(); return CACHE.get();
} }
public static <T> T getOrCompute(Key<T> key, Supplier<T> loader) {
PerThreadCache cache = get();
return cache != null ? cache.get(key, loader) : loader.get();
}
private final Map<Key<?>, Object> cache = Maps.newHashMapWithExpectedSize(10); private final Map<Key<?>, Object> cache = Maps.newHashMapWithExpectedSize(10);
private PerThreadCache() {} private PerThreadCache() {}

10
java/com/google/gerrit/server/permissions/DefaultPermissionBackend.java
View File

@@ -109,14 +109,10 @@ public class DefaultPermissionBackend extends PermissionBackend {
try { try {
ProjectState state = projectCache.checkedGet(project); ProjectState state = projectCache.checkedGet(project);
if (state != null) { if (state != null) {
PerThreadCache perThreadCache = PerThreadCache.get();
if (perThreadCache == null) {
return projectControlFactory.create(user, state).asForProject().database(db);
}
PerThreadCache.Key<ProjectControl> cacheKey =
PerThreadCache.Key.create(ProjectControl.class, project, user.getCacheKey());
ProjectControl control = ProjectControl control =
perThreadCache.get(cacheKey, () -> projectControlFactory.create(user, state)); PerThreadCache.getOrCompute(
PerThreadCache.Key.create(ProjectControl.class, project, user.getCacheKey()),
() -> projectControlFactory.create(user, state));
return control.asForProject().database(db); return control.asForProject().database(db);
} }
return FailedPermissionBackend.project("not found", new NoSuchProjectException(project)); return FailedPermissionBackend.project("not found", new NoSuchProjectException(project));