Skip to content

Cache improvements #1084

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
labkey-adam merged 2 commits into from
Oct 12, 2026
Merged

Cache improvements #1084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a15f129
Cache improvements
labkey-adam Oct 10, 2026
aa1b917
Require key class at cache construction time
labkey-adam Oct 10, 2026
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
4 changes: 2 additions & 2 deletions flow/enginesrc/org/labkey/flow/analysis/model/FCSCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ private static class FCSHeaderCache

private FCSHeaderCache()
{
super(CacheManager.getCache(CACHE_SIZE, CacheManager.DAY, "FCS header cache"), new CacheLoader<>()
super(CacheManager.getCache(URI.class, CACHE_SIZE, CacheManager.DAY, "FCS header cache"), new CacheLoader<>()
{
@Override
public FCSHeader load(@NotNull URI uri, Object argument)
Expand Down Expand Up @@ -80,7 +80,7 @@ private static class FCSCacheMap extends BlockingCache<URI,FCS>

private FCSCacheMap()
{
super(CacheManager.getCache(CACHE_SIZE, CacheManager.DAY, "FCS cache"), new CacheLoader<>()
super(CacheManager.getCache(URI.class, CACHE_SIZE, CacheManager.DAY, "FCS cache"), new CacheLoader<>()
{
@Override
public FCS load(@NotNull URI uri, Object argument)
Expand Down
2 changes: 1 addition & 1 deletion flow/src/org/labkey/flow/persist/AttributeCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ public GraphEntry getAliasedEntry()
public AttributeCache(AttributeType type)
{
_type = type;
_cache = CacheManager.getBlockingStringKeyCache(CacheManager.UNLIMITED, CacheManager.DAY, "Flow " + _type + " cache", BY_CONTAINER_LOADER);
_cache = CacheManager.getBlockingCache(String.class, CacheManager.UNLIMITED, CacheManager.DAY, "Flow " + _type + " cache", BY_CONTAINER_LOADER);
}

@Nullable
Expand Down
4 changes: 2 additions & 2 deletions flow/src/org/labkey/flow/query/FlowSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.labkey.api.assay.AbstractAssayProvider;
import org.labkey.api.assay.AssayProtocolSchema;
import org.labkey.api.assay.AssayProvider;
Expand Down Expand Up @@ -1964,7 +1964,7 @@ static class TempTableToken
}


private static final Cache<String, MaterializedQueryHelper> fastflowCache = CacheManager.getStringKeyCache(100_000, CacheManager.HOUR, "Fast flow objects");
private static final Cache<String, MaterializedQueryHelper> fastflowCache = CacheManager.getCache(String.class, 100_000, CacheManager.HOUR, "Fast flow objects");

private static final ContainerManager.ContainerListener containerListener = new ContainerManager.ContainerListener()
{
Expand Down
4 changes: 2 additions & 2 deletions ms2/src/org/labkey/ms2/MS2Manager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import org.labkey.api.pipeline.PipeRoot;
import org.labkey.api.pipeline.PipelineService;
import org.labkey.api.pipeline.PipelineValidationException;
import org.labkey.api.protein.CoverageProtein;
import org.labkey.api.protein.ProteinManager;
import org.labkey.api.protein.ProteinSchema;
import org.labkey.api.protein.SimpleProtein;
Expand All @@ -74,7 +75,6 @@
import org.labkey.ms2.pipeline.AbstractMS2SearchTask;
import org.labkey.ms2.pipeline.MS2ImportPipelineJob;
import org.labkey.ms2.pipeline.TPPTask;
import org.labkey.api.protein.CoverageProtein;
import org.labkey.ms2.protein.Protein;
import org.labkey.ms2.query.MS2Schema;
import org.labkey.ms2.reader.ITraqProteinQuantitation;
Expand Down Expand Up @@ -113,7 +113,7 @@ public class MS2Manager
{
private static final Logger LOG = LogManager.getLogger(MS2Manager.class);
private static final int CACHE_SIZE = 10;
private static final Cache<String, ImmutableLongArray> PEPTIDE_INDEX_CACHE = CacheManager.getBlockingCache(CACHE_SIZE, CacheManager.HOUR, "Peptide index", null);
private static final Cache<String, ImmutableLongArray> PEPTIDE_INDEX_CACHE = CacheManager.getBlockingCache(String.class, CACHE_SIZE, CacheManager.HOUR, "Peptide index", null);
private static final String FRACTION_CACHE_PREFIX = "MS2Fraction/";
private static final Cache<String, MS2Fraction> FRACTION_CACHE = CacheManager.getSharedCache();
private static final String PEPTIDE_PROPHET_SUMMARY_CACHE_PREFIX = "PeptideProphetSummary/";
Expand Down
2 changes: 1 addition & 1 deletion nab/src/org/labkey/nab/NabAssayController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ private Date getCustomViewModifiedDate(ExpRun run)
}

// Keyed by session, run, and fit, so the details page and each of its graph images share one built run
static Cache<String, NAbRunWrapper> ASSAY_CACHE = CacheManager.getCache(50, TimeUnit.MINUTES.toMillis(5), "NabAssayCache");
static Cache<String, NAbRunWrapper> ASSAY_CACHE = CacheManager.getCache(String.class, 50, TimeUnit.MINUTES.toMillis(5), "NabAssayCache");

private String getCacheKeyPrefix()
{
Expand Down
2 changes: 1 addition & 1 deletion nab/src/org/labkey/nab/query/NabProtocolSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

public class NabProtocolSchema extends AssayProtocolSchema
{
private static final BlockingCache<Long, Set<Double>> CUTOFF_CACHE = DatabaseCache.get(NabManager.getSchema().getScope(), 100, "NAbCutoffValues", (key, argument) -> {
private static final BlockingCache<Long, Set<Double>> CUTOFF_CACHE = DatabaseCache.get(Long.class, NabManager.getSchema().getScope(), 100, "NAbCutoffValues", (key, argument) -> {
ExpProtocol protocol = (ExpProtocol)argument;
return Collections.unmodifiableSet(DilutionManager.getCutoffValues(protocol));
});
Expand Down
2 changes: 1 addition & 1 deletion protein/src/org/labkey/protein/ProteinServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ public TableInfo getSequencesTable()
}

private static final Cache<String, List<ProteinFeature>> FEATURE_CACHE =
CacheManager.getBlockingCache(100, CacheManager.DAY, "Uniprot protein features", new FeatureLoader());
CacheManager.getBlockingCache(String.class, 100, CacheManager.DAY, "Uniprot protein features", new FeatureLoader());

@Override
public List<ProteinFeature> getProteinFeatures(String accession)
Expand Down
Loading