airavata-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "ASF GitHub Bot (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (AIRAVATA-2728) Refactoring Experiment Catalog Implementation
Date Mon, 30 Apr 2018 19:38:01 GMT

    [ https://issues.apache.org/jira/browse/AIRAVATA-2728?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16458942#comment-16458942
] 

ASF GitHub Bot commented on AIRAVATA-2728:
------------------------------------------

machristie commented on a change in pull request #191: [AIRAVATA-2728] Refactoring Experiment
Catalog Implementation
URL: https://github.com/apache/airavata/pull/191#discussion_r185086055
 
 

 ##########
 File path: modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/JobRepository.java
 ##########
 @@ -0,0 +1,181 @@
+package org.apache.airavata.registry.core.repositories.expcatalog;
+
+import org.apache.airavata.model.job.JobModel;
+import org.apache.airavata.model.status.JobStatus;
+import org.apache.airavata.model.task.TaskModel;
+import org.apache.airavata.registry.core.entities.expcatalog.JobEntity;
+import org.apache.airavata.registry.core.entities.expcatalog.JobStatusEntity;
+import org.apache.airavata.registry.core.utils.DBConstants;
+import org.apache.airavata.registry.core.utils.ExpCatalogUtils;
+import org.apache.airavata.registry.core.utils.ObjectMapperSingleton;
+import org.apache.airavata.registry.core.utils.QueryConstants;
+import org.apache.airavata.registry.cpi.CompositeIdentifier;
+import org.apache.airavata.registry.cpi.RegistryException;
+import org.dozer.Mapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class JobRepository extends ExpCatAbstractRepository<JobModel, JobEntity, String>
{
+    private final static Logger logger = LoggerFactory.getLogger(JobRepository.class);
+
+    public JobRepository() { super(JobModel.class, JobEntity.class); }
+
+    protected String saveJobModelData(JobModel jobModel, CompositeIdentifier cis) throws
RegistryException {
+        JobEntity jobEntity = saveJob(jobModel, cis);
+        return jobEntity.getJobId();
+    }
+
+    protected JobEntity saveJob(JobModel jobModel, CompositeIdentifier cis) throws RegistryException
{
+        if (jobModel.getJobId() == null || jobModel.getJobId().equals("DO_NOT_SET_AT_CLIENTS"))
{
+            logger.debug("Setting the Job's JobId");
+            jobModel.setJobId((String) cis.getSecondLevelIdentifier());
+        }
+
+        String jobId = (String) cis.getSecondLevelIdentifier();
+        String taskId = (String) cis.getTopLevelIdentifier();
+        Mapper mapper = ObjectMapperSingleton.getInstance();
+        JobEntity jobEntity = mapper.map(jobModel, JobEntity.class);
+
+        if (jobEntity.getJobStatuses() != null) {
+            logger.debug("Populating the Primary Key of JobStatus objects for the Job");
+            jobEntity.getJobStatuses().forEach(jobStatusEntity -> {
+                jobStatusEntity.setJobId(jobId);
+                jobStatusEntity.setTaskId(taskId);
+            });
+        }
+
+        if (!isJobExist(cis)) {
+            logger.debug("Checking if the Job already exists");
+            jobEntity.setCreationTime(new Timestamp((System.currentTimeMillis())));
+        }
+
+        return execute(entityManager -> entityManager.merge(jobEntity));
+    }
+
+    public String addJob(JobModel job, String processId) throws RegistryException {
+        CompositeIdentifier cis = new CompositeIdentifier(job.getTaskId(), job.getJobId());
+        String jobId = saveJobModelData(job, cis);
+        String taskId = (String) cis.getTopLevelIdentifier();
+        job.setProcessId(processId);
+        job.setTaskId(taskId);
+        TaskRepository taskRepository = new TaskRepository();
+        TaskModel taskModel = taskRepository.getTask(taskId);
+        List<JobModel> jobModelList = taskModel.getJobs();
+
+        if (jobModelList != null && !jobModelList.contains(job)) {
+            logger.debug("Adding the Job to the list");
+            jobModelList.add(job);
+            taskModel.setJobs(jobModelList);
+            taskRepository.updateTask(taskModel, taskId);
+        }
+
+        return jobId;
+    }
+
+    public String updateJob(JobModel job, CompositeIdentifier cis) throws RegistryException
{
+        return saveJobModelData(job, cis);
+    }
+
+    public JobModel getJob(CompositeIdentifier cis) throws RegistryException {
+        JobRepository jobRepository = new JobRepository();
+        return jobRepository.get((String) cis.getSecondLevelIdentifier());
+    }
+
+    public String addJobStatus(JobStatus jobStatus, CompositeIdentifier cis) throws RegistryException
{
+        JobModel jobModel = getJob(cis);
+        List<JobStatus> jobStatusList = jobModel.getJobStatuses();
+
+        if (jobStatusList.size() == 0 || !jobStatusList.contains(jobStatus)) {
+
+            if (jobStatus.getStatusId() == null) {
+                logger.debug("Set JobStatus's StatusId");
+                jobStatus.setStatusId(ExpCatalogUtils.getID("STATUS"));
+            }
+
+            logger.debug("Adding the JobStatus to the list");
+            jobStatusList.add(jobStatus);
+
+        }
+
+        jobModel.setJobStatuses(jobStatusList);
+        updateJob(jobModel, cis);
+        return jobStatus.getStatusId();
+    }
+
+    public String updateJobStatus(JobStatus updatedJobStatus, CompositeIdentifier cis) throws
RegistryException {
+        JobModel jobModel = getJob(cis);
+        List<JobStatus> jobStatusList = jobModel.getJobStatuses();
+
+        for (JobStatus retrievedJobStatus : jobStatusList) {
+
+            if (retrievedJobStatus.getStatusId().equals(updatedJobStatus.getStatusId()))
{
+                logger.debug("Updating the JobStatus");
+                jobStatusList.remove(retrievedJobStatus);
 
 Review comment:
   Like above, it's not safe to remove items from a list you are iterating over.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


> Refactoring Experiment Catalog Implementation
> ---------------------------------------------
>
>                 Key: AIRAVATA-2728
>                 URL: https://issues.apache.org/jira/browse/AIRAVATA-2728
>             Project: Airavata
>          Issue Type: Improvement
>          Components: Registry API
>            Reporter: Sneha Tilak
>            Assignee: Sneha Tilak
>            Priority: Major
>




--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Mime
View raw message