fix: much faster query of selectors for web

Author: fstagni

src/DIRAC/WorkloadManagementSystem/DB/JobDB.py

@@ -107,7 +107,7 @@ def __getAttributeNames(self):
     def getDistinctJobAttributes(self, attribute, condDict=None, older=None, newer=None, timeStamp="LastUpdateTime"):
         """Get distinct values of the job attribute under specified conditions"""
         return self.getDistinctAttributeValues(
-            "JobsHistorySummary", attribute, condDict=condDict, older=older, newer=newer, timeStamp=timeStamp
+            "Jobs", attribute, condDict=condDict, older=older, newer=newer, timeStamp=timeStamp
         )
 
     #############################################################################

src/DIRAC/WorkloadManagementSystem/Service/JobMonitoringHandler.py

@@ -56,27 +56,27 @@ def getJobsAttributes(cls, *args, **kwargs):
     types_getApplicationStates = []
 
     @classmethod
-    def export_getApplicationStates(cls, condDict=None, older=None, newer=None):
+    def export_getApplicationStates(cls):
         """Return Distinct Values of ApplicationStatus job Attribute in WMS"""
-        return cls.jobDB.getDistinctJobAttributes("ApplicationStatus", condDict, older, newer)
+        return cls.jobDB._query("SELECT DISTINCT ApplicationStatus FROM JobsHistorySummary")
 
     ##############################################################################
     types_getJobTypes = []
 
     @classmethod
-    def export_getJobTypes(cls, condDict=None, older=None, newer=None):
+    def export_getJobTypes(cls):
         """Return Distinct Values of JobType job Attribute in WMS"""
-        return cls.jobDB.getDistinctJobAttributes("JobType", condDict, older, newer)
+        return cls.jobDB._query("SELECT DISTINCT JobType FROM JobsHistorySummary")
 
     ##############################################################################
     types_getOwners = []
 
     @classmethod
-    def export_getOwners(cls, condDict=None, older=None, newer=None):
+    def export_getOwners(cls):
         """
         Return Distinct Values of Owner job Attribute in WMS
         """
-        return cls.jobDB.getDistinctJobAttributes("Owner", condDict, older, newer)
+        return cls.jobDB._query("SELECT DISTINCT Owner FROM JobsHistorySummary")
 
     ##############################################################################
     types_getOwnerGroup = []
@@ -86,47 +86,47 @@ def export_getOwnerGroup(cls):
         """
         Return Distinct Values of OwnerGroup from the JobDB
         """
-        return cls.jobDB.getDistinctJobAttributes("OwnerGroup")
+        return cls.jobDB._query("SELECT DISTINCT OwnerGroup FROM JobsHistorySummary")
 
     ##############################################################################
     types_getJobGroups = []
 
     @classmethod
-    def export_getJobGroups(cls, condDict=None, older=None, cutDate=None):
+    def export_getJobGroups(cls):
         """
         Return Distinct Values of ProductionId job Attribute in WMS
         """
-        return cls.jobDB.getDistinctJobAttributes("JobGroup", condDict, older, newer=cutDate)
+        return cls.jobDB._query("SELECT DISTINCT JobGroup FROM JobsHistorySummary")
 
     ##############################################################################
     types_getSites = []
 
     @classmethod
-    def export_getSites(cls, condDict=None, older=None, newer=None):
+    def export_getSites(cls):
         """
         Return Distinct Values of Site job Attribute in WMS
         """
-        return cls.jobDB.getDistinctJobAttributes("Site", condDict, older, newer)
+        return cls.jobDB._query("SELECT DISTINCT Site FROM JobsHistorySummary")
 
     ##############################################################################
     types_getStates = []
 
     @classmethod
-    def export_getStates(cls, condDict=None, older=None, newer=None):
+    def export_getStates(cls):
         """
         Return Distinct Values of Status job Attribute in WMS
         """
-        return cls.jobDB.getDistinctJobAttributes("Status", condDict, older, newer)
+        return cls.jobDB._query("SELECT DISTINCT Status FROM JobsHistorySummary")
 
     ##############################################################################
     types_getMinorStates = []
 
     @classmethod
-    def export_getMinorStates(cls, condDict=None, older=None, newer=None):
+    def export_getMinorStates(cls):
         """
         Return Distinct Values of Minor Status job Attribute in WMS
         """
-        return cls.jobDB.getDistinctJobAttributes("MinorStatus", condDict, older, newer)
+        return cls.jobDB._query("SELECT DISTINCT MinorStatus FROM JobsHistorySummary")
 
     ##############################################################################
     types_getJobs = []

tests/Integration/WorkloadManagementSystem/Test_Client_WMS.py

@@ -408,30 +408,16 @@ def test_JobStateUpdateAndJobMonitoringMultiple(lfn: str) -> None:
     try:
         res = jobMonitoringClient.getSites()
         assert res["OK"], res["Message"]
-
         res = jobMonitoringClient.getJobTypes()
         assert res["OK"], res["Message"]
-
         res = jobMonitoringClient.getApplicationStates()
         assert res["OK"], res["Message"]
-        assert "Unknown" in res["Value"]
-
         res = jobMonitoringClient.getOwners()
         assert res["OK"], res["Message"]
         res = jobMonitoringClient.getOwnerGroup()
         assert res["OK"], res["Message"]
         res = jobMonitoringClient.getJobGroups()
         assert res["OK"], res["Message"]
-        resJG_empty = res["Value"]
-        res = jobMonitoringClient.getJobGroups(None, datetime.datetime.utcnow())
-        assert res["OK"], res["Message"]
-        resJG_olderThanNow = res["Value"]
-        assert resJG_empty == resJG_olderThanNow
-        res = jobMonitoringClient.getJobGroups(None, datetime.datetime.utcnow() - datetime.timedelta(days=365))
-        assert res["OK"], res["Message"]
-        resJG_olderThanOneYear = res["Value"]
-        assert set(resJG_olderThanOneYear).issubset(set(resJG_olderThanNow))
-
         res = jobMonitoringClient.getStates()
         assert res["OK"], res["Message"]
         res = jobMonitoringClient.getMinorStates()