Changeset 1488 for trunk/sources/HeuristicLab.DataAccess.ADOHelper

Timestamp:

04/02/09 15:00:35 (16 years ago)

Author:

svonolfe

Message:

Updated transaction management (#527)

Location:

trunk/sources/HeuristicLab.DataAccess.ADOHelper

Files:

• DataAdapterBase.cs (modified) (4 diffs)
• DataAdapterWrapperBase.cs (modified) (1 diff)
• HeuristicLab.DataAccess.ADOHelper.csproj (modified) (1 diff)
• Session.cs (modified) (5 diffs)
• SessionFactory.cs (modified) (2 diffs)
• Transaction.cs (modified) (4 diffs)
• TransactionManager.cs (deleted)

trunk/sources/HeuristicLab.DataAccess.ADOHelper/DataAdapterBase.cs

@@ -144 +144 @@
     protected ObjT FindSingle(Selector selector) {
       ITransaction trans =
-       session.GetTransactionForCurrentThread();
+       session.GetCurrentTransaction();
       bool transactionExists = trans != null;
       if (!transactionExists) {
@@ -174 +174 @@
     protected ICollection<ObjT> FindMultiple(Selector selector) {
       ITransaction trans =
-       session.GetTransactionForCurrentThread();
+       session.GetCurrentTransaction();
       bool transactionExists = trans != null;
       if (!transactionExists) {
@@ -242 +242 @@
     public void Update(ObjT obj) {
       ITransaction trans =
-        session.GetTransactionForCurrentThread();
+        session.GetCurrentTransaction();
       bool transactionExists = trans != null;
       if (!transactionExists) {
@@ -294 +294 @@
     public bool Delete(ObjT obj) {
       ITransaction trans =
-        session.GetTransactionForCurrentThread();
+        session.GetCurrentTransaction();
       bool transactionExists = trans != null;
       if (!transactionExists) {

trunk/sources/HeuristicLab.DataAccess.ADOHelper/DataAdapterWrapperBase.cs

@@ -43 +43 @@
       get {
         ITransaction trans =
-          session.GetTransactionForCurrentThread();
+          session.GetCurrentTransaction();
         if (trans != null)
           SetTransaction(trans.InnerTransaction as DbTransaction);

trunk/sources/HeuristicLab.DataAccess.ADOHelper/HeuristicLab.DataAccess.ADOHelper.csproj

@@ -88 +88 @@
     <Compile Include="SessionFactory.cs" />
     <Compile Include="Transaction.cs" />
-    <Compile Include="TransactionManager.cs" />
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.DataAccess.ADOHelper/Session.cs

@@ -35 +35 @@
     private SessionFactory factory;
 
-    private ITransactionManager transManager;
+    private Transaction transaction;
 
     private DbConnection connection;
@@ -42 +42 @@
       new Dictionary<Guid, object>();
 
-    public Session(SessionFactory factory, 
-      ITransactionManager transManager) {
+    public Session(SessionFactory factory) {
       this.factory = factory;
-      this.transManager = transManager;
     }
 
@@ -58 +56 @@
     }
 
+    public void DetachTrasaction() {
+      this.transaction = null;
+    }
+
     #region ISession Members
     public ITransaction BeginTransaction() {
-      ITransaction trans = transManager.BeginTransaction();
-      if(trans is Transaction)
-        ((Transaction)trans).Connection = Connection;
+      if (transaction == null) {
+         transaction = new Transaction(this);
+         transaction.Connection = Connection;
+      }
 
-      return trans;
+      return transaction;
     }
 
-    public ITransaction GetTransactionForCurrentThread() {
-      ITransaction trans = transManager.GetTransactionForCurrentThread();
-      if (trans != null && trans is Transaction)
-        ((Transaction)trans).Connection = Connection;
-
-      return trans;
+    public ITransaction GetCurrentTransaction() {
+      return transaction;
     }
 
     public IDataAdapter<ObjT> GetDataAdapter<ObjT>()
       where ObjT : IPersistableObject {
-      lock(this) {
-        Guid adapterId = typeof(IDataAdapter<ObjT>).GUID;
+      Guid adapterId = typeof(IDataAdapter<ObjT>).GUID;
 
-        if (!adapters.ContainsKey(adapterId)) {
-          IDataAdapter<ObjT> adapter =
-            discoveryService.GetInstances<IDataAdapter<ObjT>>()[0];
+      if (!adapters.ContainsKey(adapterId)) {
+        IDataAdapter<ObjT> adapter =
+          discoveryService.GetInstances<IDataAdapter<ObjT>>()[0];
 
-          adapter.Session = this;
+        adapter.Session = this;
 
-          adapters.Add(adapterId, adapter);
-        }
+        adapters.Add(adapterId, adapter);
+      }
 
-        return adapters[adapterId] as IDataAdapter<ObjT>;
-      }
+      return adapters[adapterId] as IDataAdapter<ObjT>;
     }
 
@@ -97 +94 @@
       where T : class, IDataAdapter<ObjT>
     {
-      lock (this) {
         Guid adapterId = typeof(T).GUID;
 
@@ -110 +106 @@
 
         return adapters[adapterId] as T;
-      }
     }
 
     public void EndSession() {
-      if(connection.State == System.Data.ConnectionState.Open)
+      if (transaction != null) {
+        transaction.Rollback();
+        transaction = null;
+      }
+      if (connection.State == System.Data.ConnectionState.Open) {
         connection.Close();
+        connection = null;
+      }
       factory.EndSession(this);
     }

trunk/sources/HeuristicLab.DataAccess.ADOHelper/SessionFactory.cs

@@ -33 +33 @@
     private IDictionary<Thread, ISession> sessions =
       new Dictionary<Thread, ISession>();
-
-    private ITransactionManager transManager =
-          new TransactionManager();
 
     public Type DbConnectionType { get;  set; }
@@ -86 +83 @@
         if (!sessions.ContainsKey(current)) {
           sessions[current] =
-            new Session(this, transManager);
+            new Session(this);
         }
 

trunk/sources/HeuristicLab.DataAccess.ADOHelper/Transaction.cs

@@ -31 +31 @@
   class Transaction: ITransaction {
     private DbTransaction transaction;
-    private TransactionManager manager;
+
+    private Session session;
+
+    public Transaction(Session session) {
+      this.session = session;
+    }
 
     #region ITransaction Members
-
-    public Transaction(TransactionManager manager) {
-      this.manager = manager;
-    }
-
     public DbConnection Connection {
       set {
@@ -54 +54 @@
 
     public void Commit() {
-      manager.RemoveTransaction(this);
       if (transaction != null) {
         DbConnection conn =
@@ -60 +59 @@
 
         transaction.Commit();
+
+        transaction = null;
+        session.DetachTrasaction();
 
         if (conn != null && 
@@ -68 +70 @@
 
     public void Rollback() {
-      manager.RemoveTransaction(this);
-      DbConnection conn =
-          transaction.Connection;
+      if (transaction != null) {
+        DbConnection conn =
+            transaction.Connection;
 
-      transaction.Rollback();
+        transaction.Rollback();
 
-      if (conn != null &&
-          conn.State == System.Data.ConnectionState.Open)
-        conn.Close();
+        transaction = null;
+        session.DetachTrasaction();
+
+        if (conn != null &&
+            conn.State == System.Data.ConnectionState.Open)
+          conn.Close();
+      }
     }