Changeset 12963 for stable/HeuristicLab.Services.Hive.DataAccess
- Timestamp:
- 09/21/15 16:35:55 (9 years ago)
- Location:
- stable
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
stable ¶
- Property svn:mergeinfo changed
/trunk/sources merged: 12926-12927,12959
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Services.Hive.DataAccess ¶
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Services.Hive.DataAccess merged: 12926
- Property svn:mergeinfo changed
-
TabularUnified stable/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml ¶
r12962 r12963 76 76 <Column Name="Command" Type="global::HeuristicLab.Services.Hive.DataAccess.Command?" DbType="VarChar(30)" CanBeNull="true" /> 77 77 <Column Name="JobId" Storage="_HiveExperimentId" Type="System.Guid" DbType="UniqueIdentifier NOT NULL" CanBeNull="false" /> 78 <Column Name="IsPrivileged" Type="System.Boolean" DbType="Bit" CanBeNull="false" />79 78 <Association Name="Task_AssignedResource" Member="AssignedResources" ThisKey="TaskId" OtherKey="TaskId" Type="AssignedResource" /> 80 79 <Association Name="Task_RequiredPlugin" Member="RequiredPlugins" ThisKey="TaskId" OtherKey="TaskId" Type="RequiredPlugin" /> -
TabularUnified stable/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml.layout ¶
r12962 r12963 27 27 </nestedChildShapes> 28 28 </classShape> 29 <classShape Id="695bfc39-59f3-4e60-8644-f847964bf62c" absoluteBounds="6.5, 1, 2, 3. 3093082682291666">29 <classShape Id="695bfc39-59f3-4e60-8644-f847964bf62c" absoluteBounds="6.5, 1, 2, 3.1170068359374996"> 30 30 <DataClassMoniker Name="/HiveDataContext/Task" /> 31 31 <nestedChildShapes> 32 <elementListCompartment Id="a6a30e11-03d1-4869-82e6-b733f4ef9974" absoluteBounds="6.5150000000000006, 1.46, 1.9700000000000002, 2. 7493082682291665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />32 <elementListCompartment Id="a6a30e11-03d1-4869-82e6-b733f4ef9974" absoluteBounds="6.5150000000000006, 1.46, 1.9700000000000002, 2.5570068359375" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" /> 33 33 </nestedChildShapes> 34 34 </classShape> … … 141 141 </nodes> 142 142 </associationConnector> 143 <associationConnector edgePoints="[(8. 0192961430407 : 3.90397379557292); (8.0192961430407 : 5.04807657877604); (8.875 : 5.04807657877604)]" fixedFrom="NotFixed" fixedTo="NotFixed">143 <associationConnector edgePoints="[(8.5 : 4.1170068359375); (8.875 : 4.5)]" fixedFrom="NotFixed" fixedTo="NotFixed"> 144 144 <AssociationMoniker Name="/HiveDataContext/Task/Task_AssignedResource" /> 145 145 <nodes> … … 148 148 </nodes> 149 149 </associationConnector> 150 <associationConnector edgePoints="[(7. 20145120722822 : 3.90397379557292); (7.20145120722822: 5.875)]" fixedFrom="NotFixed" fixedTo="NotFixed">150 <associationConnector edgePoints="[(7.4687475 : 4.1170068359375); (7.4687475 : 5.875)]" fixedFrom="NotFixed" fixedTo="NotFixed"> 151 151 <AssociationMoniker Name="/HiveDataContext/Task/Task_RequiredPlugin" /> 152 152 <nodes> … … 176 176 </nodes> 177 177 </associationConnector> 178 <associationConnector edgePoints="[(6.125 : 3. 46715413411458); (6.5 : 3.46715413411458)]" fixedFrom="NotFixed" fixedTo="NotFixed">178 <associationConnector edgePoints="[(6.125 : 3.37100341796875); (6.5 : 3.37100341796875)]" fixedFrom="NotFixed" fixedTo="NotFixed"> 179 179 <AssociationMoniker Name="/HiveDataContext/Job/Job_Task" /> 180 180 <nodes> -
TabularUnified stable/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs ¶
r12962 r12963 1620 1620 private System.Guid _HiveExperimentId; 1621 1621 1622 private bool _IsPrivileged;1623 1624 1622 private EntitySet<AssignedResource> _AssignedResources; 1625 1623 … … 1664 1662 partial void OnJobIdChanging(System.Guid value); 1665 1663 partial void OnJobIdChanged(); 1666 partial void OnIsPrivilegedChanging(bool value);1667 partial void OnIsPrivilegedChanged();1668 1664 #endregion 1669 1665 … … 1924 1920 this.SendPropertyChanged("JobId"); 1925 1921 this.OnJobIdChanged(); 1926 }1927 }1928 }1929 1930 [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsPrivileged", DbType="Bit")]1931 public bool IsPrivileged1932 {1933 get1934 {1935 return this._IsPrivileged;1936 }1937 set1938 {1939 if ((this._IsPrivileged != value))1940 {1941 this.OnIsPrivilegedChanging(value);1942 this.SendPropertyChanging();1943 this._IsPrivileged = value;1944 this.SendPropertyChanged("IsPrivileged");1945 this.OnIsPrivilegedChanged();1946 1922 } 1947 1923 } -
TabularUnified stable/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Initialize Hive Database.sql ¶
r12962 r12963 86 86 [Command] VarChar(30), 87 87 [JobId] UniqueIdentifier NOT NULL, 88 [IsPrivileged] Bit NOT NULL,89 88 CONSTRAINT [PK_dbo.Task] PRIMARY KEY ([TaskId]) 90 89 ) -
TabularUnified stable/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Prepare Hive Database.sql ¶
r12962 r12963 113 113 CREATE NONCLUSTERED INDEX [TaskJobIdIndex] 114 114 ON [dbo].[Task] ([JobId]) 115 INCLUDE ([TaskId],[TaskState],[ExecutionTimeMs],[LastHeartbeat],[ParentTaskId],[Priority],[CoresNeeded],[MemoryNeeded],[IsParentTask],[FinishWhenChildJobsFinished],[Command] ,[IsPrivileged])115 INCLUDE ([TaskId],[TaskState],[ExecutionTimeMs],[LastHeartbeat],[ParentTaskId],[Priority],[CoresNeeded],[MemoryNeeded],[IsParentTask],[FinishWhenChildJobsFinished],[Command]) 116 116 GO 117 117 … … 119 119 CREATE NONCLUSTERED INDEX [TaskGetWaitingTasksIndex] 120 120 ON [dbo].[Task] ([TaskState],[IsParentTask],[FinishWhenChildJobsFinished],[CoresNeeded],[MemoryNeeded]) 121 INCLUDE ([TaskId],[ExecutionTimeMs],[LastHeartbeat],[ParentTaskId],[Priority],[Command],[JobId] ,[IsPrivileged])121 INCLUDE ([TaskId],[ExecutionTimeMs],[LastHeartbeat],[ParentTaskId],[Priority],[Command],[JobId]) 122 122 GO 123 123
Note: See TracChangeset
for help on using the changeset viewer.