Skip to content

Reduce per-container memory: cache by GUID instead of Container, share JSON keys #282

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-jeckels merged 1 commit into from
Oct 6, 2026
+8 −6
Merged

Reduce per-container memory: cache by GUID instead of Container, share JSON keys #282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 8 additions & 6 deletions specimen/src/org/labkey/specimen/SpecimenRequestManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.labkey.api.collections.LongArrayList;
import org.labkey.api.data.ColumnInfo;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerManager;
import org.labkey.api.data.DatabaseCache;
import org.labkey.api.data.DbScope;
import org.labkey.api.data.RuntimeSQLException;
Expand Down Expand Up @@ -905,7 +906,7 @@ public void setViewColumnName(String viewColumnName)
}
}

private final BlockingCache<Container, Map<String, Map<String, Object>>> GROUPED_VALUES_CACHE = DatabaseCache.get(SpecimenSchema.get().getScope(), 10, 8 * CacheManager.HOUR, "Specimen grouped values", new GroupedValuesCacheLoader());
private final BlockingCache<GUID, Map<String, Map<String, Object>>> GROUPED_VALUES_CACHE = DatabaseCache.get(SpecimenSchema.get().getScope(), 10, 8 * CacheManager.HOUR, "Specimen grouped values", new GroupedValuesCacheLoader());

private static class GroupedResults
{
Expand All @@ -918,24 +919,25 @@ private static class GroupedResults

public void clearGroupedValuesForColumn(Container container)
{
GROUPED_VALUES_CACHE.remove(container);
GROUPED_VALUES_CACHE.remove(container.getEntityId());
}

@NotNull
public Map<String, Map<String, Object>> getGroupedValuesForColumn(Container container, User user, ArrayList<String[]> groupings)
{
return GROUPED_VALUES_CACHE.get(container, Pair.of(user, groupings));
return GROUPED_VALUES_CACHE.get(container.getEntityId(), Pair.of(user, groupings));
}

private class GroupedValuesCacheLoader implements CacheLoader<Container, Map<String, Map<String, Object>>>
private class GroupedValuesCacheLoader implements CacheLoader<GUID, Map<String, Map<String, Object>>>
{
@Override
public Map<String, Map<String, Object>> load(@NotNull Container c, @Nullable Object argument)
public Map<String, Map<String, Object>> load(@NotNull GUID containerId, @Nullable Object argument)
{
Map<String, Map<String, Object>> groupedValues = new HashMap<>();

// ColumnName and filter names are "QueryView" names; map them to actual table names before building query
Study study = StudyService.get().getStudy(c);
Container c = ContainerManager.getForId(containerId);
Study study = null != c ? StudyService.get().getStudy(c) : null;
if (study != null)
{
@SuppressWarnings("unchecked") Pair<User, List<String[]>> pair = (Pair<User, List<String[]>>)argument;
Expand Down
Loading