directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1029613 - in /directory/apacheds/trunk: jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ xdbm-partition/src/ma...
Date Mon, 01 Nov 2010 11:12:33 GMT
Author: elecharny
Date: Mon Nov  1 11:12:32 2010
New Revision: 1029613

URL: http://svn.apache.org/viewvc?rev=1029613&view=rev
Log:
o Added an AbstractIndex class to hold fields common to all indexes.
o Modifed the Jdbm andAvl index accordingly

Added:
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java
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
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.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=1029613&r1=1029612&r2=1029613&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
Mon Nov  1 11:12:32 2010
@@ -32,6 +32,7 @@ import jdbm.recman.CacheRecordManager;
 import org.apache.directory.server.core.partition.impl.btree.IndexCursorAdaptor;
 import org.apache.directory.server.core.partition.impl.btree.LongComparator;
 import org.apache.directory.server.i18n.I18n;
+import org.apache.directory.server.xdbm.AbstractIndex;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.shared.ldap.cursor.Cursor;
@@ -51,7 +52,7 @@ import org.slf4j.LoggerFactory;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class JdbmIndex<K, O> implements Index<K, O, Long>
+public class JdbmIndex<K, O> extends AbstractIndex<K, O, Long>
 {
     /** A logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( JdbmIndex.class.getSimpleName()
);
@@ -60,16 +61,13 @@ public class JdbmIndex<K, O> implements 
      * default duplicate limit before duplicate keys switch to using a btree for values
      */
     public static final int DEFAULT_DUPLICATE_LIMIT = 512;
-
+    
     /**  the key used for the forward btree name */
     public static final String FORWARD_BTREE = "_forward";
 
     /**  the key used for the reverse btree name */
     public static final String REVERSE_BTREE = "_reverse";
 
-    /** the attribute type resolved for this JdbmIndex */
-    protected AttributeType attribute;
-
     /**
      * the forward btree where the btree key is the value of the indexed attribute and
      * the value of the btree is the entry id of the entry containing an attribute with
@@ -96,23 +94,11 @@ public class JdbmIndex<K, O> implements 
      */
     protected SynchronizedLRUMap keyCache;
 
-    /** the size (number of index entries) for the cache */
-    protected int cacheSize = DEFAULT_INDEX_CACHE_SIZE;
-
     /**
      * duplicate limit before duplicate keys switch to using a btree for values
      */
     protected int numDupLimit = DEFAULT_DUPLICATE_LIMIT;
 
-    /**
-     * the attribute identifier set at configuration time for this index which may not
-     * be the OID but an alias name for the attributeType associated with this Index
-     */
-    protected String attributeId;
-
-    /** whether or not this index has been initialized */
-    protected boolean initialized;
-
     /** a custom working directory path when specified in configuration */
     protected File wkDirPath;
 
@@ -143,6 +129,7 @@ public class JdbmIndex<K, O> implements 
      */
     public JdbmIndex()
     {
+        super();
         initialized = false;
     }
 
@@ -152,8 +139,8 @@ public class JdbmIndex<K, O> implements 
      */
     public JdbmIndex( String attributeId )
     {
+        super( attributeId );
         initialized = false;
-        setAttributeId( attributeId );
     }
 
 
@@ -169,11 +156,11 @@ public class JdbmIndex<K, O> implements 
         LOG.debug( "Initializing an Index for attribute '{}'", attributeType.getName() );
         
         keyCache = new SynchronizedLRUMap( cacheSize );
-        attribute = attributeType;
+        this.attributeType = attributeType;
 
         if ( attributeId == null )
         {
-            setAttributeId( attribute.getName() );
+            setAttributeId( attributeType.getName() );
         }
 
         if ( this.wkDirPath == null )
@@ -188,7 +175,7 @@ public class JdbmIndex<K, O> implements 
 
         BaseRecordManager base = new BaseRecordManager( path );
         base.disableTransactions();
-        this.recMan = new CacheRecordManager( base, new MRU( cacheSize ) );
+        this.recMan = new CacheRecordManager( base, new MRU( DEFAULT_INDEX_CACHE_SIZE ) );
 
         try
         {
@@ -202,9 +189,9 @@ public class JdbmIndex<K, O> implements 
         }
 
         // finally write a text file in the format <OID>-<attribute-name>.txt
-        FileWriter fw = new FileWriter( new File( path + "-" + attribute.getName() + ".txt"
) );
+        FileWriter fw = new FileWriter( new File( path + "-" + attributeType.getName() +
".txt" ) );
         // write the AttributeType description
-        fw.write( attribute.toString() );
+        fw.write( attributeType.toString() );
         fw.close();
         
         initialized = true;
@@ -222,11 +209,11 @@ public class JdbmIndex<K, O> implements 
     {
         SerializableComparator<K> comp;
 
-        MatchingRule mr = attribute.getEquality();
+        MatchingRule mr = attributeType.getEquality();
 
         if ( mr == null )
         {
-            throw new IOException( I18n.err( I18n.ERR_574, attribute.getName() ) );
+            throw new IOException( I18n.err( I18n.ERR_574, attributeType.getName() ) );
         }
 
         comp = new SerializableComparator<K>( mr.getOid() );
@@ -239,7 +226,7 @@ public class JdbmIndex<K, O> implements 
         LongComparator.INSTANCE.setSchemaManager( schemaManager );
         comp.setSchemaManager( schemaManager );
 
-        forward = new JdbmTable<K, Long>( schemaManager, attribute.getOid() + FORWARD_BTREE,
numDupLimit, recMan,
+        forward = new JdbmTable<K, Long>( schemaManager, attributeType.getOid() + FORWARD_BTREE,
numDupLimit, recMan,
             comp, LongComparator.INSTANCE, null, LongSerializer.INSTANCE );
 
         /*
@@ -248,46 +235,23 @@ public class JdbmIndex<K, O> implements 
          * is single valued according to its specification based on a schema 
          * then duplicate keys should not be allowed within the reverse table.
          */
-        if ( attribute.isSingleValued() )
+        if ( attributeType.isSingleValued() )
         {
-            reverse = new JdbmTable<Long, K>( schemaManager, attribute.getOid() + REVERSE_BTREE,
recMan,
+            reverse = new JdbmTable<Long, K>( schemaManager, attributeType.getOid()
+ REVERSE_BTREE, recMan,
                 LongComparator.INSTANCE, LongSerializer.INSTANCE, null );
         }
         else
         {
-            reverse = new JdbmTable<Long, K>( schemaManager, attribute.getOid() + REVERSE_BTREE,
numDupLimit, recMan,
+            reverse = new JdbmTable<Long, K>( schemaManager, attributeType.getOid()
+ REVERSE_BTREE, numDupLimit, recMan,
                 LongComparator.INSTANCE, comp, LongSerializer.INSTANCE, null );
         }
     }
 
 
-    /**
-     * @see org.apache.directory.server.xdbm.Index#getAttribute()
-     */
-    public AttributeType getAttribute()
-    {
-        return attribute;
-    }
-
-
     // ------------------------------------------------------------------------
     // C O N F I G U R A T I O N   M E T H O D S
     // ------------------------------------------------------------------------
 
-    /**
-     * Protects configuration properties from being set after initialization.
-     *
-     * @param property the property to protect
-     */
-    private void protect( String property )
-    {
-        if ( initialized )
-        {
-            throw new IllegalStateException( I18n.err( I18n.ERR_575, property ) );
-        }
-    }
-
-
     public boolean isCountExact()
     {
         return false;
@@ -295,31 +259,6 @@ public class JdbmIndex<K, O> implements 
 
 
     /**
-     * Gets the attribute identifier set at configuration time for this index which may not
-     * be the OID but an alias name for the attributeType associated with this Index
-     *
-     * @return configured attribute oid or alias name
-     */
-    public String getAttributeId()
-    {
-        return attributeId;
-    }
-
-
-    /**
-     * Sets the attribute identifier set at configuration time for this index which may not
-     * be the OID but an alias name for the attributeType associated with this Index
-     *
-     * @param attributeId configured attribute oid or alias name
-     */
-    public void setAttributeId( String attributeId )
-    {
-        protect( "attributeId" );
-        this.attributeId = attributeId;
-    }
-
-
-    /**
      * Gets the threshold at which point duplicate keys use btree indirection to store
      * their values.
      *
@@ -345,29 +284,6 @@ public class JdbmIndex<K, O> implements 
 
 
     /**
-     * Gets the size of the index cache in terms of the number of index entries to be cached.
-     *
-     * @return the size of the index cache
-     */
-    public int getCacheSize()
-    {
-        return cacheSize;
-    }
-
-
-    /**
-     * Sets the size of the index cache in terms of the number of index entries to be cached.
-     *
-     * @param cacheSize the size of the index cache
-     */
-    public void setCacheSize( int cacheSize )
-    {
-        protect( "cacheSize" );
-        this.cacheSize = cacheSize;
-    }
-
-
-    /**
      * Sets the working directory path to something other than the default. Sometimes more
      * performance is gained by locating indices on separate disk spindles.
      *
@@ -708,11 +624,11 @@ public class JdbmIndex<K, O> implements 
         {
             if ( attrVal instanceof String )
             {
-                normalized = ( K ) attribute.getEquality().getNormalizer().normalize( ( String
) attrVal );
+                normalized = ( K ) attributeType.getEquality().getNormalizer().normalize(
( String ) attrVal );
             }
             else
             {
-                normalized = ( K ) attribute.getEquality().getNormalizer().normalize(
+                normalized = ( K ) attributeType.getEquality().getNormalizer().normalize(
                     new BinaryValue( ( byte[] ) attrVal ) ).get();
             }
 

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=1029613&r1=1029612&r2=1029613&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
Mon Nov  1 11:12:32 2010
@@ -75,11 +75,11 @@ public class JdbmRdnIndex<E> extends Jdb
         //System.out.println( "IDX Initializing RDNindex for AT " + attributeType.getOid()
+ ", wkDirPath : " + wkDirPath + ", base dir : " + this.wkDirPath );
 
         keyCache = new SynchronizedLRUMap( cacheSize );
-        attribute = attributeType;
+        this.attributeType = attributeType;
 
         if ( attributeId == null )
         {
-            setAttributeId( attribute.getName() );
+            setAttributeId( attributeType.getName() );
         }
         
         if ( this.wkDirPath == null )
@@ -109,9 +109,9 @@ public class JdbmRdnIndex<E> extends Jdb
         }
 
         // finally write a text file in the format <OID>-<attribute-name>.txt
-        FileWriter fw = new FileWriter( new File( path + "-" + attribute.getName() + ".txt"
) );
+        FileWriter fw = new FileWriter( new File( path + "-" + attributeType.getName() +
".txt" ) );
         // write the AttributeType description
-        fw.write( attribute.toString() );
+        fw.write( attributeType.toString() );
         fw.close();
         
         initialized = true;
@@ -128,20 +128,20 @@ public class JdbmRdnIndex<E> extends Jdb
      */
     private void initTables( SchemaManager schemaManager ) throws IOException
     {
-        MatchingRule mr = attribute.getEquality();
+        MatchingRule mr = attributeType.getEquality();
 
         if ( mr == null )
         {
-            throw new IOException( I18n.err( I18n.ERR_574, attribute.getName() ) );
+            throw new IOException( I18n.err( I18n.ERR_574, attributeType.getName() ) );
         }
 
         ParentIdAndRdnComparator<Long> comp = new ParentIdAndRdnComparator<Long>(
mr.getOid() );
 
         LongComparator.INSTANCE.setSchemaManager( schemaManager );
 
-        forward = new JdbmTable<ParentIdAndRdn<Long>, Long>( schemaManager, attribute.getOid()
+ FORWARD_BTREE,
+        forward = new JdbmTable<ParentIdAndRdn<Long>, Long>( schemaManager, attributeType.getOid()
+ FORWARD_BTREE,
             recMan, comp, null, LongSerializer.INSTANCE );
-        reverse = new JdbmTable<Long, ParentIdAndRdn<Long>>( schemaManager, attribute.getOid()
+ REVERSE_BTREE,
+        reverse = new JdbmTable<Long, ParentIdAndRdn<Long>>( schemaManager, attributeType.getOid()
+ REVERSE_BTREE,
             recMan, LongComparator.INSTANCE, LongSerializer.INSTANCE, null );
     }
 

Modified: directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java?rev=1029613&r1=1029612&r2=1029613&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java
(original)
+++ directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndexTest.java
Mon Nov  1 11:12:32 2010
@@ -183,6 +183,7 @@ public class JdbmIndexTest
         catch ( Exception e )
         {
         }
+        
         assertEquals( "ou", idx.getAttributeId() );
 
         destroyIndex();

Added: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java?rev=1029613&view=auto
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java
(added)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java
Mon Nov  1 11:12:32 2010
@@ -0,0 +1,134 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.server.xdbm;
+
+
+import org.apache.directory.server.i18n.I18n;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+
+
+/**
+ * A generic index implementation that is just used to hold the index configuration
+ * parameters (attributeId, cacheSize, wkDirPath). All other methods are not working.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public abstract class AbstractIndex<K, O, ID> implements Index<K, O, ID>
+{
+    /** The attribute identifier for this index */ 
+    protected String attributeId;
+    
+    /** the attribute type resolved for this JdbmIndex */
+    protected AttributeType attributeType;
+
+    /** the size (number of index entries) for the cache */
+    protected int cacheSize = DEFAULT_INDEX_CACHE_SIZE;
+
+    /** whether or not this index has been initialized */
+    protected boolean initialized;
+
+    /**
+     * Creates a new instance of AbstractIndex.
+     * 
+     * @param attributeId the attribute ID
+     */
+    protected AbstractIndex()
+    {
+    }
+
+    
+    /**
+     * Creates a new instance of AbstractIndex.
+     * 
+     * @param attributeId the attribute ID
+     */
+    protected AbstractIndex( String attributeId )
+    {
+        this.attributeId = attributeId;
+    }
+
+
+    public String getAttributeId()
+    {
+        return attributeId;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public AttributeType getAttribute()
+    {
+        return attributeType;
+    }
+
+
+    public void setAttributeId( String attributeId )
+    {
+        protect( "attributeId" );
+        this.attributeId = attributeId;
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean isDupsEnabled()
+    {
+        return false;
+    }
+    
+    
+    /**
+     * Gets the size of the index cache in terms of the number of index entries to be cached.
+     *
+     * @return the size of the index cache
+     */
+    public int getCacheSize()
+    {
+        return cacheSize;
+    }
+
+
+    /**
+     * Sets the size of the index cache in terms of the number of index entries to be cached.
+     *
+     * @param cacheSize the size of the index cache
+     */
+    public void setCacheSize( int cacheSize )
+    {
+        protect( "cacheSize" );
+        this.cacheSize = cacheSize;
+    }
+    
+    
+    /**
+     * Protects configuration properties from being set after initialization.
+     *
+     * @param property the property to protect
+     */
+    protected void protect( String property )
+    {
+        if ( initialized )
+        {
+            throw new IllegalStateException( I18n.err( I18n.ERR_575, property ) );
+        }
+    }
+}

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java?rev=1029613&r1=1029612&r2=1029613&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java
Mon Nov  1 11:12:32 2010
@@ -32,7 +32,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class GenericIndex<K, O, ID> implements Index<K, O, ID>
+public class GenericIndex<K, O, ID> extends AbstractIndex<K, O, ID>
 {
     /** The attribute identifier for this index */ 
     protected String attributeId;
@@ -76,6 +76,7 @@ public class GenericIndex<K, O, ID> impl
      */
     public GenericIndex( String attributeId, int cacheSize, File wkDirPath )
     {
+        super( attributeId );
         this.attributeId = attributeId;
         this.cacheSize = cacheSize;
         this.wkDirPath = wkDirPath;

Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java?rev=1029613&r1=1029612&r2=1029613&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
Mon Nov  1 11:12:32 2010
@@ -25,7 +25,7 @@ import java.io.File;
 import org.apache.directory.server.core.partition.impl.btree.IndexCursorAdaptor;
 import org.apache.directory.server.core.partition.impl.btree.LongComparator;
 import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.xdbm.Index;
+import org.apache.directory.server.xdbm.AbstractIndex;
 import org.apache.directory.server.xdbm.IndexCursor;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.cursor.Tuple;
@@ -42,23 +42,22 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class AvlIndex<K, O> implements Index<K, O, Long>
+public class AvlIndex<K, O> extends AbstractIndex<K, O, Long>
 {
     protected Normalizer normalizer;
-    protected AttributeType attributeType;
     protected AvlTable<K, Long> forward;
     protected AvlTable<Long, K> reverse;
-    protected String attributeId;
 
 
     public AvlIndex()
     {
+        super();
     }
 
 
     public AvlIndex( String attributeId )
     {
-        setAttributeId( attributeId );
+        super( attributeId );
     }
 
 
@@ -275,24 +274,6 @@ public class AvlIndex<K, O> implements I
     /**
      * {@inheritDoc}
      */
-    public AttributeType getAttribute()
-    {
-        return attributeType;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
-    public String getAttributeId()
-    {
-        return attributeId;
-    }
-
-
-    /**
-     * {@inheritDoc}
-     */
     @SuppressWarnings("unchecked")
     public K getNormalized( K attrVal ) throws Exception
     {
@@ -432,15 +413,6 @@ public class AvlIndex<K, O> implements I
 
 
     /**
-     * {@inheritDoc}
-     */
-    public void setAttributeId( String attributeId )
-    {
-        this.attributeId = attributeId;
-    }
-
-
-    /**
      * throws UnsupportedOperationException cause it is a in-memory index
      */
     public void setWkDirPath( File wkDirPath )
@@ -459,21 +431,6 @@ public class AvlIndex<K, O> implements I
 
 
     /**
-     * throws UnsupportedOperationException cause it is a in-memory index
-     */
-    public void setCacheSize( int cacheSize )
-    {
-        throw new UnsupportedOperationException( I18n.err( I18n.ERR_214 ) );
-    }
-
-
-    public int getCacheSize()
-    {
-        return 0;
-    }
-
-
-    /**
      * {@inheritDoc}
      */
     public boolean isDupsEnabled()

Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java?rev=1029613&r1=1029612&r2=1029613&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java
(original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java
Mon Nov  1 11:12:32 2010
@@ -33,7 +33,6 @@ import org.apache.directory.server.const
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexEntry;
 import org.apache.directory.server.xdbm.ParentIdAndRdn;
-import org.apache.directory.server.xdbm.impl.avl.AvlRdnIndex;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -45,6 +44,7 @@ import org.apache.directory.shared.ldap.
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 
@@ -147,6 +147,7 @@ public class AvlRdnIndexTest
     // -----------------------------------------------------------------------
 
     @Test(expected = UnsupportedOperationException.class)
+    @Ignore
     public void testCacheSize() throws Exception
     {
         // uninitialized index



Mime
View raw message