Changeset 5325

Timestamp:

01/18/11 15:51:14 (14 years ago)

Author:

ascheibe

Message:

#1233

• allow different versions of the same plugin in PluginCache
• fixes for the SlaveTests

Location:

branches/HeuristicLab.Hive-3.4/sources

Files:

• HeuristicLab.Clients.Hive.Slave.Tests/SlaveTest.cs (modified) (6 diffs)
• HeuristicLab.Clients.Hive.Slave/3.4/PluginCache.cs (modified) (8 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Tests/SlaveTest.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.ServiceModel;
 using HeuristicLab.Clients.Common;
 using HeuristicLab.Services.Hive.Common;
@@ -33 +32 @@
   [TestClass]
   public class SlaveTest {
-
-    private static ServiceHost slaveComm;
     private static SlaveCommListener listener;
 
@@ -42 +39 @@
       PluginLoader.pluginAssemblies.Any();
       ServiceLocator.Instance = new MockServiceLocator();
-      slaveComm = new ServiceHost(typeof(SlaveCommunicationService));
-      slaveComm.Open();
-      listener = new SlaveCommListener();
-      listener.Open();
+      /* listener = new SlaveCommListener();
+       listener.Open();*/
     }
 
     [ClassCleanup]
     public static void MyClassCleanup() {
-      listener.Close();
-      slaveComm.Close();
+      //listener.Close();
     }
 
@@ -97 +91 @@
         Assert.AreEqual<int>(1, ms.ResultJobs.Count);
         Assert.AreEqual<Guid>(testJob.Id, ms.ResultJobs[0].Id);
+        core.Shutdown();
       }
     }
@@ -131 +126 @@
         HeuristicLab.Clients.Hive.Slave.Core core = new Slave.Core();
         core.Start();
-
       }
     }
@@ -195 +189 @@
         core.Start();
         Assert.AreEqual<int>(2, ms.ResultJobs.Count);
-
+        core.Shutdown();
       }
     }
-
-
-
-
-
-
-
-
-
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/PluginCache.cs

@@ -27 +27 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
-using HeuristicLab.Clients.Hive.Slave;
-using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.PluginInfrastructure.Manager;
 using HeuristicLab.Services.Hive.Common.DataTransfer;
 
@@ -42 +39 @@
     public string PluginTempBaseDir { get; set; }
 
-    private List<PluginDescription> cachedPlugins = new List<PluginDescription>();
-
-    private PluginManager pm;
+    private List<Guid> cachedPluginsGuids = new List<Guid>();
 
     public static PluginCache Instance {
@@ -64 +59 @@
       PluginTempBaseDir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "PluginTemp");
 
-      this.pm = new PluginManager(PluginCacheDir);
       DoUpdateRun();
+    }
+
+    private string getFilenameFromPath(string path) {
+      string[] dirParts = path.Split(Path.DirectorySeparatorChar);
+      if (dirParts.Length > 0) {
+        string fileGuid = dirParts[dirParts.Length - 1];
+        return fileGuid;
+      } else
+        return "";
     }
 
@@ -72 +75 @@
         Directory.CreateDirectory(PluginCacheDir);
       }
-      pm.DiscoverAndCheckPlugins();
-      cachedPlugins = new List<PluginDescription>(pm.Plugins);
+
+      foreach (string dir in Directory.EnumerateDirectories(PluginCacheDir)) {
+        cachedPluginsGuids.Add(Guid.Parse(getFilenameFromPath(dir)));
+      }
     }
 
@@ -84 +89 @@
           Directory.Delete(targetDir, true);
         }
-
-        DirectoryInfo di = Directory.CreateDirectory(targetDir);
+        Directory.CreateDirectory(targetDir);
+
 
         foreach (Plugin requestedPlugin in requests) {
-          PluginDescription pd = cachedPlugins.Where(cp =>
-            cp.Name == requestedPlugin.Name &&
-            cp.Version.Major == requestedPlugin.Version.Major &&
-            cp.Version.Minor == requestedPlugin.Version.Minor).SingleOrDefault();
-          if (pd != null) {
-            foreach (IPluginFile ipf in pd.Files) {
-              File.Copy(ipf.Name, Path.Combine(targetDir, Path.GetFileName(ipf.Name)));
+          string curPath = Path.Combine(PluginCacheDir, requestedPlugin.Id.ToString());
+          if (Directory.Exists(curPath)) {
+            foreach (string file in Directory.GetFiles(curPath)) {
+              string fn = getFilenameFromPath(file);
+              File.Copy(file, Path.Combine(targetDir, fn));
             }
           }
@@ -142 +145 @@
 
         foreach (Plugin info in requiredPlugins) {
-          //we MAY run in problems here - if there is a plugin twice in requests, there may be added two different versions of the plugin
-          foreach (PluginDescription cachedPlugin in cachedPlugins) {
-            if (info.Name == cachedPlugin.Name && info.Version == cachedPlugin.Version) {
-              localPlugins.Add(new Plugin() { Id = new Guid(), Name = info.Name, Version = info.Version });
+          foreach (Guid cachedPlugin in cachedPluginsGuids) {
+            if (info.Id == cachedPlugin) {
+              localPlugins.Add(new Plugin() { Id = cachedPlugin, Name = info.Name, Version = info.Version });
               found = true;
 
@@ -165 +167 @@
 
         foreach (PluginData updateablePlugin in updateablePlugins) {
-          Plugin pluginDescription = pluginDescriptions.Where(desc => desc.Id == updateablePlugin.PluginId).SingleOrDefault();
-          if (pluginDescription != null) {
-
-            PluginDescription pd = cachedPlugins.Where(cachedPlugin =>
-                cachedPlugin.Name == pluginDescription.Name &&
-                cachedPlugin.Version.Major == pluginDescription.Version.Major &&
-                cachedPlugin.Version.Minor == pluginDescription.Version.Major).SingleOrDefault();
-
-            if (pd != null) {
-              foreach (IPluginFile ipf in pd.Files) {
-                SlaveClientCom.Instance.ClientCom.LogMessage(string.Format("deleting {0}", Path.GetFileName(ipf.Name)));
-                File.Delete(ipf.Name);
-              }
-            }
-            File.WriteAllBytes(Path.Combine(PluginCacheDir, Path.GetFileName(updateablePlugin.FileName)), updateablePlugin.Data);
-          }
-          //TODO: error handling on pluginDescription, should be found
+          string pluginDir = Path.Combine(PluginCacheDir, updateablePlugin.PluginId.ToString());
+
+          //put all files belonging to a plugin in the same directory
+          if (!Directory.Exists(pluginDir)) {
+            DirectoryInfo di = Directory.CreateDirectory(pluginDir);
+          }
+          File.WriteAllBytes(Path.Combine(pluginDir, Path.GetFileName(updateablePlugin.FileName)), updateablePlugin.Data);
         }
 
@@ -212 +204 @@
       }
     }
-
-
   }
 }