Free cookie consent management tool by TermsFeed Policy Generator

Changeset 4615


Ignore:
Timestamp:
10/19/10 11:36:50 (14 years ago)
Author:
cneumuel
Message:

renamed folder, implemented heartbeat logic (#1233)

Location:
branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New
Files:
4 added
1 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Hive.sln

    r4593 r4615  
    33# Visual Studio 2010
    44Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Hive-3.3", "HeuristicLab.Hive\3.3\HeuristicLab.Hive-3.3.csproj", "{F98A1740-9AC9-4D36-A582-6A2D0D06978D}"
     5  ProjectSection(ProjectDependencies) = postProject
     6    {E1D6C801-892A-406A-B606-F158E36DD3C3} = {E1D6C801-892A-406A-B606-F158E36DD3C3}
     7    {EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC} = {EC2C8109-6E1E-4C88-9A2B-908CFF2EF4AC}
     8    {14424A16-48D4-445E-80BF-DDF617548BBB} = {14424A16-48D4-445E-80BF-DDF617548BBB}
     9    {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE} = {CF9DA321-AC1B-4FD3-9EC3-67BC6B861BDE}
     10    {989FE92B-484E-41EE-87E2-6A24AF0381D8} = {989FE92B-484E-41EE-87E2-6A24AF0381D8}
     11    {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8} = {8C0D9F39-397F-4DBE-856F-BC4DC0FE23F8}
     12    {B5EF1E5A-9F3D-40B9-B4B0-30AADF2E2CEB} = {B5EF1E5A-9F3D-40B9-B4B0-30AADF2E2CEB}
     13  EndProjectSection
    514EndProject
    615Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Slave-3.3", "HeuristicLab.Clients.Hive.Slave\3.3\HeuristicLab.Clients.Hive.Slave-3.3.csproj", "{989FE92B-484E-41EE-87E2-6A24AF0381D8}"
    … …  
    1423Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EE1E22D1-0141-4C16-ADC6-333120BD21DE}"
    1524  ProjectSection(SolutionItems) = preProject
     25    ConfigMerger.exe = ConfigMerger.exe
    1626    CopyAssembly.cmd = CopyAssembly.cmd
     27    HeuristicLab 3.3.exe.config = HeuristicLab 3.3.exe.config
     28    HeuristicLab.Hive-3.3.dll.config = HeuristicLab.Hive-3.3.dll.config
     29    MergeConfigs.cmd = MergeConfigs.cmd
    1730  EndProjectSection
    1831EndProject

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Hive/3.3/HeuristicLab.Hive-3.3.csproj

    r4593 r4615  
    6161    <PostBuildEvent>set ProjectName=$(ProjectName)
    6262set TargetPath=$(TargetPath)
     63set SolutionDir=$(SolutionDir)
     64call $(SolutionDir)/MergeConfigs.cmd
    6365call $(SolutionDir)/CopyAssembly.cmd</PostBuildEvent>
    6466  </PropertyGroup>

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/Job.cs

    r4598 r4615  
    3434    public Guid UserId { get; set; }
    3535    [DataMember]
    36     public Guid SlaveId { get; set; }
    37     [DataMember]
    3836    public int Priority { get; set; }
    3937    [DataMember]

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/DataTransfer/JobState.cs

    r4598 r4615  
    4444
    4545    /// <summary>
    46     /// A snapshot has been requested. The calculating slave is responsible for pausing the Job and sending the snapshot to the server. After that state will be SnapshotSent
    47     /// </summary>
    48     SnapshotRequested,
    49 
    50     /// <summary>
    51     /// Snapshot has been sent to the server and its calculating again (should'nt it be back to Calculating again?)
    52     /// </summary>
    53     SnapshotSent,
    54 
    55     /// <summary>
    56     /// ???
    57     /// </summary>
    58     Pending,
    59 
    60     /// <summary>
    6146    /// Job as been aborted due to an error. Results are ready to be collected
    6247    /// </summary>
    … …  
    6853    WaitForChildJobs
    6954  };
     55
     56  public static class JobStateExtensions {
     57    /// <summary>
     58    /// This job is not yet done
     59    /// </summary>
     60    public static bool IsActive(this JobState jobState) {
     61      return !jobState.IsDone();
     62    }
     63
     64    /// <summary>
     65    /// This job is Waiting
     66    /// </summary>
     67    public static bool IsWaiting(this JobState jobState) {
     68      return jobState == JobState.Waiting ||
     69        jobState == JobState.WaitForChildJobs;
     70    }
     71
     72    /// <summary>
     73    /// This job is Finished || Failed || Aborted
     74    /// </summary>
     75    public static bool IsDone(this JobState jobState) {
     76      return jobState == JobState.Finished ||
     77        jobState == JobState.Aborted ||
     78        jobState == JobState.Failed;
     79    }
     80  }
    7081}

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/MessageContainer.cs

    r4593 r4615  
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2525
    26 namespace HeuristicLab.Hive.Contracts {
     26namespace HeuristicLab.Services.Hive.Common {
    2727  /// <summary>
    2828  /// The MessageContainer is a container class for Messages. Its two parts are:
    … …  
    3434
    3535    public enum MessageType {
    36       FetchJob, AbortJob, JobAborted, RequestSnapshot, FinishedJob, NoMessage, SnapshotReady, Shutdown, JobFailed, UptimeLimitDisconnect,
    37       FetchOrForceFetchCalendar, AddChildJob,
     36      FetchJob,
     37      AbortJob,
     38      JobAborted,
     39      FinishedJob,
     40      NoMessage,
     41      SnapshotReady,
     42      Shutdown,
     43      JobFailed,
     44      UptimeLimitDisconnect,
     45      FetchOrForceFetchCalendar,
     46      AddChildJob,
    3847      PauseJob,
    3948      GetChildJobs,
    40       DeleteChildJobs
     49      DeleteChildJobs,
     50
     51      /// <summary>
     52      /// Slave should add itself
     53      /// </summary>
     54      AddSlaveInfo
    4155    };
    4256

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.Common/3.3/ServiceContracts/IHiveService.cs

    r4598 r4615  
    66using System.IO;
    77using HeuristicLab.Services.Hive.Common.DataTransfer;
    8 using HeuristicLab.Hive.Contracts;
    98
    109namespace HeuristicLab.Services.Hive.Common.ServiceContracts {
    … …  
    127126    #region Heartbeat Methods
    128127    [OperationContract]
    129     List<MessageContainer> ProcessHeartBeat(HeartBeat hbData);
     128    List<MessageContainer> ProcessHeartBeat(HeartBeat heartbeat);
    130129    #endregion
    131130

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/HeuristicLab.Services.Hive.DataAccess-3.3.csproj

    r4598 r4615  
    8080  </ItemGroup>
    8181  <ItemGroup>
    82     <None Include="app.config" />
     82    <None Include="app.config">
     83      <SubType>Designer</SubType>
     84    </None>
    8385    <None Include="HiveDataContext.dbml">
    8486      <Generator>MSLinqToSQLGenerator</Generator>

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDao.cs

    r4598 r4615  
    77namespace HeuristicLab.Services.Hive.DataAccess {
    88  using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
     9  using HeuristicLab.Services.Hive.Common.DataTransfer;
    910
    1011  public class HiveDao : IHiveDao {
    … …  
    4344      if (entity != null) db.Jobs.DeleteOnSubmit(entity);
    4445      db.SubmitChanges();
     46    }
     47
     48    public IEnumerable<DT.Job> GetAvailableParentJobs(Guid slaveId) {
     49      // todo: slaveId is unused!
     50      var query = from ar in db.AssignedResources
     51                  where ar.Job.JobState == JobState.WaitForChildJobs &&
     52                    (from child in db.Jobs
     53                     where child.ParentJobId == ar.Job.JobId
     54                     select child.JobState == JobState.Finished).All(x => x) &&
     55                    (from child in db.Jobs // avoid returning WaitForChildJobs jobs where no child-jobs exist (yet)
     56                     where child.ParentJobId == ar.Job.JobId
     57                     select child).Count() > 0
     58                  orderby ar.Job.Priority descending
     59                  select Convert.ToDto(ar.Job);
     60      return query.ToArray();
    4561    }
    4662    #endregion

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml

    r4598 r4615  
    4141      <Column Name="Version" Type="System.String" DbType="VarChar(MAX)" CanBeNull="false" />
    4242      <Column Name="BuildDate" Type="System.String" DbType="VarChar(20)" CanBeNull="false" />
    43       <Association Name="PluginInfo_RequiredPlugin" Member="RequiredPlugins" ThisKey="PluginId" OtherKey="PluginId" Type="RequiredPlugin" />
     43      <Association Name="Plugin_RequiredPlugin" Member="RequiredPlugins" ThisKey="PluginId" OtherKey="PluginId" Type="RequiredPlugin" />
    4444      <Association Name="Plugin_PluginData" Member="PluginData" ThisKey="PluginId" OtherKey="PluginId" Type="PluginData" Cardinality="One" />
    4545    </Type>
    … …  
    5757      <Column Name="JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
    5858      <Column Name="PluginId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
    59       <Association Name="PluginInfo_RequiredPlugin" Member="Plugin" Storage="_PluginInfo" ThisKey="PluginId" OtherKey="PluginId" Type="Plugin" IsForeignKey="true" DeleteRule="CASCADE" />
     59      <Association Name="Plugin_RequiredPlugin" Member="Plugin" Storage="_PluginInfo" ThisKey="PluginId" OtherKey="PluginId" Type="Plugin" IsForeignKey="true" DeleteRule="CASCADE" />
    6060      <Association Name="Job_RequiredPlugin" Member="Job" ThisKey="JobId" OtherKey="JobId" Type="Job" IsForeignKey="true" />
    6161    </Type>
    … …  
    8282        <Column Name="IsAllowedToCalculate" Type="System.Boolean" DbType="Bit" CanBeNull="false" />
    8383        <Association Name="Slave_UptimeStatistic" Member="UptimeStatistics" ThisKey="ResourceId" OtherKey="ResourceId" Type="UptimeStatistic" />
    84         <Association Name="Slave_Job" Member="Jobs" ThisKey="ResourceId" OtherKey="ResourceId" Type="Job" />
     84        <Association Name="Slave_Job" Member="Jobs" ThisKey="ResourceId" OtherKey="SlaveId" Type="Job" />
    8585        <Association Name="SlaveConfig_Slave" Member="SlaveConfig" ThisKey="SlaveConfigId" OtherKey="SlaveConfigId" Type="SlaveConfig" IsForeignKey="true" DeleteRule="SET NULL" />
    8686      </Type>
    … …  
    9494      <Column Name="JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
    9595      <Column Name="ParentJobId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
    96       <Column Name="JobState" Type="System.String" DbType="VarChar(MAX)" CanBeNull="false" />
    97       <Column Name="ResourceId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
     96      <Column Name="JobState" Type="global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState" DbType="VarChar(15)" CanBeNull="false" />
     97      <Column Name="ResourceId" Member="SlaveId" Storage="_ResourceId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" />
    9898      <Column Name="ExecutionTime" Type="System.TimeSpan" DbType="Time" CanBeNull="true" />
    9999      <Column Name="Exception" Type="System.String" DbType="VarChar(MAX)" CanBeNull="true" />
    … …  
    112112      <Association Name="Job_Job" Member="Job1" ThisKey="ParentJobId" OtherKey="JobId" Type="Job" IsForeignKey="true" />
    113113      <Association Name="Project_Job" Member="Project" ThisKey="ProjectId" OtherKey="ProjectId" Type="Project" IsForeignKey="true" DeleteRule="SET NULL" />
    114       <Association Name="Slave_Job" Member="Slave" ThisKey="ResourceId" OtherKey="ResourceId" Type="Slave" IsForeignKey="true" DeleteRule="SET NULL" />
     114      <Association Name="Slave_Job" Member="Slave" ThisKey="SlaveId" OtherKey="ResourceId" Type="Slave" IsForeignKey="true" DeleteRule="SET NULL" />
    115115    </Type>
    116116  </Table>
    … …  
    141141    <Type Name="JobData">
    142142      <Column Name="JobId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
    143       <Column Member="Data" Type="System.Data.Linq.Binary" DbType="VarBinary(MAX)" CanBeNull="false" UpdateCheck="Never" />
     143      <Column Name="Data" Type="System.Data.Linq.Binary" DbType="VarBinary(MAX)" CanBeNull="false" UpdateCheck="Never" />
    144144      <Association Name="Job_JobData" Member="Job" ThisKey="JobId" OtherKey="JobId" Type="Job" IsForeignKey="true" />
    145145    </Type>
    … …  
    147147  <Table Name="" Member="PluginDatas">
    148148    <Type Name="PluginData">
    149       <Column Member="PluginId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
     149      <Column Name="PluginId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" />
    150150      <Column Name="Data" Type="System.Data.Linq.Binary" DbType="VarBinary(MAX) NOT NULL" CanBeNull="false" UpdateCheck="Never" />
    151151      <Association Name="Plugin_PluginData" Member="Plugin" ThisKey="PluginId" OtherKey="PluginId" Type="Plugin" IsForeignKey="true" />

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml.layout

    r4598 r4615  
    7575      </nestedChildShapes>
    7676    </classShape>
    77     <classShape Id="bbd91675-92f2-4a69-8429-0950008fc8a4" absoluteBounds="14, 0.75, 2, 0.80938964843749961">
     77    <classShape Id="bbd91675-92f2-4a69-8429-0950008fc8a4" absoluteBounds="14, 0.75, 2, 0.8093896484375">
    7878      <DataClassMoniker Name="/HiveDataContext/SlaveGroup" />
    7979      <nestedChildShapes>
    … …  
    8181      </nestedChildShapes>
    8282    </classShape>
    83     <inheritanceConnector edgePoints="[(11.75 : 1.44314697265625); (11.375 : 1.44314697265625)]" fixedFrom="Algorithm" fixedTo="Algorithm" TargetRelationshipDomainClassId="7a7fe09e-e9ef-4b01-9ff3-bde95e827b62">
     83    <inheritanceConnector edgePoints="[(11.75 : 1.44314697265625); (11.375 : 1.44314697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="7a7fe09e-e9ef-4b01-9ff3-bde95e827b62">
    8484      <nodes>
    8585        <classShapeMoniker Id="706a4581-6daf-4e71-ae2a-87d50b27a051" />
    … …  
    8787      </nodes>
    8888    </inheritanceConnector>
    89     <inheritanceConnector edgePoints="[(13.75 : 1.15469482421875); (14 : 1.15469482421875)]" fixedFrom="Algorithm" fixedTo="Algorithm" TargetRelationshipDomainClassId="7a7fe09e-e9ef-4b01-9ff3-bde95e827b62">
     89    <inheritanceConnector edgePoints="[(13.75 : 1.15469482421875); (14 : 1.15469482421875)]" fixedFrom="NotFixed" fixedTo="NotFixed" TargetRelationshipDomainClassId="7a7fe09e-e9ef-4b01-9ff3-bde95e827b62">
    9090      <nodes>
    9191        <classShapeMoniker Id="706a4581-6daf-4e71-ae2a-87d50b27a051" />
    … …  
    9393      </nodes>
    9494    </inheritanceConnector>
    95     <associationConnector edgePoints="[(13.25 : 2.1362939453125); (13.25 : 2.875)]" fixedFrom="Algorithm" fixedTo="Algorithm">
     95    <associationConnector edgePoints="[(13.25 : 2.1362939453125); (13.25 : 2.875)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    9696      <AssociationMoniker Name="/HiveDataContext/Resource/Resource_AssignedResource" />
    9797      <nodes>
    … …  
    100100      </nodes>
    101101    </associationConnector>
    102     <associationConnector edgePoints="[(11.25 : 7.20274983723958); (14.34375 : 7.20274983723958); (14.34375 : 4.2612939453125)]" fixedFrom="Algorithm" fixedTo="Algorithm">
     102    <associationConnector edgePoints="[(11.25 : 7.20274983723958); (14.34375 : 7.20274983723958); (14.34375 : 4.2612939453125)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    103103      <AssociationMoniker Name="/HiveDataContext/Job/Job_AssignedResource" />
    104104      <nodes>
    … …  
    107107      </nodes>
    108108    </associationConnector>
    109     <associationConnector edgePoints="[(9.375 : 2.93674967447917); (6.5 : 2.93674967447917)]" fixedFrom="Algorithm" fixedTo="Algorithm">
     109    <associationConnector edgePoints="[(9.375 : 2.93674967447917); (6.5 : 2.93674967447917)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    110110      <AssociationMoniker Name="/HiveDataContext/Slave/Slave_UptimeStatistic" />
    111111      <nodes>
    … …  
    114114      </nodes>
    115115    </associationConnector>
    116     <associationConnector edgePoints="[(15.6910576194798 : 1.5593896484375); (15.6910576194798 : 2.875)]" fixedFrom="Algorithm" fixedTo="Caller">
     116    <associationConnector edgePoints="[(15.6910576194798 : 1.5593896484375); (15.6910576194798 : 2.875)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    117117      <AssociationMoniker Name="/HiveDataContext/SlaveGroup/SlaveGroup_SlaveGroup_Resource" />
    118118      <nodes>
    … …  
    121121      </nodes>
    122122    </associationConnector>
    123     <associationConnector edgePoints="[(13.75 : 2.1362939453125); (14.125 : 2.5112939453125); (15.3497974555544 : 2.5112939453125); (15.3497974555544 : 2.875)]" fixedFrom="NotFixed" fixedTo="Caller">
     123    <associationConnector edgePoints="[(13.75 : 2.1362939453125); (14.125 : 2.5112939453125); (15.3497974555544 : 2.5112939453125); (15.3497974555544 : 2.875)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    124124      <AssociationMoniker Name="/HiveDataContext/Resource/Resource_SlaveGroup_Resource" />
    125125      <nodes>
    … …  
    128128      </nodes>
    129129    </associationConnector>
    130     <associationConnector edgePoints="[(10.125 : 10.625); (10.125 : 10.2612939453125)]" fixedFrom="Algorithm" fixedTo="Algorithm">
    131       <AssociationMoniker Name="/HiveDataContext/Plugin/PluginInfo_RequiredPlugin" />
     130    <associationConnector edgePoints="[(10.25 : 7.87660970052083); (10.25 : 8.875)]" fixedFrom="NotFixed" fixedTo="NotFixed">
     131      <AssociationMoniker Name="/HiveDataContext/Job/Job_RequiredPlugin" />
     132      <nodes>
     133        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
     134        <classShapeMoniker Id="97b00810-fa30-457e-b484-b4e80b22f91b" />
     135      </nodes>
     136    </associationConnector>
     137    <associationConnector edgePoints="[(9 : 1.44314697265625); (9.375 : 1.44314697265625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
     138      <AssociationMoniker Name="/HiveDataContext/SlaveConfig/SlaveConfig_Slave" />
     139      <nodes>
     140        <classShapeMoniker Id="5d9c7dad-8113-49c9-bdfa-c64543554a7b" />
     141        <classShapeMoniker Id="26f4edfa-91dd-4941-a058-359f89e567a8" />
     142      </nodes>
     143    </associationConnector>
     144    <associationConnector edgePoints="[(11.0834359271285 : 7.87660970052083); (11.0834359271285 : 7.95910970052083); (11.1656121961154 : 7.95910970052083); (11.1656121961154 : 8.12660970052083); (10.5546153846154 : 8.12660970052083); (10.5546153846154 : 7.87660970052083)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed">
     145      <AssociationMoniker Name="/HiveDataContext/Job/Job_Job" />
     146      <nodes>
     147        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
     148        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
     149      </nodes>
     150    </associationConnector>
     151    <associationConnector edgePoints="[(7 : 8.25); (7.875 : 8.125); (7.875 : 8.05644744428109); (8.875 : 8.05644744428109); (8.875 : 8.25160970052083); (9.25 : 7.87660970052083)]" manuallyRouted="true" fixedFrom="NotFixed" fixedTo="NotFixed">
     152      <AssociationMoniker Name="/HiveDataContext/Project/Project_Job" />
     153      <nodes>
     154        <classShapeMoniker Id="85f04409-b6e0-4e2f-a140-7191436a806f" />
     155        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
     156      </nodes>
     157    </associationConnector>
     158    <associationConnector edgePoints="[(10.3125 : 3.67470540364583); (10.3125 : 4.375)]" fixedFrom="NotFixed" fixedTo="NotFixed">
     159      <AssociationMoniker Name="/HiveDataContext/Slave/Slave_Job" />
     160      <nodes>
     161        <classShapeMoniker Id="26f4edfa-91dd-4941-a058-359f89e567a8" />
     162        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
     163      </nodes>
     164    </associationConnector>
     165    <associationConnector edgePoints="[(12.21875 : 2.1362939453125); (12.21875 : 4.625)]" fixedFrom="NotFixed" fixedTo="NotFixed">
     166      <AssociationMoniker Name="/HiveDataContext/Resource/Resource_UptimeCalendar" />
     167      <nodes>
     168        <classShapeMoniker Id="706a4581-6daf-4e71-ae2a-87d50b27a051" />
     169        <classShapeMoniker Id="8d5712f7-7a1a-4a89-bd4d-fd60200d3306" />
     170      </nodes>
     171    </associationConnector>
     172    <associationConnector edgePoints="[(9.25 : 6.71875); (6.875 : 6.71875)]" fixedFrom="NotFixed" fixedTo="NotFixed">
     173      <AssociationMoniker Name="/HiveDataContext/Job/Job_HiveExperiment" />
     174      <nodes>
     175        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
     176        <classShapeMoniker Id="e6f840cc-2968-4be1-b234-eef624ccacbb" />
     177      </nodes>
     178    </associationConnector>
     179    <classShape Id="6bc13f26-f9a8-4597-b054-35be34190d12" absoluteBounds="6.875, 4.375, 2, 1.1939925130208327">
     180      <DataClassMoniker Name="/HiveDataContext/JobData" />
     181      <nestedChildShapes>
     182        <elementListCompartment Id="a068522c-7974-4679-b356-e33c941c465b" absoluteBounds="6.89, 4.835, 1.9700000000000002, 0.63399251302083326" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
     183      </nestedChildShapes>
     184    </classShape>
     185    <classShape Id="ad25bd0f-80e8-4a06-abd8-190eb678eec7" absoluteBounds="11.5, 10.625, 2, 1.1939925130208344">
     186      <DataClassMoniker Name="/HiveDataContext/PluginData" />
     187      <nestedChildShapes>
     188        <elementListCompartment Id="acddb513-7de6-4bb4-8335-d6982fb2ef35" absoluteBounds="11.515, 11.085, 1.9700000000000002, 0.63399251302083326" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
     189      </nestedChildShapes>
     190    </classShape>
     191    <associationConnector edgePoints="[(11 : 11.2219962565104); (11.5 : 11.2219962565104)]" fixedFrom="NotFixed" fixedTo="NotFixed">
     192      <AssociationMoniker Name="/HiveDataContext/Plugin/Plugin_PluginData" />
     193      <nodes>
     194        <classShapeMoniker Id="7d998e56-4fba-41ca-a1a8-1dcdb9068edf" />
     195        <classShapeMoniker Id="ad25bd0f-80e8-4a06-abd8-190eb678eec7" />
     196      </nodes>
     197    </associationConnector>
     198    <associationConnector edgePoints="[(9.25 : 4.97199625651042); (8.875 : 4.97199625651042)]" fixedFrom="NotFixed" fixedTo="NotFixed">
     199      <AssociationMoniker Name="/HiveDataContext/Job/Job_JobData" />
     200      <nodes>
     201        <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
     202        <classShapeMoniker Id="6bc13f26-f9a8-4597-b054-35be34190d12" />
     203      </nodes>
     204    </associationConnector>
     205    <associationConnector edgePoints="[(10.125 : 10.625); (10.125 : 10.2612939453125)]" fixedFrom="NotFixed" fixedTo="NotFixed">
     206      <AssociationMoniker Name="/HiveDataContext/Plugin/Plugin_RequiredPlugin" />
    132207      <nodes>
    133208        <classShapeMoniker Id="7d998e56-4fba-41ca-a1a8-1dcdb9068edf" />
    … …  
    135210      </nodes>
    136211    </associationConnector>
    137     <associationConnector edgePoints="[(10.25 : 7.87660970052083); (10.25 : 8.875)]" fixedFrom="Algorithm" fixedTo="Algorithm">
    138       <AssociationMoniker Name="/HiveDataContext/Job/Job_RequiredPlugin" />
    139       <nodes>
    140         <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
    141         <classShapeMoniker Id="97b00810-fa30-457e-b484-b4e80b22f91b" />
    142       </nodes>
    143     </associationConnector>
    144     <associationConnector edgePoints="[(9 : 1.44314697265625); (9.375 : 1.44314697265625)]" fixedFrom="Algorithm" fixedTo="Algorithm">
    145       <AssociationMoniker Name="/HiveDataContext/SlaveConfig/SlaveConfig_Slave" />
    146       <nodes>
    147         <classShapeMoniker Id="5d9c7dad-8113-49c9-bdfa-c64543554a7b" />
    148         <classShapeMoniker Id="26f4edfa-91dd-4941-a058-359f89e567a8" />
    149       </nodes>
    150     </associationConnector>
    151     <associationConnector edgePoints="[(11.0834359271285 : 7.87660970052083); (11.0834359271285 : 7.95910970052083); (11.1656121961154 : 7.95910970052083); (11.1656121961154 : 8.12660970052083); (10.5546153846154 : 8.12660970052083); (10.5546153846154 : 7.87660970052083)]" manuallyRouted="true" fixedFrom="Caller" fixedTo="Algorithm">
    152       <AssociationMoniker Name="/HiveDataContext/Job/Job_Job" />
    153       <nodes>
    154         <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
    155         <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
    156       </nodes>
    157     </associationConnector>
    158     <associationConnector edgePoints="[(7 : 8.25); (7.875 : 8.125); (7.875 : 8.05644744428109); (8.875 : 8.05644744428109); (8.875 : 8.25160970052083); (9.25 : 7.87660970052083)]" manuallyRouted="true" fixedFrom="Algorithm" fixedTo="Algorithm">
    159       <AssociationMoniker Name="/HiveDataContext/Project/Project_Job" />
    160       <nodes>
    161         <classShapeMoniker Id="85f04409-b6e0-4e2f-a140-7191436a806f" />
    162         <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
    163       </nodes>
    164     </associationConnector>
    165     <associationConnector edgePoints="[(10.3125 : 3.67470540364583); (10.3125 : 4.375)]" fixedFrom="Algorithm" fixedTo="Algorithm">
    166       <AssociationMoniker Name="/HiveDataContext/Slave/Slave_Job" />
    167       <nodes>
    168         <classShapeMoniker Id="26f4edfa-91dd-4941-a058-359f89e567a8" />
    169         <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
    170       </nodes>
    171     </associationConnector>
    172     <associationConnector edgePoints="[(12.21875 : 2.1362939453125); (12.21875 : 4.625)]" fixedFrom="Algorithm" fixedTo="Algorithm">
    173       <AssociationMoniker Name="/HiveDataContext/Resource/Resource_UptimeCalendar" />
    174       <nodes>
    175         <classShapeMoniker Id="706a4581-6daf-4e71-ae2a-87d50b27a051" />
    176         <classShapeMoniker Id="8d5712f7-7a1a-4a89-bd4d-fd60200d3306" />
    177       </nodes>
    178     </associationConnector>
    179     <associationConnector edgePoints="[(9.25 : 6.71875); (6.875 : 6.71875)]" fixedFrom="Algorithm" fixedTo="Algorithm">
    180       <AssociationMoniker Name="/HiveDataContext/Job/Job_HiveExperiment" />
    181       <nodes>
    182         <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
    183         <classShapeMoniker Id="e6f840cc-2968-4be1-b234-eef624ccacbb" />
    184       </nodes>
    185     </associationConnector>
    186     <classShape Id="6bc13f26-f9a8-4597-b054-35be34190d12" absoluteBounds="6.875, 4.375, 2, 1.1939925130208327">
    187       <DataClassMoniker Name="/HiveDataContext/JobData" />
    188       <nestedChildShapes>
    189         <elementListCompartment Id="a068522c-7974-4679-b356-e33c941c465b" absoluteBounds="6.89, 4.835, 1.9700000000000002, 0.63399251302083326" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
    190       </nestedChildShapes>
    191     </classShape>
    192     <classShape Id="ad25bd0f-80e8-4a06-abd8-190eb678eec7" absoluteBounds="11.5, 10.625, 2, 1.1939925130208344">
    193       <DataClassMoniker Name="/HiveDataContext/PluginData" />
    194       <nestedChildShapes>
    195         <elementListCompartment Id="acddb513-7de6-4bb4-8335-d6982fb2ef35" absoluteBounds="11.515, 11.085, 1.9700000000000002, 0.63399251302083326" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
    196       </nestedChildShapes>
    197     </classShape>
    198     <associationConnector edgePoints="[(11 : 11.2219962565104); (11.5 : 11.2219962565104)]" fixedFrom="Algorithm" fixedTo="Algorithm">
    199       <AssociationMoniker Name="/HiveDataContext/Plugin/Plugin_PluginData" />
    200       <nodes>
    201         <classShapeMoniker Id="7d998e56-4fba-41ca-a1a8-1dcdb9068edf" />
    202         <classShapeMoniker Id="ad25bd0f-80e8-4a06-abd8-190eb678eec7" />
    203       </nodes>
    204     </associationConnector>
    205     <associationConnector edgePoints="[(9.25 : 4.97199625651042); (8.875 : 4.97199625651042)]" fixedFrom="Algorithm" fixedTo="Algorithm">
    206       <AssociationMoniker Name="/HiveDataContext/Job/Job_JobData" />
    207       <nodes>
    208         <classShapeMoniker Id="695bfc39-59f3-4e60-8644-f847964bf62c" />
    209         <classShapeMoniker Id="6bc13f26-f9a8-4597-b054-35be34190d12" />
    210       </nodes>
    211     </associationConnector>
    212212  </nestedChildShapes>
    213213</ordesignerObjectsDiagram>

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs

    r4598 r4615  
    10111011    }
    10121012   
    1013     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="PluginInfo_RequiredPlugin", Storage="_RequiredPlugins", ThisKey="PluginId", OtherKey="PluginId")]
     1013    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Plugin_RequiredPlugin", Storage="_RequiredPlugins", ThisKey="PluginId", OtherKey="PluginId")]
    10141014    public EntitySet<RequiredPlugin> RequiredPlugins
    10151015    {
    … …  
    12741274    }
    12751275   
    1276     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="PluginInfo_RequiredPlugin", Storage="_PluginInfo", ThisKey="PluginId", OtherKey="PluginId", IsForeignKey=true, DeleteRule="CASCADE")]
     1276    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Plugin_RequiredPlugin", Storage="_PluginInfo", ThisKey="PluginId", OtherKey="PluginId", IsForeignKey=true, DeleteRule="CASCADE")]
    12771277    public Plugin Plugin
    12781278    {
    … …  
    18641864    }
    18651865   
    1866     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Slave_Job", Storage="_Jobs", ThisKey="ResourceId", OtherKey="ResourceId")]
     1866    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Slave_Job", Storage="_Jobs", ThisKey="ResourceId", OtherKey="SlaveId")]
    18671867    public EntitySet<Job> Jobs
    18681868    {
    … …  
    19891989    private System.Nullable<System.Guid> _ParentJobId;
    19901990   
    1991     private string _JobState;
     1991    private global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState _JobState;
    19921992   
    19931993    private System.Nullable<System.Guid> _ResourceId;
    … …  
    20352035    partial void OnParentJobIdChanging(System.Nullable<System.Guid> value);
    20362036    partial void OnParentJobIdChanged();
    2037     partial void OnJobStateChanging(string value);
     2037    partial void OnJobStateChanging(global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState value);
    20382038    partial void OnJobStateChanged();
    2039     partial void OnResourceIdChanging(System.Nullable<System.Guid> value);
    2040     partial void OnResourceIdChanged();
     2039    partial void OnSlaveIdChanging(System.Nullable<System.Guid> value);
     2040    partial void OnSlaveIdChanged();
    20412041    partial void OnExecutionTimeChanging(System.Nullable<System.TimeSpan> value);
    20422042    partial void OnExecutionTimeChanged();
    … …  
    21172117    }
    21182118   
    2119     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JobState", DbType="VarChar(MAX)", CanBeNull=false)]
    2120     public string JobState
     2119    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_JobState", DbType="VarChar(15)", CanBeNull=false)]
     2120    public global::HeuristicLab.Services.Hive.Common.DataTransfer.JobState JobState
    21212121    {
    21222122      get
    … …  
    21372137    }
    21382138   
    2139     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResourceId", DbType="UniqueIdentifier")]
    2140     public System.Nullable<System.Guid> ResourceId
     2139    [global::System.Data.Linq.Mapping.ColumnAttribute(Name="ResourceId", Storage="_ResourceId", DbType="UniqueIdentifier")]
     2140    public System.Nullable<System.Guid> SlaveId
    21412141    {
    21422142      get
    … …  
    21482148        if ((this._ResourceId != value))
    21492149        {
    2150           if (this._Slave.HasLoadedOrAssignedValue)
    2151           {
    2152             throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
    2153           }
    2154           this.OnResourceIdChanging(value);
     2150          this.OnSlaveIdChanging(value);
    21552151          this.SendPropertyChanging();
    21562152          this._ResourceId = value;
    2157           this.SendPropertyChanged("ResourceId");
    2158           this.OnResourceIdChanged();
     2153          this.SendPropertyChanged("SlaveId");
     2154          this.OnSlaveIdChanged();
    21592155        }
    21602156      }
    … …  
    25012497    }
    25022498   
    2503     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Slave_Job", Storage="_Slave", ThisKey="ResourceId", OtherKey="ResourceId", IsForeignKey=true, DeleteRule="SET NULL")]
     2499    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Slave_Job", Storage="_Slave", ThisKey="SlaveId", OtherKey="ResourceId", IsForeignKey=true, DeleteRule="SET NULL")]
    25042500    public Slave Slave
    25052501    {

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/Interfaces/IHiveDao.cs

    r4598 r4615  
    1515    void UpdateJob(DT.Job dto);
    1616    void DeleteJob(Guid id);
     17    IEnumerable<DT.Job> GetAvailableParentJobs(Guid slaveId);
    1718    #endregion
    1819

  • branches/HeuristicLab.Hive/sources/HeuristicLab.Hive.New/HeuristicLab.Services.Hive.DataAccess/3.3/app.config

    r4593 r4615  
    11<?xml version="1.0" encoding="utf-8" ?>
    22<configuration>
     3  <configSections>
     4  </configSections>
     5  <connectionStrings>
     6    <add name="HeuristicLab.Services.Hive.DataAccess.Properties.Settings.HeuristicLab_Hive_LinqConnectionString"
     7        connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive;Integrated Security=True;"
     8        providerName="System.Data.SqlClient" />
     9  </connectionStrings>
    310</configuration>
Note: See TracChangeset for help on using the changeset viewer.