directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1303047 - in /directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm: JdbmIndex.java JdbmRdnIndex.java
Date Tue, 20 Mar 2012 17:53:48 GMT
Author: elecharny
Date: Tue Mar 20 17:53:48 2012
New Revision: 1303047

URL: http://svn.apache.org/viewvc?rev=1303047&view=rev
Log:
Removed the keyCache, it's not used anymore now that the value are already normalized

Modified:
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
    directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=1303047&r1=1303046&r2=1303047&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
(original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
Tue Mar 20 17:53:48 2012
@@ -37,12 +37,10 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.shared.ldap.model.cursor.Cursor;
 import org.apache.directory.shared.ldap.model.cursor.Tuple;
-import org.apache.directory.shared.ldap.model.entry.BinaryValue;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.comparators.SerializableComparator;
-import org.apache.directory.shared.util.SynchronizedLRUMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -88,13 +86,6 @@ public class JdbmIndex<K, O> extends Abs
     protected RecordManager recMan;
 
     /**
-     * the normalized value cache for this index
-     * @todo I don't think the keyCache is required anymore since the normalizer
-     * will cache values for us.
-     */
-    protected SynchronizedLRUMap keyCache;
-
-    /**
      * duplicate limit before duplicate keys switch to using a btree for values
      */
     protected int numDupLimit = DEFAULT_DUPLICATE_LIMIT;
@@ -155,7 +146,6 @@ public class JdbmIndex<K, O> extends Abs
     {
         LOG.debug( "Initializing an Index for attribute '{}'", attributeType.getName() );
 
-        keyCache = new SynchronizedLRUMap( cacheSize );
         this.attributeType = attributeType;
 
         if ( attributeId == null )

Modified: directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java?rev=1303047&r1=1303046&r2=1303047&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java
(original)
+++ directory/apacheds/trunk/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java
Tue Mar 20 17:53:48 2012
@@ -37,7 +37,6 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
-import org.apache.directory.shared.util.SynchronizedLRUMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -71,9 +70,6 @@ public class JdbmRdnIndex<E> extends Jdb
     {
         LOG.debug( "Initializing an Index for attribute '{}'", attributeType.getName() );
 
-        //System.out.println( "IDX Initializing RDNindex for AT " + attributeType.getOid()
+ ", wkDirPath : " + wkDirPath + ", base dir : " + this.wkDirPath );
-
-        keyCache = new SynchronizedLRUMap( cacheSize );
         this.attributeType = attributeType;
 
         if ( attributeId == null )
@@ -123,7 +119,7 @@ public class JdbmRdnIndex<E> extends Jdb
      * @param schemaManager The server schemaManager
      * @throws IOException if we cannot initialize the forward and reverse
      * tables
-     * @throws NamingException 
+     * @throws NamingException
      */
     private void initTables( SchemaManager schemaManager ) throws IOException
     {



Mime
View raw message