directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r1603911 - in /directory/mavibot/trunk/mavibot: pom.xml src/main/java/org/apache/directory/mavibot/btree/PersistedBTree.java src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java
Date Thu, 19 Jun 2014 15:04:32 GMT
Author: kayyagari
Date: Thu Jun 19 15:04:31 2014
New Revision: 1603911

URL: http://svn.apache.org/r1603911
Log:
removed dependency on ehCache

Modified:
    directory/mavibot/trunk/mavibot/pom.xml
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTree.java
    directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java

Modified: directory/mavibot/trunk/mavibot/pom.xml
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/pom.xml?rev=1603911&r1=1603910&r2=1603911&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/pom.xml (original)
+++ directory/mavibot/trunk/mavibot/pom.xml Thu Jun 19 15:04:31 2014
@@ -39,7 +39,6 @@
     <log4j.version>1.2.17</log4j.version>
     <slf4j.api.version>1.7.7</slf4j.api.version>
     <slf4j.log4j12.version>1.7.7</slf4j.log4j12.version>
-    <ehcache.version>2.4.4</ehcache.version>
   </properties>
 
   <dependencies>
@@ -62,12 +61,6 @@
       <version>${commons.io.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache-core</artifactId>
-      <version>${ehcache.version}</version>
-    </dependency>
-
     <!-- Logging dependencies -->
 
     <dependency>

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTree.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTree.java?rev=1603911&r1=1603910&r2=1603911&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTree.java
(original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTree.java
Thu Jun 19 15:04:31 2014
@@ -26,10 +26,6 @@ import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import net.sf.ehcache.Cache;
-import net.sf.ehcache.Status;
-import net.sf.ehcache.config.CacheConfiguration;
-
 import org.apache.commons.collections.map.LRUMap;
 import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
 import org.slf4j.Logger;
@@ -165,15 +161,6 @@ public class PersistedBTree<K, V> extend
             // Create the queue containing the pending read transactions
             readTransactions = new ConcurrentLinkedQueue<ReadTransaction<K, V>>();
 
-            // Initialize the caches
-            CacheConfiguration cacheConfiguration = new CacheConfiguration();
-            cacheConfiguration.setName( "pages" );
-            cacheConfiguration.setEternal( true );
-            cacheConfiguration.setOverflowToDisk( false );
-            cacheConfiguration.setCacheLoaderTimeoutMillis( 0 );
-            cacheConfiguration.setMaxElementsInMemory( cacheSize );
-            cacheConfiguration.setMemoryStoreEvictionPolicy( "LRU" );
-
             if ( cacheSize < 1 )
             {
                 cacheSize = 1;

Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java?rev=1603911&r1=1603910&r2=1603911&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java
(original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java
Thu Jun 19 15:04:31 2014
@@ -22,8 +22,6 @@ package org.apache.directory.mavibot.btr
 
 import java.io.IOException;
 
-import net.sf.ehcache.Element;
-
 import org.apache.commons.collections.map.LRUMap;
 import org.apache.directory.mavibot.btree.exception.BTreeOperationException;
 import org.apache.directory.mavibot.btree.exception.EndOfFileExceededException;



Mime
View raw message