[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 dc4f52dbeb Bug fix in Job counting query
     new 36a8dc29b3 Merge pull request #378 from isururanawaka/metaschedular
dc4f52dbeb is described below

commit dc4f52dbeb8059d1a8adc05d5af61a21a26b9414
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Wed Feb 1 00:21:52 2023 -0500

    Bug fix in Job counting query
---
 .../org/apache/airavata/registry/core/utils/QueryConstants.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 84f2f143f5..18b53db36d 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,10 +199,10 @@ public interface QueryConstants {
     String DELETE_JOB_NATIVE_QUERY = "DELETE FROM JOB WHERE JOB_ID = ?1 AND 
TASK_ID = ?2";
 
 
-    String FIND_JOB_COUNT_NATIVE_QUERY = "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= ?1))) " +
+    String FIND_JOB_COUNT_NATIVE_QUERY = "SELECT DISTINCT JS FROM JOB_STATUS 
JS WHERE JS.JOB_ID IN " +
+            "(SELECT J.JOB_ID FROM JOB J where J.PROCESS_ID IN " +
+            "(SELECT P.PROCESS_ID FROM PROCESS P  where P.EXPERIMENT_ID IN " +
+            "(SELECT E.EXPERIMENT_ID FROM EXPERIMENT E where E.GATEWAY_ID= 
?1))) " +
             "AND JS.STATE = ?2 and JS.TIME_OF_STATE_CHANGE > now() - interval 
?3 minute";