Skip to content

CachedResultSetBuilder replaces CachedResultSets #977

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 1 commit into from
Jan 14, 2026
+8 −9
Merged

CachedResultSetBuilder replaces CachedResultSets #977

Show file tree
Hide file tree
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
5 changes: 2 additions & 3 deletions flow/src/org/labkey/flow/controllers/executescript/SamplesConfirmGridView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.labkey.api.data.ActionButton;
import org.labkey.api.data.BaseColumnInfo;
import org.labkey.api.data.ButtonBar;
import org.labkey.api.data.CachedResultSets;
import org.labkey.api.data.CachedResultSetBuilder;
import org.labkey.api.data.ColumnInfo;
import org.labkey.api.data.Container;
import org.labkey.api.data.DataRegion;
Expand Down Expand Up @@ -62,7 +62,6 @@
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
Expand Down Expand Up @@ -191,7 +190,7 @@ public SamplesConfirmGridView(User user, Container container, Collection<String>
maps.addAll(matchedList);

// Initialize the ResultSet and DataRegion
ResultSet rs = CachedResultSets.create(maps);
ResultSet rs = CachedResultSetBuilder.create(maps).build();
Results results = new ResultsImpl(rs, (Map<FieldKey,ColumnInfo>)(Map)columns);
setResults(results);

Expand Down
8 changes: 4 additions & 4 deletions flow/src/org/labkey/flow/persist/FlowManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,9 @@ private List<FlowEntry> getAttributeEntryCaseInsensitive(String containerId, Att
{
//_log.info("getAttributeEntryCaseInsensitive(" + containerId + ", " + type + ", " + attr + ")");
SQLFragment sql = new SQLFragment("SELECT Name, RowId, Id FROM ")
.append(attributeTable(type))
.append(" WHERE Container = ?").add(containerId)
.append(" AND lower(Name) = lower(?)").add(attr);
.append(attributeTable(type))
.append(" WHERE Container = ?").add(containerId)
.append(" AND lower(Name) = lower(?)").add(attr);

return new SqlSelector(getSchema(), sql).mapStream().map(map -> {
String name = (String)map.get("Name");
Expand Down Expand Up @@ -1674,7 +1674,7 @@ public void updateStatistics(int currentRow) { }
List<Map<String, Object>> propMaps = new ArrayList<>(1000);

SqlSelector ss = new SqlSelector(getSchema(), sqlSelectDateTime);
ss.mapStream().forEach(row -> {
ss.forEachMap(row -> {

// parse the date
String dateStr = (String) row.get("datetime");
Expand Down
4 changes: 2 additions & 2 deletions flow/src/org/labkey/flow/reports/FilterFlowReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.apache.commons.beanutils.ConversionException;
import org.apache.commons.lang3.StringUtils;
import org.labkey.api.data.CachedResultSet;
import org.labkey.api.data.CachedResultSets;
import org.labkey.api.data.CachedResultSetBuilder;
import org.labkey.api.data.ColumnInfo;
import org.labkey.api.data.CompareType;
import org.labkey.api.data.Container;
Expand Down Expand Up @@ -267,7 +267,7 @@ protected CachedResultSet filterDateRange(CachedResultSet rs, String dateColumn,
else
{
// rs is a CachedResultSet, so its metadata is cached. No need to cache it again
ret = CachedResultSets.create(rs.getMetaData(), rows, true);
ret = CachedResultSetBuilder.create(rows).setMetaData(rs.getMetaData()).build();
rs.close();
}

Expand Down