You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ka...@apache.org on 2015/05/20 10:15:00 UTC
svn commit: r1680480 - in /directory/mavibot/trunk/mavibot/src: main/java/org/apache/directory/mavibot/btree/ test/java/org/apache/directory/mavibot/btree/

Author: kayyagari
Date: Wed May 20 08:15:00 2015
New Revision: 1680480

URL: http://svn.apache.org/r1680480
Log:
giving an appropriate name to the SpaceReclaimer

Added:
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageReclaimer.java
      - copied, changed from r1680478, directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/SpaceReclaimer.java
    directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PageReclaimerTest.java
      - copied, changed from r1680478, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/SpaceReclaimerTest.java
Removed:
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/SpaceReclaimer.java
    directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/SpaceReclaimerTest.java
Modified:
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java

Copied: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageReclaimer.java (from r1680478, directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/SpaceReclaimer.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageReclaimer.java?p2=directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageReclaimer.java&p1=directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/SpaceReclaimer.java&r1=1680478&r2=1680480&rev=1680480&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/SpaceReclaimer.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageReclaimer.java Wed May 20 08:15:00 2015
@@ -35,23 +35,23 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SpaceReclaimer
+public class PageReclaimer
 {
     /** the record manager */
     private RecordManager rm;
 
     /** The LoggerFactory used by this class */
-    protected static final Logger LOG = LoggerFactory.getLogger( SpaceReclaimer.class );
+    protected static final Logger LOG = LoggerFactory.getLogger( PageReclaimer.class );
 
     /** a flag to detect the running state */
     private boolean running = false;
     
     /**
-     * Creates a new instance of SpaceReclaimer.
+     * Creates a new instance of PageReclaimer.
      *
      * @param rm the record manager
      */
-    public SpaceReclaimer( RecordManager rm )
+    public PageReclaimer( RecordManager rm )
     {
         this.rm = rm;
     }    

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java?rev=1680480&r1=1680479&r2=1680480&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java Wed May 20 08:15:00 2015
@@ -210,12 +210,12 @@ public class RecordManager extends Abstr
     private ReentrantLock freePageLock = new ReentrantLock();
 
     /** the space reclaimer */
-    private SpaceReclaimer reclaimer;
+    private PageReclaimer reclaimer;
 
     /** variable to keep track of the write commit count */
     private int commitCount = 0;
 
-    /** the threshold at which the SpaceReclaimer will be run to free the copied pages */
+    /** the threshold at which the PageReclaimer will be run to free the copied pages */
     // FIXME the below value is derived after seeing that anything higher than that
     // is resulting in a "This thread does not hold the transactionLock" error
     private int spaceReclaimerThreshold = 70;
@@ -293,7 +293,7 @@ public class RecordManager extends Abstr
                 loadRecordManager();
             }
 
-            reclaimer = new SpaceReclaimer( this );
+            reclaimer = new PageReclaimer( this );
             runReclaimer();
         }
         catch ( Exception e )
@@ -306,7 +306,7 @@ public class RecordManager extends Abstr
 
 
     /**
-     * runs the SpaceReclaimer to free the copied pages
+     * runs the PageReclaimer to free the copied pages
      */
     private void runReclaimer()
     {
@@ -323,7 +323,7 @@ public class RecordManager extends Abstr
         }
         catch ( Exception e )
         {
-            LOG.warn( "SpaceReclaimer failed to free the pages", e );
+            LOG.warn( "PageReclaimer failed to free the pages", e );
         }
     }
 

Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PageReclaimerTest.java (from r1680478, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/SpaceReclaimerTest.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PageReclaimerTest.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PageReclaimerTest.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/SpaceReclaimerTest.java&r1=1680478&r2=1680480&rev=1680480&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/SpaceReclaimerTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PageReclaimerTest.java Wed May 20 08:15:00 2015
@@ -41,7 +41,7 @@ import org.junit.rules.TemporaryFolder;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class SpaceReclaimerTest
+public class PageReclaimerTest
 {
     private static final String TREE_NAME = "uid-tree";
 
@@ -121,7 +121,7 @@ public class SpaceReclaimerTest
      * with the reclaimer threshold 10 and total entries of 1120
      * there was a condition that resulted in OOM while reopening the RM
      * 
-     * This issue was fixed after SpaceReclaimer was updated to run in
+     * This issue was fixed after PageReclaimer was updated to run in
      * a transaction.
      * 
      * This test is present to verify the fix