Changeset 6419 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveJobs

Timestamp:

06/16/11 00:06:54 (13 years ago)

Author:

cneumuel

Message:

#1233

• created events when statelog changed
• fixed memory leak in hiveengine
• extended timeout for long running transactions and database contexts (when jobdata is stored)
• replaced random guids in database with sequential guids for performance reasons
• minor fixes and cleanups

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveJobs

Files:

• EngineHiveJob.cs (modified) (1 diff)
• HiveJob.cs (modified) (9 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveJobs/EngineHiveJob.cs

@@ -71 +71 @@
       return jobData;
     }
+
+    public override void ClearData() {
+      base.ClearData();
+      this.ItemJob.InitialOperation = null;
+    }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HiveJobs/HiveJob.cs

@@ -123 +123 @@
     protected bool syncJobsWithOptimizers = true;
 
+    public StateLogList StateLog {
+      get { return new StateLogList(this.job.StateLog); }
+    }
+
+    public StateLogListList ChildStateLogList {
+      get { return new StateLogListList(this.childHiveJobs.Select(x => x.StateLog)); }
+    }
+
     #region Constructors and Cloning
     public HiveJob() {
@@ -234 +242 @@
         OnToStringChanged();
         OnItemImageChanged();
+        OnStateLogChanged();
       }
     }
@@ -255 +264 @@
     }
 
-    #region Events
+    #region Event Handler
     public event EventHandler JobChanged;
     private void OnJobChanged() {
@@ -278 +287 @@
     private void OnIsFinishedJobDownloadedChanged() {
       var handler = IsFinishedJobDownloadedChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+
+    public event EventHandler StateLogChanged;
+    private void OnStateLogChanged() {
+      var handler = StateLogChanged;
       if (handler != null) handler(this, EventArgs.Empty);
     }
@@ -371 +386 @@
     public event CollectionItemsChangedEventHandler<IItemTree<HiveJob>> CollectionReset;
     private void OnCollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<HiveJob>> e) {
+      foreach (var item in e.Items) {
+        item.Value.StateLogChanged -= new EventHandler(ChildHiveJob_StateLogChanged);
+      }
       var handler = CollectionReset;
       if (handler != null) handler(this, ToCollectionItemsChangedEventArgs(e));
@@ -377 +395 @@
     public event CollectionItemsChangedEventHandler<IItemTree<HiveJob>> ItemsAdded;
     private void OnItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<HiveJob>> e) {
+      foreach (var item in e.Items) {
+        item.Value.StateLogChanged += new EventHandler(ChildHiveJob_StateLogChanged);
+      }
       var handler = ItemsAdded;
       if (handler != null) handler(this, ToCollectionItemsChangedEventArgs(e));
@@ -383 +404 @@
     public event CollectionItemsChangedEventHandler<IItemTree<HiveJob>> ItemsRemoved;
     private void OnItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<HiveJob>> e) {
+      foreach (var item in e.Items) {
+        item.Value.StateLogChanged -= new EventHandler(ChildHiveJob_StateLogChanged);
+      }
       var handler = ItemsRemoved;
       if (handler != null) handler(this, ToCollectionItemsChangedEventArgs(e));
@@ -389 +413 @@
     private static CollectionItemsChangedEventArgs<IItemTree<HiveJob>> ToCollectionItemsChangedEventArgs(CollectionItemsChangedEventArgs<IndexedItem<HiveJob>> e) {
       return new CollectionItemsChangedEventArgs<IItemTree<HiveJob>>(e.Items.Select(x => x.Value), e.OldItems == null ? null : e.OldItems.Select(x => x.Value));
+    }
+
+    private void ChildHiveJob_StateLogChanged(object sender, EventArgs e) {
+      OnStateLogChanged();
     }
     #endregion
@@ -443 +471 @@
     /// Delete ItemJob
     /// </summary>
-    public void ClearData() {
+    public virtual void ClearData() {
       this.ItemJob.Item = null;
     }