Skip to content

GitHub Issue 1282: add getSampleNames to reduce memory usage #7840

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
XingY wants to merge 1 commit into
base: release26.7-SNAPSHOT
Choose a base branch
from
+9 −6
Open

GitHub Issue 1282: add getSampleNames to reduce memory usage #7840

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
3 changes: 3 additions & 0 deletions api/src/org/labkey/api/workflow/Job.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,9 @@ public void setAttachments(List<AttachmentFile> attachments)
@JsonIgnore
public abstract @NotNull List<? extends ExpMaterial> getSamples();

@JsonIgnore
public abstract @NotNull List<String> getSampleNames();

public void setEntities(List<WorkEntity> entities)
{
_entities = entities;
Expand Down
12 changes: 6 additions & 6 deletions api/src/org/labkey/api/workflow/WorkEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.commons.collections4.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.json.JSONObject;
import org.labkey.api.exp.api.ExpMaterial;
import org.labkey.api.security.User;
import org.labkey.api.security.UserManager;
import org.labkey.api.util.GUID;
Expand Down Expand Up @@ -76,15 +76,15 @@ public WorkEntity(Map<String, Object> map)
this.setContainerId(new GUID((String) map.get("Container")));
}

public WorkEntity(ExpMaterial sample)
public WorkEntity(@NotNull Long rowId, @NotNull WorkEntity.EntityType entityType)
{
_entityType = EntityType.Sample;
_entityValue = sample.getRowId();
_entityType = entityType;
_entityValue = rowId;
}

public WorkEntity(ExpMaterial sample, WorkType workType, Long workRowId, @Nullable Long actionId)
public WorkEntity(@NotNull Long rowId, @NotNull WorkEntity.EntityType entityType, WorkType workType, Long workRowId, @Nullable Long actionId)
{
this(sample);
this(rowId, entityType);
_workType = workType;
_workRowId = workRowId;
_actionId = actionId;
Expand Down