Skip to content

Disable LabKey caching of ResultSet by default #1222

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

Open
labkey-jeckels wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Disable LabKey caching of ResultSet by default #1222

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
17 changes: 11 additions & 6 deletions src/org/labkey/targetedms/folderImport/PanoramaQCSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ public void exportSettings(VirtualFile vf, Container container, User user) throw
List<ColumnInfo> userEditableCols = ti.getColumns().stream().filter(ColumnInfo::isUserEditable).toList();
SimpleFilter filter = SimpleFilter.createContainerFilter(container); //only export the ones that are defined in current container (and not the ones from the root container)

try(Results results = QueryService.get().select(ti, userEditableCols, filter, null))
// select(true): exportSettingsToTSV() requires a cached result set (see that method)
try(Results results = QueryService.get().getSelectBuilder(ti).columns(userEditableCols).filter(filter).select(true))
{
exportSettingsToTSV(vf, results, getSettingsFileName(), getTableName());
}
Expand All @@ -89,7 +90,7 @@ public void exportSettings(VirtualFile vf, Container container, User user) throw
.append(TargetedMSManager.getTableInfoQCMetricConfiguration(), "qcMetricConfig")
.append(" ON qcEnabledMetrics.metric = qcMetricConfig.Id");

try (Results results = QueryService.get().getSelectBuilder(schema, sql.getSQL(), true).select())
try (Results results = QueryService.get().getSelectBuilder(schema, sql.getSQL(), true).select(true))
{
exportSettingsToTSV(vf, results, getSettingsFileName(), getTableName());
}
Expand Down Expand Up @@ -119,7 +120,8 @@ public void exportSettings(VirtualFile vf, Container container, User user) throw
TableInfo ti = getTableInfo(user, container, cf);
List<ColumnInfo> userEditableCols = ti.getColumns().stream().filter(ColumnInfo::isUserEditable).toList();

try (Results results = QueryService.get().select(ti, userEditableCols, null, null))
// select(true): exportSettingsToTSV() requires a cached result set (see that method)
try (Results results = QueryService.get().getSelectBuilder(ti).columns(userEditableCols).select(true))
{
exportSettingsToTSV(vf, results, getSettingsFileName(), getTableName());
}
Expand All @@ -146,7 +148,7 @@ public void exportSettings(VirtualFile vf, Container container, User user) throw
.append(" ) qcAnnotationType")
.append(" ON qcAnnotation.QCAnnotationTypeId = qcAnnotationType.Id");

try (Results results = QueryService.get().getSelectBuilder(schema, sql.getSQL(), true).select())
try (Results results = QueryService.get().getSelectBuilder(schema, sql.getSQL(), true).select(true))
{
exportSettingsToTSV(vf, results, getSettingsFileName(), getTableName());
}
Expand Down Expand Up @@ -188,7 +190,7 @@ public void exportSettings(VirtualFile vf, Container container, User user) throw
.append(TargetedMSManager.getTableInfoRuns(), "runs")
.append(" ON replicate.RunId = runs.Id");

try (Results results = QueryService.get().getSelectBuilder(schema, sql.getSQL(), true).select())
try (Results results = QueryService.get().getSelectBuilder(schema, sql.getSQL(), true).select(true))
{
exportSettingsToTSV(vf, results, getSettingsFileName(), getTableName());
}
Expand Down Expand Up @@ -332,12 +334,15 @@ public void exportSettings(VirtualFile vf, Container container, User user) throw
TableInfo ti = getTableInfo(user, container, null);
List<ColumnInfo> userEditableCols = ti.getColumns().stream().filter(ColumnInfo::isUserEditable).toList();

try (Results results = QueryService.get().select(ti, userEditableCols, null, null))
// select(true): exportSettingsToTSV() requires a cached result set (see that method)
try (Results results = QueryService.get().getSelectBuilder(ti).columns(userEditableCols).select(true))
{
exportSettingsToTSV(vf, results, getSettingsFileName(), getTableName());
}
}

// NOTE: callers must pass a cached Results (select(true)). This method calls countAll() before iterating and then
// re-iterates the same Results via TSVGridWriter, both of which require a cached, re-iterable result set.
protected void exportSettingsToTSV(VirtualFile vf, Results results, String fileName, String tableName) throws ImportException
{
try
Expand Down
Loading