Changeset 1131 for trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/DataAdapterBase.cs

Timestamp:

01/14/09 21:27:54 (15 years ago)

Author:

svonolfe

Message:

fixed race condition issues, improved performance (#372)

File:

• trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/DataAdapterBase.cs (modified) (8 diffs)

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/DataAdapterBase.cs

@@ -21 +21 @@
 
 using System;
+using System.Data;
 using System.Collections.Generic;
 using System.Linq;
@@ -32 +33 @@
     where RowT : System.Data.DataRow
     where ObjT : IHiveObject, new() {
-    protected AdapterT adapter =
-      new AdapterT();
+    protected AdapterT Adapter {
+      get {
+        return new AdapterT();
+      }
+    }
 
     #region Abstract methods
-    protected abstract RowT Convert(ObjT obj, RowT row);
+    protected abstract RowT ConvertObj(ObjT obj, RowT row);
 
-    protected abstract ObjT Convert(RowT row, ObjT obj);
+    protected abstract ObjT ConvertRow(RowT row, ObjT obj);
 
     [MethodImpl(MethodImplOptions.Synchronized)]
@@ -46 +50 @@
     protected abstract void UpdateRow(RowT row);
 
-    [MethodImpl(MethodImplOptions.Synchronized)]
     protected abstract IEnumerable<RowT> FindById(long id);
 
-    [MethodImpl(MethodImplOptions.Synchronized)]
     protected abstract IEnumerable<RowT> FindAll();
     #endregion
@@ -55 +57 @@
     protected delegate IEnumerable<RowT> Selector();
 
-    [MethodImpl(MethodImplOptions.Synchronized)]
+    protected ObjT Convert(RowT row, ObjT obj) {
+      try {
+        obj = ConvertRow(row, obj);
+        return obj;
+      }
+      catch (DeletedRowInaccessibleException) {
+        return default(ObjT);
+      }
+      catch (RowNotInTableException) {
+        return default(ObjT);
+      }
+    }
+
     protected virtual RowT FindSingleRow(Selector selector) {
       RowT row = default(RowT);
@@ -73 +87 @@
       if (row != null) {
         ObjT obj = new ObjT();
-        Convert(row, obj);
+        obj = Convert(row, obj);
 
         return obj;
@@ -81 +95 @@
     }
 
-    [MethodImpl(MethodImplOptions.Synchronized)]
     protected virtual ICollection<ObjT> FindMultiple(Selector selector) {
       IEnumerable<RowT> found =
@@ -91 +104 @@
       foreach (RowT row in found) {
         ObjT obj = new ObjT();
-        Convert(row, obj);
-        result.Add(obj);
+        obj = Convert(row, obj);
+        if(obj != null)
+          result.Add(obj);
       }
 
@@ -115 +129 @@
         }
 
-        Convert(obj, row);
+        ConvertObj(obj, row);
 
         UpdateRow(row);