Changeset 2117 for trunk/sources/HeuristicLab.DataAccess.ADOHelper/3.2

Timestamp:

06/26/09 12:18:32 (15 years ago)

Author:

svonolfe

Message:

Streaming of Jobs and JobsResults directly from/to the DB (#680)

Location:

trunk/sources/HeuristicLab.DataAccess.ADOHelper/3.2

Files:

• HeuristicLab.DataAccess.ADOHelper-3.2.csproj (modified) (1 diff)
• Session.cs (modified) (5 diffs)
• TableAdapterWrapperBase.cs (modified) (2 diffs)
• Transaction.cs (modified) (3 diffs)
• VarBinaryStream.cs (added)

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

@@ -80 +80 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="VarBinaryStream.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="DataAccessADOHelperPlugin.cs" />

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

@@ -42 +42 @@
     private Thread ownerThread;
 
-    private int counter;
+    private int usageCounter = 0;
 
     private IDictionary<Guid, object> adapters =
@@ -50 +50 @@
       this.factory = factory;
       this.ownerThread = Thread.CurrentThread;
-      this.counter = 0;
+      this.usageCounter = 0;
     }
 
@@ -74 +74 @@
 
     public void IncrementUsageCounter() {
-      this.counter++;
+      this.usageCounter++;
     }
 
     #region ISession Members
+    public ISessionFactory Factory {
+      get {
+        return this.factory;
+      }
+    }
+
     public ITransaction BeginTransaction() {
       CheckThread();
@@ -85 +91 @@
          transaction.Connection = Connection;
       }
+
+      transaction.IncrementUsageCounter();
 
       return transaction;
@@ -134 +142 @@
 
     public void EndSession() {
-      this.counter--;
+      this.usageCounter--;
 
-      if (counter <= 0) {
+      if (usageCounter <= 0) {
         CheckThread();
 

trunk/sources/HeuristicLab.DataAccess.ADOHelper/3.2/TableAdapterWrapperBase.cs

@@ -36 +36 @@
       new AdapterT();
 
-    private ISession session;
+    private Session session;
     
     #region IDataAdapterWrapper<AdapterT,ObjT,RowT> Members
@@ -57 +57 @@
 
     public Session Session {
+      protected get {
+        return this.session;
+      }
+
       set { 
         this.session = value;

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

@@ -34 +34 @@
     private Session session;
 
+    private int usageCounter = 0;
+
     public Transaction(Session session) {
       this.session = session;
+    }
+
+    public void IncrementUsageCounter() {
+      this.usageCounter++;
     }
 
@@ -56 +62 @@
       this.session.CheckThread();
 
-      if (transaction != null) {
+      usageCounter--;
+
+      if (transaction != null && usageCounter <= 0) {
         DbConnection conn =
           transaction.Connection;
@@ -73 +81 @@
     public void Rollback() {
       this.session.CheckThread();
+
+      usageCounter = 0;
 
       if (transaction != null) {