Skip to content

TransientActionFactory cache simplification #8048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 14, 2023
Merged

TransientActionFactory cache simplification #8048

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f64f5f5
`TransientActionFactory` cache simplification
jglick May 25, 2023
1e8a316
Merge branch 'master' of https://github.com/jenkinsci/jenkins into Tr…
jglick May 30, 2023
1089a22
Fixing mocks in `HistoryPageFilterTest`
jglick May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 38 additions & 46 deletions core/src/main/java/jenkins/model/TransientActionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,8 @@

package jenkins.model;

import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.Extension;
import hudson.ExtensionList;
import hudson.ExtensionListListener;
import hudson.ExtensionPoint;
Expand Down Expand Up @@ -80,59 +78,53 @@ public abstract class TransientActionFactory<T> implements ExtensionPoint {
*/
public abstract @NonNull Collection<? extends Action> createFor(@NonNull T target);

/** @see <a href="http://stackoverflow.com/a/24336841/12916">no pairs/tuples in Java</a> */
private static class CacheKey {
private final Class<?> type;
private final Class<? extends Action> actionType;
@Restricted(NoExternalUse.class)
@Extension
public static final class Cache extends ExtensionListListener {

CacheKey(Class<?> type, Class<? extends Action> actionType) {
this.type = type;
this.actionType = actionType;
}
@SuppressWarnings("rawtypes")
private ExtensionList<TransientActionFactory> allFactories;

@Override
public boolean equals(Object obj) {
return obj instanceof CacheKey && type == ((CacheKey) obj).type && actionType == ((CacheKey) obj).actionType;
}
private ClassValue<ClassValue<List<TransientActionFactory<?>>>> cache;

@Override
public int hashCode() {
return type.hashCode() ^ actionType.hashCode();
private synchronized ClassValue<ClassValue<List<TransientActionFactory<?>>>> cache() {
if (allFactories == null) {
allFactories = ExtensionList.lookup(TransientActionFactory.class);
allFactories.addListener(this);
}
if (cache == null) {
cache = new ClassValue<>() {
@Override
protected ClassValue<List<TransientActionFactory<?>>> computeValue(Class<?> type) {
return new ClassValue<>() {
@Override
protected List<TransientActionFactory<?>> computeValue(Class<?> actionType) {
List<TransientActionFactory<?>> factories = new ArrayList<>();
for (TransientActionFactory<?> taf : allFactories) {
if (taf.type().isAssignableFrom(type) && (actionType.isAssignableFrom(taf.actionType()) || taf.actionType().isAssignableFrom(actionType))) {
factories.add(taf);
}
}
return factories;
}
};
}
};
}
return cache;
}
}

@SuppressWarnings("rawtypes")
private static final LoadingCache<ExtensionList<TransientActionFactory>, LoadingCache<CacheKey, List<TransientActionFactory<?>>>> cache =
CacheBuilder.newBuilder().weakKeys().build(new CacheLoader<>() {

@Override
public LoadingCache<CacheKey, List<TransientActionFactory<?>>> load(final ExtensionList<TransientActionFactory> allFactories) throws Exception {
final LoadingCache<CacheKey, List<TransientActionFactory<?>>> perJenkinsCache =
CacheBuilder.newBuilder().build(new CacheLoader<>() {
@Override
public List<TransientActionFactory<?>> load(CacheKey key) throws Exception {
List<TransientActionFactory<?>> factories = new ArrayList<>();
for (TransientActionFactory<?> taf : allFactories) {
Class<? extends Action> actionType = taf.actionType();
if (taf.type().isAssignableFrom(key.type) && (key.actionType.isAssignableFrom(actionType) || actionType.isAssignableFrom(key.actionType))) {
factories.add(taf);
}
}
return factories;
}
});
allFactories.addListener(new ExtensionListListener() {
@Override
public void onChange() {
perJenkinsCache.invalidateAll();
}
});
return perJenkinsCache;
public synchronized void onChange() {
cache = null;
}
});

}

@Restricted(NoExternalUse.class) // pending a need for it outside Actionable
public static Iterable<? extends TransientActionFactory<?>> factoriesFor(Class<?> type, Class<? extends Action> actionType) {
return cache.getUnchecked(ExtensionList.lookup(TransientActionFactory.class)).getUnchecked(new CacheKey(type, actionType));
return ExtensionList.lookupSingleton(Cache.class).cache().get(type).get(actionType);
}

}