svn commit: r1488757 - /labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java

[kayyagari]

Author: kayyagari
Date: Sun Jun  2 18:10:04 2013
New Revision: 1488757

URL: http://svn.apache.org/r1488757
Log:
tell record manager about the copied pages

Modified:
    labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java

Modified: 
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java
URL: 
http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java?rev=1488757&r1=1488756&r2=1488757&view=diff
==============================================================================
--- 
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java 
(original)
+++ 
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java 
Sun Jun  2 18:10:04 2013
@@ -31,6 +31,7 @@ import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.util.Comparator;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.LinkedBlockingDeque;
@@ -533,7 +534,7 @@ public class BTree<K, V>
         
         // Initialize the txnManager thread
         //FIXME we should NOT create a new transaction manager thread for each 
BTree
-        createTransactionManager();
+        //createTransactionManager();
     }
 
 
@@ -543,8 +544,8 @@ public class BTree<K, V>
     public void close() throws IOException
     {
         // Stop the readTransaction thread
-        readTransactionsThread.interrupt();
-        readTransactions.clear();
+        // readTransactionsThread.interrupt();
+        // readTransactions.clear();
 
         if ( type == BTreeTypeEnum.PERSISTENT )
         {
@@ -895,6 +896,11 @@ public class BTree<K, V>
                 }
             }
 
+            if ( isManaged() )
+            {
+                recordManager.addFreePages( this, ( List ) 
result.getCopiedPages() );
+            }
+
             // Store the created rootPage into the revision BTree
             if ( keepRevisions )
             {
@@ -1249,7 +1255,11 @@ public class BTree<K, V>
             }
         }
 
-
+        if ( isManaged() )
+        {
+            recordManager.addFreePages( this, ( List ) result.getCopiedPages() 
);
+        }
+        
         // Store the created rootPage into the revision BTree
         if ( keepRevisions )
         {



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@labs.apache.org
For additional commands, e-mail: commits-h...@labs.apache.org