[airavata] branch develop updated: query modification

[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 8122e02dc8 query modification
     new e354b45ea5 Merge pull request #380 from isururanawaka/metaschedular
8122e02dc8 is described below

commit 8122e02dc8ffb55f98a71d64b788bbcf96ab9334
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Wed Feb 1 12:31:30 2023 -0500

    query modification
---
 .../metascheduler/metadata/analyzer/impl/DataAnalyzerImpl.java        | 2 +-
 .../registry/core/repositories/expcatalog/JobStatusRepository.java    | 4 ++--
 .../airavata/registry/api/service/handler/RegistryServerHandler.java  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/modules/airavata-metascheduler/metadata-analyzer/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/impl/DataAnalyzerImpl.java
 
b/modules/airavata-metascheduler/metadata-analyzer/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/impl/DataAnalyzerImpl.java
index 5ae78bb5b4..cec8aa528f 100644
--- 
a/modules/airavata-metascheduler/metadata-analyzer/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/impl/DataAnalyzerImpl.java
+++ 
b/modules/airavata-metascheduler/metadata-analyzer/src/main/java/org/apache/airavata/metascheduler/metadata/analyzer/impl/DataAnalyzerImpl.java
@@ -49,7 +49,7 @@ public class DataAnalyzerImpl implements DataAnalyzer {
 
             double fifteenMinuteAverage = fifteenMinuteCount * time / (10 * 
60);
 
-            LOGGER.info("service rate: 5 min avg" + fiveMinuteAverage + " 10 
min avg "
+            LOGGER.info("service rate: 5 min avg " + fiveMinuteAverage + " 10 
min avg "
                     + tenMinuteAverage + " 15 min avg " + 
fifteenMinuteAverage);
 
         } catch (Exception ex) {
diff --git 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/JobStatusRepository.java
 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/JobStatusRepository.java
index adb4558d66..101736ba35 100644
--- 
a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/JobStatusRepository.java
+++ 
b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/repositories/expcatalog/JobStatusRepository.java
@@ -108,9 +108,9 @@ public class JobStatusRepository extends 
ExpCatAbstractRepository<JobStatus, Job
     }
 
 
-    public List<JobStatus> getDistinctListofJobStatus(String status, String 
gatewayId, double time){
+    public List<JobStatus> getDistinctListofJobStatus(String gatewayId,String 
status, double time){
         JobStatusRepository jobStatusRepository = new JobStatusRepository();
         return  
jobStatusRepository.selectWithNativeQuery(QueryConstants.FIND_JOB_COUNT_NATIVE_QUERY,
-                status,gatewayId,String.valueOf(time));
+                gatewayId,status,String.valueOf(time));
     }
 }
diff --git 
a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
 
b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
index 8ea09be209..376131e9a5 100644
--- 
a/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
+++ 
b/modules/registry/registry-server/registry-api-service/src/main/java/org/apache/airavata/registry/api/service/handler/RegistryServerHandler.java
@@ -1088,7 +1088,7 @@ public class RegistryServerHandler implements 
RegistryService.Iface {
                            String gatewayId, double searchBackTimeInMinutes) 
throws RegistryServiceException, TException {
 
      List<JobStatus> jobStatusList = jobStatusRepository.
-             
getDistinctListofJobStatus(jobStatus.getJobState().name(),gatewayId,searchBackTimeInMinutes);
+             
getDistinctListofJobStatus(gatewayId,jobStatus.getJobState().name(),searchBackTimeInMinutes);
      return  jobStatusList.size();
     }