directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r940320 - in /directory/apacheds/trunk: avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/ jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ xdbm-base/src/main/java/org/apache/dire...
Date Sun, 02 May 2010 21:31:10 GMT
Author: seelmann
Date: Sun May  2 21:31:10 2010
New Revision: 940320

URL: http://svn.apache.org/viewvc?rev=940320&view=rev
Log:
Removed ndn index

Modified:
    directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
    directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
    directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java

Modified: directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java?rev=940320&r1=940319&r2=940320&view=diff
==============================================================================
--- directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
(original)
+++ directory/apacheds/trunk/avl-partition/src/test/java/org/apache/directory/server/core/partition/avl/AvlStoreTest.java
Sun May  2 21:31:10 2010
@@ -310,7 +310,7 @@ public class AvlStoreTest
 
         Iterator<String> systemIndices = store.systemIndices();
 
-        for ( int ii = 0; ii < 11; ii++ )
+        for ( int ii = 0; ii < 10; ii++ )
         {
             assertTrue( systemIndices.hasNext() );
             assertNotNull( systemIndices.next() );

Modified: directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=940320&r1=940319&r2=940320&view=diff
==============================================================================
--- directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
(original)
+++ directory/apacheds/trunk/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
Sun May  2 21:31:10 2010
@@ -377,7 +377,7 @@ public class JdbmStoreTest
 
         Iterator<String> systemIndices = store.systemIndices();
 
-        for ( int ii = 0; ii < 11; ii++ )
+        for ( int ii = 0; ii < 10; ii++ )
         {
             assertTrue( systemIndices.hasNext() );
             assertNotNull( systemIndices.next() );

Modified: directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=940320&r1=940319&r2=940320&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
(original)
+++ directory/apacheds/trunk/xdbm-base/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
Sun May  2 21:31:10 2010
@@ -107,9 +107,6 @@ public abstract class AbstractStore<E, I
     /** a map of attributeType numeric ID to system userIndices */
     protected Map<String, Index<?, E, ID>> systemIndices = new HashMap<String,
Index<?, E, ID>>();
 
-    /** the normalized distinguished name index */
-    protected Index<String, E, ID> ndnIdx;
-
     /** the attribute presence index */
     protected Index<String, E, ID> presenceIdx;
 
@@ -250,7 +247,6 @@ public abstract class AbstractStore<E, I
     /**
      * Sets up the user indices.
      */
-    @SuppressWarnings("unchecked")
     protected void setupUserIndices() throws Exception
     {
         // convert and initialize system indices
@@ -298,10 +294,6 @@ public abstract class AbstractStore<E, I
         {
             addIndex( new GenericIndex<ParentIdAndRdn<ID>, E, ID>( ApacheSchemaConstants.APACHE_RDN_AT_OID
) );
         }
-        if ( getNdnIndex() == null )
-        {
-            addIndex( new GenericIndex<String, E, ID>( ApacheSchemaConstants.APACHE_N_DN_AT_OID
) );
-        }
         if ( getAliasIndex() == null )
         {
             addIndex( new GenericIndex<String, E, ID>( ApacheSchemaConstants.APACHE_ALIAS_AT_OID
) );
@@ -337,7 +329,6 @@ public abstract class AbstractStore<E, I
 
         // set index shortcuts
         rdnIdx = ( Index<ParentIdAndRdn<ID>, E, ID> ) systemIndices.get( ApacheSchemaConstants.APACHE_RDN_AT_OID
);
-        ndnIdx = ( Index<String, E, ID> ) systemIndices.get( ApacheSchemaConstants.APACHE_N_DN_AT_OID
);
         presenceIdx = ( Index<String, E, ID> ) systemIndices.get( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID
);
         oneLevelIdx = ( Index<ID, E, ID> ) systemIndices.get( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID
);
         subLevelIdx = ( Index<ID, E, ID> ) systemIndices.get( ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID
);
@@ -550,7 +541,6 @@ public abstract class AbstractStore<E, I
     /**
      * {@inheritDoc}
      */
-    @SuppressWarnings("unchecked")
     public Index<String, E, ID> getNdnIndex()
     {
         return getEntryUuidIndex();
@@ -990,6 +980,7 @@ public abstract class AbstractStore<E, I
     /**
      * {@inheritDoc}
      */
+    @SuppressWarnings("unchecked")
     public synchronized void delete( ID id ) throws Exception
     {
         Entry entry = master.get( id );



Mime
View raw message