feat (FTS3DB): avoid "not in " queries

chaen · chaen · commit 1d8625a9a570 · 2023-03-01T17:23:03.000+01:00
diff --git a/src/DIRAC/DataManagementSystem/Client/FTS3Job.py b/src/DIRAC/DataManagementSystem/Client/FTS3Job.py
@@ -45,6 +45,9 @@ class FTS3Job(JSerializable):
     ]
 
     FINAL_STATES = ["Canceled", "Failed", "Finished", "Finisheddirty"]
+
+    # This field is only used for optimizing sql queries (`in`` instead of `not in`)
+    NON_FINAL_STATES = list(set(ALL_STATES) - set(FINAL_STATES))
     INIT_STATE = "Submitted"
 
     # END states
diff --git a/src/DIRAC/DataManagementSystem/DB/FTS3DB.py b/src/DIRAC/DataManagementSystem/DB/FTS3DB.py
@@ -310,7 +310,7 @@ def getActiveJobs(self, limit=20, lastMonitor=None, jobAssignmentTag="Assigned")
             ftsJobsQuery = (
                 session.query(FTS3Job)
                 .join(FTS3Operation)
-                .filter(~FTS3Job.status.in_(FTS3Job.FINAL_STATES))
+                .filter(FTS3Job.status.in_(FTS3Job.NON_FINAL_STATES))
                 .filter(FTS3Job.assignment.is_(None))
                 .filter(FTS3Operation.assignment.is_(None))
             )
diff --git a/testSQL.py b/testSQL.py

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,9 @@ class FTS3Job(JSerializable):`
`45`	`45`	`]`
`46`	`46`
`47`	`47`	`FINAL_STATES = ["Canceled", "Failed", "Finished", "Finisheddirty"]`
	`48`	`+`
	`49`	+ # This field is only used for optimizing sql queries (`in`` instead of `not in`)
	`50`	`+ NON_FINAL_STATES = list(set(ALL_STATES) - set(FINAL_STATES))`
`48`	`51`	`INIT_STATE = "Submitted"`
`49`	`52`
`50`	`53`	`# END states`
Original file line number	Diff line number	Diff line change
`@@ -310,7 +310,7 @@ def getActiveJobs(self, limit=20, lastMonitor=None, jobAssignmentTag="Assigned")`
`310`	`310`	`ftsJobsQuery = (`
`311`	`311`	`session.query(FTS3Job)`
`312`	`312`	`.join(FTS3Operation)`
`313`		`- .filter(~FTS3Job.status.in_(FTS3Job.FINAL_STATES))`
	`313`	`+ .filter(FTS3Job.status.in_(FTS3Job.NON_FINAL_STATES))`
`314`	`314`	`.filter(FTS3Job.assignment.is_(None))`
`315`	`315`	`.filter(FTS3Operation.assignment.is_(None))`
`316`	`316`	`)`