Skip to content

Better handling for an empty UnreferencedSampleFiles table #7414

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-susanh wants to merge 1 commit into
base: release25.11-SNAPSHOT
Choose a base branch
from
Open

Better handling for an empty UnreferencedSampleFiles table #7414

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
60 changes: 32 additions & 28 deletions experiment/src/org/labkey/experiment/api/ExpUnreferencedSampleFilesTableImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,38 +48,42 @@ public FileUnionTable(@NotNull ExpSchema schema)
FileContentService svc = FileContentService.get();

_query = new SQLFragment();
if (svc == null)
return;

SQLFragment listQuery = svc.listSampleFilesQuery(schema.getUser());
if (StringUtils.isEmpty(listQuery))
return;

TableInfo expDataTable = ExperimentService.get().getTinfoData();
TableInfo materialTable = ExperimentService.get().getTinfoMaterial();
SQLFragment listQuery = new SQLFragment();
if (svc != null)
listQuery = svc.listSampleFilesQuery(schema.getUser());

_query.appendComment("<SampleFileListTableInfo>", getSchema().getSqlDialect());

SQLFragment sampleFileSql = new SQLFragment("SELECT m.Container, if.FilePathShort \n")
.append("FROM (")
.append(svc.listSampleFilesQuery(schema.getUser()))
.append(") AS if \n")
.append("JOIN ")
.append(materialTable, "m")
.append(" ON if.SourceKey = m.RowId");

SQLFragment unreferencedFileSql = new SQLFragment("SELECT ed.rowId, ed.name as filename, ed.container, ed.created, ed.createdBy, ed.DataFileUrl FROM ")
.append(expDataTable, "ed")
.append(" LEFT JOIN (")
.append(sampleFileSql)
.append(" ) sf\n")
.append(" ON ed.name = sf.FilePathShort AND ed.container = sf.container\n")
.append(" WHERE ed.datafileurl LIKE ")
.appendValue("%@files/sampletype/%")
.append(" AND sf.FilePathShort IS NULL");

_query.append(unreferencedFileSql);
TableInfo expDataTable = ExperimentService.get().getTinfoData();
if (!StringUtils.isEmpty(listQuery))
{
TableInfo materialTable = ExperimentService.get().getTinfoMaterial();

SQLFragment sampleFileSql = new SQLFragment("SELECT m.Container, if.FilePathShort \n")
.append("FROM (")
.append(listQuery)
.append(") AS if \n")
.append("JOIN ")
.append(materialTable, "m")
.append(" ON if.SourceKey = m.RowId");

SQLFragment unreferencedFileSql = new SQLFragment("SELECT ed.rowId, ed.name as filename, ed.container, ed.created, ed.createdBy, ed.DataFileUrl FROM ")
.append(expDataTable, "ed")
.append(" LEFT JOIN (")
.append(sampleFileSql)
.append(" ) sf\n")
.append(" ON ed.name = sf.FilePathShort AND ed.container = sf.container\n")
.append(" WHERE ed.datafileurl LIKE ")
.appendValue("%@files/sampletype/%")
.append(" AND sf.FilePathShort IS NULL");

_query.append(unreferencedFileSql);

}
else
{
_query.append("SELECT RowId, FileName, Container, Created, CreatedBy, DataFileUrl FROM ").append(expDataTable).append(" WHERE (1=0)");
}
_query.appendComment("</SampleFileListTableInfo>", getSchema().getSqlDialect());

var rowIdCol = new BaseColumnInfo("RowId", this, JdbcType.INTEGER);
Expand Down