Changeset 9545

Timestamp:

05/28/13 09:56:11 (11 years ago)

Author:

pfleck

Message:

#2063:
ClientInfo facts are now generated correctly when resources are changed and new client dimensions are created.
Query username for statistics tables from user id.

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HiveStatisticsGenerator.cs (modified) (4 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HiveStatisticsGenerator.cs

@@ -2 +2 @@
 using System.Linq;
 using System.Transactions;
+using HeuristicLab.Services.Access;
 using HeuristicLab.Services.Hive.DataAccess;
 
 namespace HeuristicLab.Services.Hive {
   public class HiveStatisticsGenerator : IStatisticsGenerator {
+
+    private IUserManager userManager { get { return ServiceLocator.Instance.UserManager; } }
+
     private static readonly TimeSpan SmallestTimeSpan = new TimeSpan(0, 5, 0);
 
@@ -68 +72 @@
           JobName = j.Name,
           UserId = j.OwnerUserId,
-          UserName = ""
+          UserName = userManager.GetUserById(j.OwnerUserId).UserName
         };
 
@@ -84 +88 @@
         select new DimUser {
           UserId = u,
-          Name = ""
+          Name = userManager.GetUserById(u).UserName
         };
 
@@ -140 +144 @@
       var lastFacts =
         from cf in db.FactClientInfos
-        group cf by cf.ClientId
-          into grpFacts
-          select grpFacts.OrderByDescending(x => x.Time).First();
+        join r in db.DimClients on cf.ClientId equals r.Id
+        group cf by r.ResourceId into grpFacts
+        select new {
+          ResourceId = grpFacts.Key,
+          Fact = grpFacts.OrderByDescending(x => x.Time).First(),
+        };
 
       var slaves =
         from s in db.Resources.OfType<Slave>()
         join c in db.DimClients on s.ResourceId equals c.ResourceId
-        join lcf in lastFacts on c.Id equals lcf.ClientId into joinCf
+        join lcf in lastFacts on c.ResourceId equals lcf.ResourceId into joinCf
         from cf in joinCf.DefaultIfEmpty()
+        where c.ExpirationTime == null
         select new {
           Slave = s,
           Client = c,
-          LastFact = cf
+          LastFact = cf != null ? cf.Fact : null
         };