- Timestamp:
- 06/25/15 18:34:40 (10 years ago)
- Location:
- branches/HiveStatistics/sources
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources
- Property svn:mergeinfo changed
/trunk/sources merged: 12470-12476,12478-12482,12485,12488,12490-12494,12496-12497,12504,12506-12507,12509,12511-12512,12514
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/HiveStatistics/DimClientDao.cs
r12468 r12516 37 37 return Table.SingleOrDefault(x => x.Id == id); 38 38 } 39 public IQueryable<DimClient> Get RecentlyAddedClients() {39 public IQueryable<DimClient> GetActiveClients() { 40 40 return Table.Where(x => x.ExpirationTime == null); 41 } 42 43 public IQueryable<DimClient> GetExpiredClients() { 44 return Table.Where(x => x.ExpirationTime != null); 41 45 } 42 46 -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/HiveStatistics/DimJobDao.cs
r12477 r12516 35 35 return Table.Where(x => x.UserId == id); 36 36 } 37 38 public IQueryable<DimJob> GetNotCompletedJobs() { 39 return Table.Where(x => x.DateCompleted == null); 40 } 41 42 public IQueryable<DimJob> GetCompletedJobs() { 43 return Table.Where(x => x.DateCompleted != null); 44 } 37 45 } 38 46 } -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/HiveStatistics/FactClientInfoDao.cs
r12468 r12516 59 59 }; 60 60 } 61 62 public IQueryable<FactClientInfo> GetByClientId(Guid id) { 63 return Table.Where(x => x.ClientId == id); 64 } 61 65 } 62 66 } -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/HiveStatistics/FactTaskDao.cs
r12477 r12516 44 44 } 45 45 46 public DateTime? GetLastCompletedTaskFromJob(Guid id) { 47 return Table.Where(x => x.JobId == id && x.EndTime != null).Max(x => x.EndTime); 48 } 49 50 public IQueryable<FactTask> GetByClientId(Guid id) { 51 return Table.Where(x => x.LastClientId == id); 52 } 53 46 54 public override void Delete(IEnumerable<Guid> ids) { 47 55 string paramIds = string.Join(",", ids.Select(x => string.Format("'{0}'", x))); -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/Daos/TaskDao.cs
r12468 r12516 35 35 return Table.Where(x => !x.IsParentTask); 36 36 } 37 38 public IQueryable<Task> GetAllByJobId(Guid id) { 39 return Table.Where(x => x.JobId == id); 40 } 37 41 } 38 42 } -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml
r12484 r12516 218 218 <Column Name="ResourceGroupId" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" /> 219 219 <Column Name="ResourceGroup2Id" Type="System.Guid" DbType="UniqueIdentifier" CanBeNull="true" /> 220 <Column Name="GroupName" Type="System.String" CanBeNull="true" /> 221 <Column Name="GroupName2" Type="System.String" CanBeNull="true" /> 220 222 <Association Name="DimClient_FactTask" Member="FactTasks" ThisKey="Id" OtherKey="LastClientId" Type="FactTask" /> 221 223 <Association Name="DimClient_FactClientInfo" Member="FactClientInfos" ThisKey="Id" OtherKey="ClientId" Type="FactClientInfo" /> … … 250 252 <Column Name="JobName" Type="System.String" DbType="VarChar(MAX) NOT NULL" CanBeNull="false" /> 251 253 <Column Name="UserName" Type="System.String" DbType="VarChar(MAX) NOT NULL" CanBeNull="false" /> 252 <Column Name="DateCreated" Type="System.DateTime" CanBeNull="false" /> 254 <Column Name="DateCreated" Type="System.DateTime" DbType="DateTime NOT NULL" CanBeNull="false" /> 255 <Column Name="TotalTasks" Type="System.Int32" DbType="INT NOT NULL" CanBeNull="false" /> 256 <Column Name="CompletedTasks" Type="System.Int32" DbType="INT NOT NULL" CanBeNull="false" /> 257 <Column Name="DateCompleted" Type="System.DateTime" DbType="DateTime NULL" CanBeNull="true" /> 253 258 <Association Name="DimJob_FactTask" Member="FactTasks" ThisKey="JobId" OtherKey="JobId" Type="FactTask" /> 254 259 </Type> … … 283 288 <Column Name="CpuUtilization" Type="System.Double" DbType="Float NOT NULL" CanBeNull="false" /> 284 289 <Column Name="TotalTimeIdle" Type="System.Double" DbType="Float NOT NULL" CanBeNull="false" /> 285 <Column Name="TotalTimeCalculating" Type="System.Double" DbType="Float NOT NULL" CanBeNull="false" />286 <Column Name="TotalTimeTransferring" Type="System.Double" DbType="Float NOT NULL" CanBeNull="false" />287 290 <Column Name="TotalTimeOffline" Type="System.Double" DbType="Float NOT NULL" CanBeNull="false" /> 288 291 <Column Name="TotalTimeUnavailable" Type="System.Double" DbType="Float NOT NULL" CanBeNull="false" /> -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.dbml.layout
r12484 r12516 1 1 <?xml version="1.0" encoding="utf-8"?> 2 <ordesignerObjectsDiagram dslVersion="1.0.0.0" absoluteBounds="0, 0, 24.25, 17. 5" name="HiveDataContext">2 <ordesignerObjectsDiagram dslVersion="1.0.0.0" absoluteBounds="0, 0, 24.25, 17.875" name="HiveDataContext"> 3 3 <DataContextMoniker Name="/HiveDataContext" /> 4 4 <nestedChildShapes> … … 247 247 </nestedChildShapes> 248 248 </classShape> 249 <classShape Id="b5b919c2-4efc-4f09-8f52-9d541a11e961" absoluteBounds="4.625, 15.25, 2, 1.9631982421875023">249 <classShape Id="b5b919c2-4efc-4f09-8f52-9d541a11e961" absoluteBounds="4.625, 15.25, 2, 2.3478011067708344"> 250 250 <DataClassMoniker Name="/HiveDataContext/DimClient" /> 251 251 <nestedChildShapes> 252 <elementListCompartment Id="30f62a7b-0b16-404e-b972-fb12bfe978dd" absoluteBounds="4.6400000000000006, 15.71, 1.9700000000000002, 1. 4031982421875" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />252 <elementListCompartment Id="30f62a7b-0b16-404e-b972-fb12bfe978dd" absoluteBounds="4.6400000000000006, 15.71, 1.9700000000000002, 1.7878011067708333" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" /> 253 253 </nestedChildShapes> 254 254 </classShape> … … 259 259 </nestedChildShapes> 260 260 </classShape> 261 <classShape Id="e0cb8641-a75e-4b9f-beda-3218c56938b1" absoluteBounds="8.125, 9.125, 2, 1.7708968098958344">261 <classShape Id="e0cb8641-a75e-4b9f-beda-3218c56938b1" absoluteBounds="8.125, 8.25, 2, 2.3478011067708344"> 262 262 <DataClassMoniker Name="/HiveDataContext/DimJob" /> 263 263 <nestedChildShapes> 264 <elementListCompartment Id="6b9e8260-7e4b-4357-9c26-eebebfd69504" absoluteBounds="8.14, 9.585, 1.9700000000000002, 1.2108968098958333" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />264 <elementListCompartment Id="6b9e8260-7e4b-4357-9c26-eebebfd69504" absoluteBounds="8.14, 8.71, 1.9700000000000002, 1.7878011067708333" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" /> 265 265 </nestedChildShapes> 266 266 </classShape> … … 277 277 </nestedChildShapes> 278 278 </classShape> 279 <classShape Id="053a5cff-b18a-4ee5-8d43-48ed5c5dcfad" absoluteBounds="2.625, 11, 2, 3. 5016097005208326">279 <classShape Id="053a5cff-b18a-4ee5-8d43-48ed5c5dcfad" absoluteBounds="2.625, 11, 2, 3.1170068359375005"> 280 280 <DataClassMoniker Name="/HiveDataContext/FactClientInfo" /> 281 281 <nestedChildShapes> 282 <elementListCompartment Id="0a1cc913-6636-455c-95b3-302f533527db" absoluteBounds="2.6399999999999997, 11.46, 1.9700000000000002, 2. 941609700520833" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />282 <elementListCompartment Id="0a1cc913-6636-455c-95b3-302f533527db" absoluteBounds="2.6399999999999997, 11.46, 1.9700000000000002, 2.5570068359375" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" /> 283 283 </nestedChildShapes> 284 284 </classShape> … … 290 290 </nodes> 291 291 </associationConnector> 292 <associationConnector edgePoints="[(8.5 : 10. 8958968098958); (8.5 : 11.25)]" fixedFrom="NotFixed" fixedTo="NotFixed">292 <associationConnector edgePoints="[(8.5 : 10.5978011067708); (8.5 : 11.25)]" fixedFrom="NotFixed" fixedTo="NotFixed"> 293 293 <AssociationMoniker Name="/HiveDataContext/DimJob/DimJob_FactTask" /> 294 294 <nodes> … … 297 297 </nodes> 298 298 </associationConnector> 299 <associationConnector edgePoints="[(5. 99218625 : 15.25); (5.99218625 : 12.1788329785157); (4.625 : 12.1788329785157)]" fixedFrom="NotFixed" fixedTo="NotFixed">299 <associationConnector edgePoints="[(5.6249975 : 15.25); (5.6249975 : 12.5585034179688); (4.625 : 12.5585034179688)]" fixedFrom="Algorithm" fixedTo="Algorithm"> 300 300 <AssociationMoniker Name="/HiveDataContext/DimClient/DimClient_FactClientInfo" /> 301 301 <nodes> … … 311 311 </nodes> 312 312 </associationConnector> 313 <associationConnector edgePoints="[(1.59375 : 10.0689925130208); (1.59375 : 12. 7508048502604); (2.625 : 12.7508048502604)]" fixedFrom="NotFixed" fixedTo="NotFixed">313 <associationConnector edgePoints="[(1.59375 : 10.0689925130208); (1.59375 : 12.5585034179688); (2.625 : 12.5585034179688)]" fixedFrom="Algorithm" fixedTo="Algorithm"> 314 314 <AssociationMoniker Name="/HiveDataContext/DimUser/DimUser_FactClientInfo" /> 315 315 <nodes> -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/HiveDataContext.designer.cs
r12484 r12516 4619 4619 private System.Nullable<System.Guid> _ResourceGroup2Id; 4620 4620 4621 private string _GroupName; 4622 4623 private string _GroupName2; 4624 4621 4625 private EntitySet<FactTask> _FactTasks; 4622 4626 … … 4639 4643 partial void OnResourceGroup2IdChanging(System.Nullable<System.Guid> value); 4640 4644 partial void OnResourceGroup2IdChanged(); 4645 partial void OnGroupNameChanging(string value); 4646 partial void OnGroupNameChanged(); 4647 partial void OnGroupName2Changing(string value); 4648 partial void OnGroupName2Changed(); 4641 4649 #endregion 4642 4650 … … 4764 4772 this.SendPropertyChanged("ResourceGroup2Id"); 4765 4773 this.OnResourceGroup2IdChanged(); 4774 } 4775 } 4776 } 4777 4778 [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GroupName")] 4779 public string GroupName 4780 { 4781 get 4782 { 4783 return this._GroupName; 4784 } 4785 set 4786 { 4787 if ((this._GroupName != value)) 4788 { 4789 this.OnGroupNameChanging(value); 4790 this.SendPropertyChanging(); 4791 this._GroupName = value; 4792 this.SendPropertyChanged("GroupName"); 4793 this.OnGroupNameChanged(); 4794 } 4795 } 4796 } 4797 4798 [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GroupName2")] 4799 public string GroupName2 4800 { 4801 get 4802 { 4803 return this._GroupName2; 4804 } 4805 set 4806 { 4807 if ((this._GroupName2 != value)) 4808 { 4809 this.OnGroupName2Changing(value); 4810 this.SendPropertyChanging(); 4811 this._GroupName2 = value; 4812 this.SendPropertyChanged("GroupName2"); 4813 this.OnGroupName2Changed(); 4766 4814 } 4767 4815 } … … 5359 5407 private System.DateTime _DateCreated; 5360 5408 5409 private int _TotalTasks; 5410 5411 private int _CompletedTasks; 5412 5413 private System.Nullable<System.DateTime> _DateCompleted; 5414 5361 5415 private EntitySet<FactTask> _FactTasks; 5362 5416 … … 5375 5429 partial void OnDateCreatedChanging(System.DateTime value); 5376 5430 partial void OnDateCreatedChanged(); 5431 partial void OnTotalTasksChanging(int value); 5432 partial void OnTotalTasksChanged(); 5433 partial void OnCompletedTasksChanging(int value); 5434 partial void OnCompletedTasksChanged(); 5435 partial void OnDateCompletedChanging(System.Nullable<System.DateTime> value); 5436 partial void OnDateCompletedChanged(); 5377 5437 #endregion 5378 5438 … … 5463 5523 } 5464 5524 5465 [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DateCreated" )]5525 [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DateCreated", DbType="DateTime NOT NULL")] 5466 5526 public System.DateTime DateCreated 5467 5527 { … … 5479 5539 this.SendPropertyChanged("DateCreated"); 5480 5540 this.OnDateCreatedChanged(); 5541 } 5542 } 5543 } 5544 5545 [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalTasks", DbType="INT NOT NULL")] 5546 public int TotalTasks 5547 { 5548 get 5549 { 5550 return this._TotalTasks; 5551 } 5552 set 5553 { 5554 if ((this._TotalTasks != value)) 5555 { 5556 this.OnTotalTasksChanging(value); 5557 this.SendPropertyChanging(); 5558 this._TotalTasks = value; 5559 this.SendPropertyChanged("TotalTasks"); 5560 this.OnTotalTasksChanged(); 5561 } 5562 } 5563 } 5564 5565 [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompletedTasks", DbType="INT NOT NULL")] 5566 public int CompletedTasks 5567 { 5568 get 5569 { 5570 return this._CompletedTasks; 5571 } 5572 set 5573 { 5574 if ((this._CompletedTasks != value)) 5575 { 5576 this.OnCompletedTasksChanging(value); 5577 this.SendPropertyChanging(); 5578 this._CompletedTasks = value; 5579 this.SendPropertyChanged("CompletedTasks"); 5580 this.OnCompletedTasksChanged(); 5581 } 5582 } 5583 } 5584 5585 [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DateCompleted", DbType="DateTime NULL")] 5586 public System.Nullable<System.DateTime> DateCompleted 5587 { 5588 get 5589 { 5590 return this._DateCompleted; 5591 } 5592 set 5593 { 5594 if ((this._DateCompleted != value)) 5595 { 5596 this.OnDateCompletedChanging(value); 5597 this.SendPropertyChanging(); 5598 this._DateCompleted = value; 5599 this.SendPropertyChanged("DateCompleted"); 5600 this.OnDateCompletedChanged(); 5481 5601 } 5482 5602 } … … 5876 5996 5877 5997 private double _TotalTimeIdle; 5878 5879 private double _TotalTimeCalculating;5880 5881 private double _TotalTimeTransferring;5882 5998 5883 5999 private double _TotalTimeOffline; … … 5915 6031 partial void OnTotalTimeIdleChanging(double value); 5916 6032 partial void OnTotalTimeIdleChanged(); 5917 partial void OnTotalTimeCalculatingChanging(double value);5918 partial void OnTotalTimeCalculatingChanged();5919 partial void OnTotalTimeTransferringChanging(double value);5920 partial void OnTotalTimeTransferringChanged();5921 6033 partial void OnTotalTimeOfflineChanging(double value); 5922 6034 partial void OnTotalTimeOfflineChanged(); … … 6127 6239 } 6128 6240 6129 [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalTimeCalculating", DbType="Float NOT NULL")]6130 public double TotalTimeCalculating6131 {6132 get6133 {6134 return this._TotalTimeCalculating;6135 }6136 set6137 {6138 if ((this._TotalTimeCalculating != value))6139 {6140 this.OnTotalTimeCalculatingChanging(value);6141 this.SendPropertyChanging();6142 this._TotalTimeCalculating = value;6143 this.SendPropertyChanged("TotalTimeCalculating");6144 this.OnTotalTimeCalculatingChanged();6145 }6146 }6147 }6148 6149 [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalTimeTransferring", DbType="Float NOT NULL")]6150 public double TotalTimeTransferring6151 {6152 get6153 {6154 return this._TotalTimeTransferring;6155 }6156 set6157 {6158 if ((this._TotalTimeTransferring != value))6159 {6160 this.OnTotalTimeTransferringChanging(value);6161 this.SendPropertyChanging();6162 this._TotalTimeTransferring = value;6163 this.SendPropertyChanged("TotalTimeTransferring");6164 this.OnTotalTimeTransferringChanged();6165 }6166 }6167 }6168 6169 6241 [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TotalTimeOffline", DbType="Float NOT NULL")] 6170 6242 public double TotalTimeOffline -
branches/HiveStatistics/sources/HeuristicLab.Services.Hive.DataAccess/3.3/SQL Scripts/Initialize Hive Database.sql
r12484 r12516 217 217 [ResourceGroupId] UNIQUEIDENTIFIER NULL, 218 218 [ResourceGroup2Id] UNIQUEIDENTIFIER NULL, 219 [GroupName] VARCHAR (MAX) NULL, 220 [GroupName2] VARCHAR (MAX) NULL, 219 221 CONSTRAINT [PK_DimClient] PRIMARY KEY CLUSTERED ([Id] ASC) 220 222 ); 221 223 CREATE TABLE [statistics].[DimJob] ( 222 [JobId] UNIQUEIDENTIFIER NOT NULL, 223 [UserId] UNIQUEIDENTIFIER NOT NULL, 224 [JobName] VARCHAR (MAX) NOT NULL, 225 [UserName] VARCHAR (MAX) NOT NULL, 226 [DateCreated] DATETIME NOT NULL, 224 [JobId] UNIQUEIDENTIFIER NOT NULL, 225 [UserId] UNIQUEIDENTIFIER NOT NULL, 226 [JobName] VARCHAR (MAX) NOT NULL, 227 [UserName] VARCHAR (MAX) NOT NULL, 228 [DateCreated] DATETIME NOT NULL, 229 [TotalTasks] INT NOT NULL, 230 [CompletedTasks] INT NOT NULL, 231 [DateCompleted] DATETIME NULL, 227 232 CONSTRAINT [PK_DimJob] PRIMARY KEY CLUSTERED ([JobId] ASC) 228 233 ); … … 243 248 [SlaveState] VarChar(15) NOT NULL, 244 249 [TotalTimeIdle] FLOAT (53) NOT NULL, 245 [TotalTimeCalculating] FLOAT (53) NOT NULL,246 [TotalTimeTransferring] FLOAT (53) NOT NULL,247 250 [TotalTimeOffline] FLOAT (53) NOT NULL, 248 251 [TotalTimeUnavailable] FLOAT (53) NOT NULL,
Note: See TracChangeset
for help on using the changeset viewer.