Changeset 9444 for branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3

Timestamp:

05/06/13 12:30:18 (12 years ago)

Author:

pfleck

Message:

#2030
Switched Text encoding to Mtom encoding for better performance for binary data.
Merged trunk into branch.

Location:

branches/HivePerformance/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.Hive (modified) (1 prop)
• HeuristicLab.Services.Hive/3.3/Convert.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HiveDao.cs (modified) (3 diffs)
• HeuristicLab.Services.Hive/3.3/HiveOperationContext.cs (modified) (1 diff)

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/Convert.cs

@@ -67 +67 @@
         target.LastHeartbeat = source.LastHeartbeat;
         target.State = Convert.ToEntity(source.State);
-        if (target.StateLogs == null) target.StateLogs = new EntitySet<DB.StateLog>();
         foreach (DT.StateLog sl in source.StateLog.Where(x => x.Id == Guid.Empty)) {
           target.StateLogs.Add(Convert.ToEntity(sl));

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/HiveDao.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Data.Linq;
 using System.Linq;
 using System.Linq.Expressions;
@@ -120 +121 @@
     public void UpdateTaskAndStateLogs(DT.Task dto) {
       using (var db = CreateContext()) {
+        DataLoadOptions dlo = new DataLoadOptions();
+        dlo.LoadWith<Task>(x => x.StateLogs);
+        db.LoadOptions = dlo;
+
         var entity = db.Tasks.FirstOrDefault(x => x.TaskId == dto.Id);
         if (entity == null) db.Tasks.InsertOnSubmit(DT.Convert.ToEntity(dto));
@@ -205 +210 @@
           DateTime = DateTime.Now
         });
-        db.SubmitChanges();
-      }
-
-      using (var db = CreateContext()) {
-        db.DeferredLoadingEnabled = false;
 
         var task = db.Tasks.SingleOrDefault(x => x.TaskId == taskId);

branches/HivePerformance/sources/HeuristicLab.Services.Hive/3.3/HiveOperationContext.cs

@@ -44 +44 @@
     }
 
-
     public void Attach(OperationContext owner) {
     }