[airavata] branch develop updated: Bug fix in Job counting query

[isjarana]

This is an automated email from the ASF dual-hosted git repository.

isjarana pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/develop by this push:
     new 33e82ca593 Bug fix in Job counting query
     new 9bc5411049 Merge pull request #376 from isururanawaka/metaschedular
33e82ca593 is described below

commit 33e82ca593cc94378345fc51063364b5767e34d0
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Tue Jan 31 22:33:02 2023 -0500

    Bug fix in Job counting query
---
 .../apache/airavata/registry/core/utils/QueryConstants.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java
index 777b6dfa5c..797ba1eb92 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/utils/QueryConstants.java
@@ -199,11 +199,11 @@ public interface QueryConstants {
     String DELETE_JOB_NATIVE_QUERY = "DELETE FROM JOB WHERE JOB_ID = ?1 AND 
TASK_ID = ?2";
 
 
-    String FIND_JOB_COUNT = "SELECT DISTINCT JS FROM "+ 
JobStatusEntity.class.getSimpleName()+"  WHERE JS.JOB_ID IN " +
-            "( SELECT J.JOB_ID FROM"+ JobEntity.class.getSimpleName()+" J 
where J.PROCESS_ID IN " +
-            "(SELECT P.PROCESS_ID FROM"+ ProcessEntity.class.getSimpleName()+ 
"P  where P.EXPERIMENT_ID IN " +
-            "(SELECT E.EXPERIMENT_ID 
FROM"+ExperimentEntity.class.getSimpleName()+"E where E.GATEWAY_ID= 
:"+DBConstants.Job.GATEWAY_ID+"))) " +
-            "AND JS.STATE= :"+ DBConstants.Job.JOB_STATUS + "and 
JS.TIME_OF_STATE_CHANGE > now()-interval :"+DBConstants.Job.TIME_INTERVAL 
+"minute";
+    String FIND_JOB_COUNT = "SELECT DISTINCT JS FROM "+ 
JobStatusEntity.class.getSimpleName()+" JS WHERE JS.JOB_ID IN " +
+            "(SELECT J.JOB_ID FROM "+ JobEntity.class.getSimpleName()+" J 
where J.PROCESS_ID IN " +
+            "(SELECT P.PROCESS_ID FROM "+ ProcessEntity.class.getSimpleName()+ 
" P  where P.EXPERIMENT_ID IN " +
+            "(SELECT E.EXPERIMENT_ID FROM 
"+ExperimentEntity.class.getSimpleName()+" E where E.GATEWAY_ID= 
:"+DBConstants.Job.GATEWAY_ID+" ))) " +
+            "AND JS.STATE= :"+ DBConstants.Job.JOB_STATUS + " and 
JS.TIME_OF_STATE_CHANGE > now() - interval :"+DBConstants.Job.TIME_INTERVAL +" 
minute";
 
 
 }