feat: added foreign keys

Author: fstagni

src/DIRAC/WorkloadManagementSystem/DB/PilotAgentsDB.py

@@ -193,19 +193,13 @@ def deletePilots(self, pilotIDs, conn=False):
         if not isinstance(pilotIDs, list):
             return S_ERROR("Input argument is not a List")
 
-        failed = []
-
         result = self._escapeValues(pilotIDs)
         if not result["OK"]:
             return S_ERROR(f"Failed to remove pilot: {result['Value']}")
         stringIDs = ",".join(result["Value"])
-        for table in ["PilotOutput", "JobToPilotMapping", "PilotAgents"]:
-            result = self._update(f"DELETE FROM {table} WHERE PilotID in ({stringIDs})", conn=conn)
-            if not result["OK"]:
-                failed.append(table)
-
-        if failed:
-            return S_ERROR(f"Failed to remove pilot from {', '.join(failed)} tables")
+        result = self._update(f"DELETE FROM PilotAgents WHERE PilotID in ({stringIDs})", conn=conn)
+        if not result["OK"]:
+            return S_ERROR("Failed to remove pilots: ", result["Message"])
         return S_OK(pilotIDs)
 
     ##########################################################################################

src/DIRAC/WorkloadManagementSystem/DB/PilotAgentsDB.sql

@@ -54,14 +54,15 @@ CREATE TABLE `JobToPilotMapping` (
   `PilotID` INT(11) UNSIGNED NOT NULL,
   `JobID` INT(11) UNSIGNED NOT NULL,
   `StartTime` DATETIME NOT NULL,
-  KEY `JobID` (`JobID`),
-  KEY `PilotID` (`PilotID`)
+  PRIMARY KEY (`PilotID`, `JobID`),
+  FOREIGN KEY (`PilotID`) REFERENCES `PilotAgents`(`PilotID`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 DROP TABLE IF EXISTS `PilotOutput`;
 CREATE TABLE `PilotOutput` (
   `PilotID` INT(11) UNSIGNED NOT NULL,
   `StdOutput` MEDIUMTEXT,
   `StdError` MEDIUMTEXT,
-  PRIMARY KEY (`PilotID`)
+  PRIMARY KEY (`PilotID`),
+  FOREIGN KEY (`PilotID`) REFERENCES `PilotAgents`(`PilotID`) ON DELETE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

src/DIRAC/WorkloadManagementSystem/DB/SandboxMetadataDB.py

@@ -60,10 +60,11 @@ def __initializeDB(self):
             "Fields": {
                 "SBId": "INTEGER(10) UNSIGNED NOT NULL",
                 "EntityId": "VARCHAR(128) NOT NULL",
-                "Type": "VARCHAR(64) NOT NULL",
+                "Type": "ENUM('Input', 'Output') NOT NULL",
             },
             "Indexes": {"Entity": ["EntityId"], "SBIndex": ["SBId"]},
             "UniqueIndexes": {"Mapping": ["SBId", "EntityId", "Type"]},
+            "ForeignKeys": {"SBId": "sb_SandBoxes.SBId"},
         }
 
         for tableName in self.__tablesDesc:
@@ -323,12 +324,8 @@ def deleteSandboxes(self, SBIdList):
         Delete sandboxes
         """
         sqlSBList = ", ".join([str(sbid) for sbid in SBIdList])
-        for table in ("sb_SandBoxes", "sb_EntityMapping"):
-            sqlCmd = f"DELETE FROM `{table}` WHERE SBId IN ( {sqlSBList} )"
-            result = self._update(sqlCmd)
-            if not result["OK"]:
-                return result
-        return S_OK()
+        sqlCmd = f"DELETE FROM sb_SandBoxes WHERE SBId IN ( {sqlSBList} )"
+        return self._update(sqlCmd)
 
     def getSandboxId(self, SEName, SEPFN, requesterName, requesterGroup, field="SBId", requesterDN=None):
         """