Changeset 12914

Timestamp:

08/27/15 10:03:48 (9 years ago)

Author:

ascheibe

Message:

#2388 fixed plugin queries for maintenance page

Location:

trunk/sources

Files:

• HeuristicLab.Services.Hive.DataAccess/3.3/Daos/PluginDao.cs (modified) (1 diff)
• HeuristicLab.Services.WebApp.Maintenance/3.3 (modified) (1 prop)
• HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/PluginController.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/PluginDao.cs

@@ -57 +57 @@
     #region String queries
     private const string DeleteUnusedPluginsStringQuery = @"
-     DELETE FROM [Plugin] WHERE [PluginId] IN (
-     SELECT [PluginId] FROM [Plugin]
-     EXCEPT
-     SELECT DISTINCT [p].[PluginId] FROM [Plugin] p, [RequiredPlugins] rp
-     WHERE [p].[PluginId] = [rp].[PluginId])";
+     DELETE FROM [Plugin] WHERE PluginId IN (
+     SELECT p.[PluginId] FROM [Plugin] p
+     LEFT JOIN [RequiredPlugins] rp
+     ON rp.PluginId = p.PluginId
+     WHERE rp.PluginId IS NULL)";
     #endregion
   }

trunk/sources/HeuristicLab.Services.WebApp.Maintenance/3.3/WebApi/PluginController.cs

@@ -39 +39 @@
       var taskDao = pm.TaskDao;
       return pm.UseTransaction(() => {
-        var taskIds = taskDao.GetAll().Select(x => x.TaskId);
-        var usedPluginIds = requiredPluginDao.GetAll()
-          .Where(x => taskIds.Contains(x.TaskId))
+        var usedPluginIds = requiredPluginDao.GetAll()        
           .Select(x => x.PluginId)
-          .Distinct();
-        var query = pluginDao.GetAll().Where(x => !usedPluginIds.Any(y => y == x.PluginId));
+          .Distinct().ToArray();
+        var tmpQuery = pluginDao.GetAll().Select(x=>x.PluginId).ToArray().Where(x => !usedPluginIds.Any(y => y == x)).ToArray();
+        var query = pluginDao.GetAll().Where(x => tmpQuery.Contains(x.PluginId)).ToArray();
         return new DT.PluginPage {
           TotalPlugins = query.Count(),