You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2011/07/07 22:27:44 UTC
svn commit: r1144020 - in /directory/apacheds/trunk/xdbm-partition/src:
main/java/org/apache/directory/server/xdbm/
main/java/org/apache/directory/server/xdbm/impl/avl/
main/java/org/apache/directory/server/xdbm/search/impl/
test/java/org/apache/direct...
Author: elecharny
Date: Thu Jul 7 20:27:43 2011
New Revision: 1144020
URL: http://svn.apache.org/viewvc?rev=1144020&view=rev
Log:
o Renamed the apacheExistence AT to apachePresence
Modified:
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java
directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1144020&r1=1144019&r2=1144020&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Thu Jul 7 20:27:43 2011
@@ -291,7 +291,7 @@ public abstract class AbstractStore<E, I
// add missing system indices
if ( getPresenceIndex() == null )
{
- Index<String, E, ID> index = new GenericIndex<String, E, ID>( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID ) ;
+ Index<String, E, ID> index = new GenericIndex<String, E, ID>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID ) ;
index.setWkDirPath( partitionPath );
addIndex( index );
}
@@ -369,7 +369,7 @@ public abstract class AbstractStore<E, I
// set index shortcuts
rdnIdx = ( Index<ParentIdAndRdn<ID>, E, ID> ) systemIndices.get( ApacheSchemaConstants.APACHE_RDN_AT_OID );
- presenceIdx = ( Index<String, E, ID> ) systemIndices.get( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID );
+ presenceIdx = ( Index<String, E, ID> ) systemIndices.get( ApacheSchemaConstants.APACHE_PRESENCE_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 );
aliasIdx = ( Index<String, E, ID> ) systemIndices.get( ApacheSchemaConstants.APACHE_ALIAS_AT_OID );
@@ -627,7 +627,7 @@ public abstract class AbstractStore<E, I
@SuppressWarnings("unchecked")
public Index<String, E, ID> getPresenceIndex()
{
- return ( Index<String, E, ID> ) systemIndices.get( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID );
+ return ( Index<String, E, ID> ) systemIndices.get( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID );
}
@@ -1503,7 +1503,7 @@ public abstract class AbstractStore<E, I
( ( Index ) index ).add( value.getValue(), id );
}
- // If the attr didn't exist for this id add it to existence index
+ // If the attr didn't exist for this id add it to presence index
if ( !presenceIdx.forward( modsOid, id ) )
{
presenceIdx.add( modsOid, id );
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=1144020&r1=1144019&r2=1144020&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java Thu Jul 7 20:27:43 2011
@@ -94,7 +94,7 @@ public interface Store<E, ID extends Com
*/
public static final String[] SYS_INDEX_OID_ARRAY =
{
- ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID,
+ ApacheSchemaConstants.APACHE_PRESENCE_AT_OID,
ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID,
ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID,
ApacheSchemaConstants.APACHE_RDN_AT_OID,
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java?rev=1144020&r1=1144019&r2=1144020&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java Thu Jul 7 20:27:43 2011
@@ -105,12 +105,12 @@ public class AvlStore<E> extends Abstrac
/**
- * always returns null, cause this is a in-memory store
+ * always returns null, because this is a in-memory store
*/
@Override
public URI getPartitionPath()
{
- // returns null always
+ // returns null, always
return null;
}
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java?rev=1144020&r1=1144019&r2=1144020&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java Thu Jul 7 20:27:43 2011
@@ -338,7 +338,7 @@ public class DefaultOptimizer<E, ID exte
/**
* Gets the number of entries that would be returned by a presence node
- * assertion. Leverages the existence system index for scan counts.
+ * assertion. Leverages the presence system index for scan counts.
*
* @param node the presence node
* @return the number of entries matched for the presence of an attribute
Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java?rev=1144020&r1=1144019&r2=1144020&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java Thu Jul 7 20:27:43 2011
@@ -26,8 +26,8 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.IndexEntry;
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.server.xdbm.search.Evaluator;
-import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.Attribute;
+import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.filter.PresenceNode;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
Modified: directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java?rev=1144020&r1=1144019&r2=1144020&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java (original)
+++ directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java Thu Jul 7 20:27:43 2011
@@ -168,7 +168,7 @@ public class AvlStoreTest
assertEquals( 0, store.getCacheSize() );
assertNull( store.getPresenceIndex() );
- store.addIndex( new AvlIndex<String, Attributes>( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID ) );
+ store.addIndex( new AvlIndex<String, Attributes>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID ) );
assertNotNull( store.getPresenceIndex() );
assertNull( store.getOneLevelIndex() );
@@ -238,7 +238,7 @@ public class AvlStoreTest
try
{
- store.addIndex( new AvlIndex<String, Entry>( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID ) );
+ store.addIndex( new AvlIndex<String, Entry>( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID ) );
fail();
}
catch ( IllegalStateException e )