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 2012/08/23 18:17:07 UTC
svn commit: r1376574 [1/2] - in /directory/apacheds/branches/apacheds-mvbt:
jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/
ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/
server-co...
Author: elecharny
Date: Thu Aug 23 16:17:05 2012
New Revision: 1376574
URL: http://svn.apache.org/viewvc?rev=1376574&view=rev
Log:
o Removed the third parameter in the IndexCursor interface (the E for Entry) : it's not used anywhere
o Changed the implementations accordingly
Modified:
directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
directory/apacheds/branches/apacheds-mvbt/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
directory/apacheds/branches/apacheds-mvbt/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java
directory/apacheds/branches/apacheds-mvbt/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
directory/apacheds/branches/apacheds-mvbt/server-integ/src/test/java/org/apache/directory/IndexTest.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ChildrenCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DescendantCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractIndexCursorTest.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/EmptyIndexCursorTest.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexUtils.java
Modified: directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Thu Aug 23 16:17:05 2012
@@ -429,44 +429,44 @@ public class JdbmIndex<K, V> extends Abs
// Index Cursor Operations
// ------------------------------------------------------------------------
@SuppressWarnings("unchecked")
- public IndexCursor<K, V, Long> reverseCursor() throws Exception
+ public IndexCursor<K, Long> reverseCursor() throws Exception
{
if ( withReverse )
{
- return new IndexCursorAdaptor<K, V, Long>( ( Cursor ) reverse.cursor(), false );
+ return new IndexCursorAdaptor<K, Long>( ( Cursor ) reverse.cursor(), false );
}
else
{
- return new EmptyIndexCursor<K, V, Long>();
+ return new EmptyIndexCursor<K, Long>();
}
}
@SuppressWarnings("unchecked")
- public IndexCursor<K, V, Long> forwardCursor() throws Exception
+ public IndexCursor<K, Long> forwardCursor() throws Exception
{
- return new IndexCursorAdaptor<K, V, Long>( ( Cursor ) forward.cursor(), true );
+ return new IndexCursorAdaptor<K, Long>( ( Cursor ) forward.cursor(), true );
}
@SuppressWarnings("unchecked")
- public IndexCursor<K, V, Long> reverseCursor( Long id ) throws Exception
+ public IndexCursor<K, Long> reverseCursor( Long id ) throws Exception
{
if ( withReverse )
{
- return new IndexCursorAdaptor<K, V, Long>( ( Cursor ) reverse.cursor( id ), false );
+ return new IndexCursorAdaptor<K, Long>( ( Cursor ) reverse.cursor( id ), false );
}
else
{
- return new EmptyIndexCursor<K, V, Long>();
+ return new EmptyIndexCursor<K, Long>();
}
}
@SuppressWarnings("unchecked")
- public IndexCursor<K, V, Long> forwardCursor( K key ) throws Exception
+ public IndexCursor<K, Long> forwardCursor( K key ) throws Exception
{
- return new IndexCursorAdaptor<K, V, Long>( ( Cursor ) forward.cursor( key ), true );
+ return new IndexCursorAdaptor<K, Long>( ( Cursor ) forward.cursor( key ), true );
}
Modified: directory/apacheds/branches/apacheds-mvbt/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/LdifPartition.java Thu Aug 23 16:17:05 2012
@@ -383,19 +383,20 @@ public class LdifPartition extends Abstr
{
// First, add the new entry
addEntry( modifiedEntry );
-
+
Long baseId = getEntryId( modifiedEntry.getDn() );
- ParentIdAndRdn<Long> parentIdAndRdn = getRdnIndex().reverseLookup( baseId );
+ ParentIdAndRdn<Long> parentIdAndRdn = getRdnIndex().reverseLookup( baseId );
IndexEntry indexEntry = new ForwardIndexEntry();
-
- indexEntry.setId(baseId);
+
+ indexEntry.setId( baseId );
indexEntry.setKey( parentIdAndRdn );
- IndexCursor<ParentIdAndRdn<Long>,Entry, Long> cursor = new SingletonIndexCursor<ParentIdAndRdn<Long>, Long>( indexEntry );
+ IndexCursor<ParentIdAndRdn<Long>, Long> cursor = new SingletonIndexCursor<ParentIdAndRdn<Long>, Long>(
+ indexEntry );
Long parentId = parentIdAndRdn.getParentId();
- IndexCursor<Long, Entry, Long> scopeCursor = new DescendantCursor( this, baseId, parentId, cursor );
+ IndexCursor<Long, Long> scopeCursor = new DescendantCursor( this, baseId, parentId, cursor );
// Then, if there are some children, move then to the new place
try
@@ -417,7 +418,7 @@ public class LdifPartition extends Abstr
{
throw new LdapOperationException( e.getMessage(), e );
}
-
+
// And delete the old entry's LDIF file
File file = getFile( oldEntryDn, DELETE );
boolean deleted = deleteFile( file );
Modified: directory/apacheds/branches/apacheds-mvbt/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/SingleFileLdifPartition.java Thu Aug 23 16:17:05 2012
@@ -300,14 +300,14 @@ public class SingleFileLdifPartition ext
}
ParentIdAndRdn<Long> suffixEntry = rdnIdx.reverseLookup( suffixId );
-
+
if ( suffixEntry != null )
{
Entry entry = master.get( suffixId );
entry.setDn( suffixDn );
appendLdif( entry );
-
+
appendRecursive( suffixId, suffixEntry.getNbChildren() );
}
@@ -324,17 +324,17 @@ public class SingleFileLdifPartition ext
}
}
-
+
private void appendRecursive( Long id, int nbSibbling ) throws Exception
{
// Start with the root
- IndexCursor<ParentIdAndRdn<Long>,Entry,Long> cursor = rdnIdx.forwardCursor();
-
+ IndexCursor<ParentIdAndRdn<Long>, Long> cursor = rdnIdx.forwardCursor();
+
IndexEntry<ParentIdAndRdn<Long>, Long> startingPos = new ForwardIndexEntry<ParentIdAndRdn<Long>, Long>();
- startingPos.setKey( new ParentIdAndRdn<Long>( id, (Rdn[]) null ) );
+ startingPos.setKey( new ParentIdAndRdn<Long>( id, ( Rdn[] ) null ) );
cursor.before( startingPos );
int countChildren = 0;
-
+
while ( cursor.next() && ( countChildren < nbSibbling ) )
{
IndexEntry<ParentIdAndRdn<Long>, Long> element = cursor.get();
@@ -344,16 +344,16 @@ public class SingleFileLdifPartition ext
appendLdif( entry );
countChildren++;
-
+
// And now, the children
int nbChildren = element.getKey().getNbChildren();
-
+
if ( nbChildren > 0 )
{
appendRecursive( childId, nbChildren );
}
}
-
+
cursor.close();
}
Modified: directory/apacheds/branches/apacheds-mvbt/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java Thu Aug 23 16:17:05 2012
@@ -726,7 +726,7 @@ public class ConfigPartitionReader
// Prepare the search request
AttributeType adsdAt = schemaManager.getAttributeType( SchemaConstants.OBJECT_CLASS_AT );
EqualityNode<?> filter = new EqualityNode( adsdAt, new StringValue( name ) );
- IndexCursor<Long, Entry, Long> cursor = null;
+ IndexCursor<Long, Long> cursor = null;
// Create a container for all the read beans
List<AdsBaseBean> beans = new ArrayList<AdsBaseBean>();
Modified: directory/apacheds/branches/apacheds-mvbt/server-integ/src/test/java/org/apache/directory/IndexTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/server-integ/src/test/java/org/apache/directory/IndexTest.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/server-integ/src/test/java/org/apache/directory/IndexTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/server-integ/src/test/java/org/apache/directory/IndexTest.java Thu Aug 23 16:17:05 2012
@@ -129,7 +129,7 @@ public class IndexTest
assertEquals( 26, idx.count() );
- IndexCursor<String, Entry, Long> cursor1 = idx.forwardCursor();
+ IndexCursor<String, Long> cursor1 = idx.forwardCursor();
cursor1.beforeFirst();
assertHasNext( cursor1, 1L );
@@ -148,7 +148,7 @@ public class IndexTest
}
- private void assertHasNext( IndexCursor<String, Entry, Long> cursor1, long expectedId ) throws Exception
+ private void assertHasNext( IndexCursor<String, Long> cursor1, long expectedId ) throws Exception
{
assertTrue( cursor1.next() );
assertEquals( expectedId, cursor1.get().getId().longValue() );
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java Thu Aug 23 16:17:05 2012
@@ -546,7 +546,7 @@ public abstract class AbstractBTreeParti
public void dumpRdnIdx( ID id, String tabs ) throws Exception
{
// Start with the root
- IndexCursor<ParentIdAndRdn<ID>, Entry, ID> cursor = rdnIdx.forwardCursor();
+ IndexCursor<ParentIdAndRdn<ID>, ID> cursor = rdnIdx.forwardCursor();
IndexEntry<ParentIdAndRdn<ID>, ID> startingPos = new ForwardIndexEntry<ParentIdAndRdn<ID>, ID>();
startingPos.setKey( new ParentIdAndRdn( id, ( Rdn[] ) null ) );
@@ -565,7 +565,7 @@ public abstract class AbstractBTreeParti
private void dumpRdnIdx( ID id, int nbSibbling, String tabs ) throws Exception
{
// Start with the root
- IndexCursor<ParentIdAndRdn<ID>, Entry, ID> cursor = rdnIdx.forwardCursor();
+ IndexCursor<ParentIdAndRdn<ID>, ID> cursor = rdnIdx.forwardCursor();
IndexEntry<ParentIdAndRdn<ID>, ID> startingPos = new ForwardIndexEntry<ParentIdAndRdn<ID>, ID>();
startingPos.setKey( new ParentIdAndRdn( id, ( Rdn[] ) null ) );
@@ -928,13 +928,13 @@ public abstract class AbstractBTreeParti
/**
* {@inheritDoc}
*/
- public final IndexCursor<ID, Entry, ID> list( ID id ) throws LdapException
+ public final IndexCursor<ID, ID> list( ID id ) throws LdapException
{
try
{
// We use the OneLevel index to get all the entries from a starting point
// and below up to the number of children
- IndexCursor<ParentIdAndRdn<ID>, Entry, ID> cursor = rdnIdx.forwardCursor();
+ IndexCursor<ParentIdAndRdn<ID>, ID> cursor = rdnIdx.forwardCursor();
IndexEntry<ParentIdAndRdn<ID>, ID> startingPos = new ForwardIndexEntry<ParentIdAndRdn<ID>, ID>();
startingPos.setKey( new ParentIdAndRdn( id, ( Rdn[] ) null ) );
@@ -962,7 +962,7 @@ public abstract class AbstractBTreeParti
try
{
SearchScope scope = searchContext.getScope();
- IndexCursor<ID, Entry, ID> underlying;
+ IndexCursor<ID, ID> underlying;
Dn dn = searchContext.getDn();
AliasDerefMode derefMode = searchContext.getAliasDerefMode();
ExprNode filter = searchContext.getFilter();
@@ -2655,7 +2655,7 @@ public abstract class AbstractBTreeParti
{
try
{
- IndexCursor<?, Entry, ID> cursor = index.forwardCursor();
+ IndexCursor<?, ID> cursor = index.forwardCursor();
while ( cursor.next() )
{
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/EntryCursorAdaptor.java Thu Aug 23 16:17:05 2012
@@ -44,10 +44,10 @@ public class EntryCursorAdaptor<ID exten
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
private final AbstractBTreePartition<ID> db;
- private final IndexCursor<ID, Entry, ID> indexCursor;
+ private final IndexCursor<ID, ID> indexCursor;
- public EntryCursorAdaptor( AbstractBTreePartition<ID> db, IndexCursor<ID, Entry, ID> indexCursor )
+ public EntryCursorAdaptor( AbstractBTreePartition<ID> db, IndexCursor<ID, ID> indexCursor )
{
LOG_CURSOR.debug( "Creating EntryCursorAdaptor {}", this );
this.db = db;
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java Thu Aug 23 16:17:05 2012
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class IndexCursorAdaptor<K, O, ID> extends AbstractIndexCursor<K, O, ID>
+public class IndexCursorAdaptor<K, ID> extends AbstractIndexCursor<K, ID>
{
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
@@ -222,6 +222,7 @@ public class IndexCursorAdaptor<K, O, ID
.concat( "." ).concat( "isLast()" ) ) );
}
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java Thu Aug 23 16:17:05 2012
@@ -28,8 +28,8 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AbstractIndexCursor<V, Entry, ID> extends AbstractCursor<IndexEntry<V, ID>> implements
- IndexCursor<V, Entry, ID>
+public abstract class AbstractIndexCursor<V, ID> extends AbstractCursor<IndexEntry<V, ID>> implements
+ IndexCursor<V, ID>
{
/** Tells if there are some element available in the cursor */
private boolean available = false;
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java Thu Aug 23 16:17:05 2012
@@ -30,17 +30,18 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class EmptyIndexCursor<K, E, ID> extends AbstractIndexCursor<K, E, ID>
+public class EmptyIndexCursor<K, ID> extends AbstractIndexCursor<K, ID>
{
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
+
public EmptyIndexCursor()
{
LOG_CURSOR.debug( "Creating EmptyIndexCursor {}", this );
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -132,11 +133,11 @@ public class EmptyIndexCursor<K, E, ID>
checkNotClosed( "after()" );
}
-
+
/**
* {@inheritDoc}
*/
- public void close( ) throws Exception
+ public void close() throws Exception
{
LOG_CURSOR.debug( "Closing EmptyIndexCursor {}", this );
super.close();
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java Thu Aug 23 16:17:05 2012
@@ -195,16 +195,16 @@ public interface Index<K, O, ID>
void drop( K attrVal, ID id ) throws Exception;
- IndexCursor<K, O, ID> reverseCursor() throws Exception;
+ IndexCursor<K, ID> reverseCursor() throws Exception;
- IndexCursor<K, O, ID> forwardCursor() throws Exception;
+ IndexCursor<K, ID> forwardCursor() throws Exception;
- IndexCursor<K, O, ID> reverseCursor( ID id ) throws Exception;
+ IndexCursor<K, ID> reverseCursor( ID id ) throws Exception;
- IndexCursor<K, O, ID> forwardCursor( K key ) throws Exception;
+ IndexCursor<K, ID> forwardCursor( K key ) throws Exception;
Cursor<K> reverseValueCursor( ID id ) throws Exception;
@@ -261,8 +261,8 @@ public interface Index<K, O, ID>
* @return true if duplicate keys are allowed false otherwise
*/
boolean isDupsEnabled();
-
-
+
+
/**
* Tells if the index has a reverse table or not
* @return true if the index has a reverse table
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexCursor.java Thu Aug 23 16:17:05 2012
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface IndexCursor<V, E, ID> extends Cursor<IndexEntry<V, ID>>
+public interface IndexCursor<V, ID> extends Cursor<IndexEntry<V, ID>>
{
/**
* An alternative to calling before(IndexEntry) which often may require
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java Thu Aug 23 16:17:05 2012
@@ -21,7 +21,6 @@ package org.apache.directory.server.xdbm
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.model.entry.Entry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,7 +30,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class SingletonIndexCursor<V, ID> extends AbstractIndexCursor<V, Entry, ID>
+public class SingletonIndexCursor<V, ID> extends AbstractIndexCursor<V, ID>
{
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java Thu Aug 23 16:17:05 2012
@@ -343,7 +343,7 @@ public interface Store<E, ID extends Com
* @return an IndexEntry Cursor over the child entries
* @throws Exception on failures to access the underlying store
*/
- IndexCursor<ID, E, ID> list( ID id ) throws Exception;
+ IndexCursor<ID, ID> list( ID id ) throws Exception;
/**
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java Thu Aug 23 16:17:05 2012
@@ -233,7 +233,7 @@ public class AvlIndex<K, O> extends Abst
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public IndexCursor<K, O, Long> forwardCursor() throws Exception
+ public IndexCursor<K, Long> forwardCursor() throws Exception
{
return new IndexCursorAdaptor( forward.cursor(), true );
}
@@ -243,7 +243,7 @@ public class AvlIndex<K, O> extends Abst
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public IndexCursor<K, O, Long> forwardCursor( K key ) throws Exception
+ public IndexCursor<K, Long> forwardCursor( K key ) throws Exception
{
return new IndexCursorAdaptor( forward.cursor( key ), true );
}
@@ -357,7 +357,7 @@ public class AvlIndex<K, O> extends Abst
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public IndexCursor<K, O, Long> reverseCursor() throws Exception
+ public IndexCursor<K, Long> reverseCursor() throws Exception
{
if ( withReverse )
{
@@ -365,7 +365,7 @@ public class AvlIndex<K, O> extends Abst
}
else
{
- return new EmptyIndexCursor<K, O, Long>();
+ return new EmptyIndexCursor<K, Long>();
}
}
@@ -374,7 +374,7 @@ public class AvlIndex<K, O> extends Abst
* {@inheritDoc}
*/
@SuppressWarnings("unchecked")
- public IndexCursor<K, O, Long> reverseCursor( Long id ) throws Exception
+ public IndexCursor<K, Long> reverseCursor( Long id ) throws Exception
{
if ( withReverse )
{
@@ -382,7 +382,7 @@ public class AvlIndex<K, O> extends Abst
}
else
{
- return new EmptyIndexCursor<K, O, Long>();
+ return new EmptyIndexCursor<K, Long>();
}
}
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/SearchEngine.java Thu Aug 23 16:17:05 2012
@@ -20,13 +20,13 @@
package org.apache.directory.server.xdbm.search;
+import org.apache.directory.server.xdbm.IndexCursor;
import org.apache.directory.shared.ldap.model.constants.JndiPropertyConstants;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.filter.ExprNode;
import org.apache.directory.shared.ldap.model.message.AliasDerefMode;
import org.apache.directory.shared.ldap.model.message.SearchScope;
import org.apache.directory.shared.ldap.model.name.Dn;
-import org.apache.directory.server.xdbm.IndexCursor;
/**
@@ -82,7 +82,7 @@ public interface SearchEngine<E, ID>
* @return enumeration over SearchResults
* @throws Exception if the search fails
*/
- IndexCursor<ID, E, ID> cursor( Dn base, AliasDerefMode aliasDerefMode, ExprNode filter,
+ IndexCursor<ID, ID> cursor( Dn base, AliasDerefMode aliasDerefMode, ExprNode filter,
SearchScope scope ) throws Exception;
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java Thu Aug 23 16:17:05 2012
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class AllEntriesCursor<ID extends Comparable<ID>> extends AbstractIndexCursor<ID, Entry, ID>
+public class AllEntriesCursor<ID extends Comparable<ID>> extends AbstractIndexCursor<ID, ID>
{
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
@@ -45,7 +45,7 @@ public class AllEntriesCursor<ID extends
private IndexEntry<ID, ID> indexEntry = new ForwardIndexEntry<ID, ID>();
/** The cursor on the EntryUUID index */
- private final IndexCursor<String, Entry, ID> wrapped;
+ private final IndexCursor<String, ID> wrapped;
/**
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java Thu Aug 23 16:17:05 2012
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class AndCursor<V, ID> extends AbstractIndexCursor<V, Entry, ID>
+public class AndCursor<V, ID> extends AbstractIndexCursor<V, ID>
{
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
@@ -50,7 +50,7 @@ public class AndCursor<V, ID> extends Ab
private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_707 );
/** */
- private final IndexCursor<V, Entry, ID> wrapped;
+ private final IndexCursor<V, ID> wrapped;
/** The evaluators used for the members of the And filter */
private final List<Evaluator<? extends ExprNode, Entry, ID>> evaluators;
@@ -63,7 +63,7 @@ public class AndCursor<V, ID> extends Ab
* @param wrapped The encapsulated IndexCursor
* @param evaluators The list of evaluators associated wth the elements
*/
- public AndCursor( IndexCursor<V, Entry, ID> wrapped,
+ public AndCursor( IndexCursor<V, ID> wrapped,
List<Evaluator<? extends ExprNode, Entry, ID>> evaluators )
{
LOG_CURSOR.debug( "Creating AndCursor {}", this );
@@ -181,11 +181,11 @@ public class AndCursor<V, ID> extends Ab
throw new InvalidCursorPositionException( I18n.err( I18n.ERR_708 ) );
}
-
+
/**
* {@inheritDoc}
*/
- public void close( ) throws Exception
+ public void close() throws Exception
{
LOG_CURSOR.debug( "Closing AndCursor {}", this );
super.close();
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java Thu Aug 23 16:17:05 2012
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ApproximateCursor<V, ID extends Comparable<ID>> extends AbstractIndexCursor<V, Entry, ID>
+public class ApproximateCursor<V, ID extends Comparable<ID>> extends AbstractIndexCursor<V, ID>
{
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
@@ -57,10 +57,10 @@ public class ApproximateCursor<V, ID ext
private final ApproximateEvaluator<V, ID> approximateEvaluator;
/** Cursor over attribute entry matching filter: set when index present */
- private final IndexCursor<V, Entry, ID> userIdxCursor;
+ private final IndexCursor<V, ID> userIdxCursor;
/** NDN Cursor on all entries in (set when no index on user attribute) */
- private final IndexCursor<String, Entry, ID> uuidIdxCursor;
+ private final IndexCursor<String, ID> uuidIdxCursor;
/**
@@ -356,5 +356,4 @@ public class ApproximateCursor<V, ID ext
}
}
-
}
\ No newline at end of file
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ChildrenCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ChildrenCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ChildrenCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ChildrenCursor.java Thu Aug 23 16:17:05 2012
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ChildrenCursor<ID extends Comparable<ID>> extends AbstractIndexCursor<ID, Entry, ID>
+public class ChildrenCursor<ID extends Comparable<ID>> extends AbstractIndexCursor<ID, ID>
{
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
@@ -47,17 +47,18 @@ public class ChildrenCursor<ID extends C
private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_719 );
/** A Cursor over the entries in the scope of the search base */
- private final IndexCursor<ParentIdAndRdn<ID>,Entry, ID> cursor;
+ private final IndexCursor<ParentIdAndRdn<ID>, ID> cursor;
/** The entry database/store */
private final Store<Entry, ID> db;
-
+
/** The Parent ID */
private ID parentId;
-
+
/** The prefetched element */
private IndexEntry<ID, ID> prefetched;
+
/**
* Creates a Cursor over entries satisfying one level scope criteria.
*
@@ -65,7 +66,7 @@ public class ChildrenCursor<ID extends C
* @param evaluator an IndexEntry (candidate) evaluator
* @throws Exception on db access failures
*/
- public ChildrenCursor( Store<Entry, ID> db, ID parentId, IndexCursor<ParentIdAndRdn<ID>,Entry, ID> cursor )
+ public ChildrenCursor( Store<Entry, ID> db, ID parentId, IndexCursor<ParentIdAndRdn<ID>, ID> cursor )
throws Exception
{
LOG_CURSOR.debug( "Creating ChildrenCursor {}", this );
@@ -100,7 +101,7 @@ public class ChildrenCursor<ID extends C
public boolean first() throws Exception
{
beforeFirst();
-
+
return next();
}
@@ -114,20 +115,20 @@ public class ChildrenCursor<ID extends C
public boolean previous() throws Exception
{
checkNotClosed( "next()" );
-
+
boolean hasPrevious = cursor.previous();
-
+
if ( hasPrevious )
{
IndexEntry entry = cursor.get();
-
- if ( ((ParentIdAndRdn<ID>)entry.getTuple().getKey()).getParentId().equals( parentId ) )
+
+ if ( ( ( ParentIdAndRdn<ID> ) entry.getTuple().getKey() ).getParentId().equals( parentId ) )
{
prefetched = entry;
return true;
}
}
-
+
return false;
}
@@ -138,26 +139,26 @@ public class ChildrenCursor<ID extends C
public boolean next() throws Exception
{
checkNotClosed( "next()" );
-
+
boolean hasNext = cursor.next();
-
+
if ( hasNext )
{
IndexEntry cursorEntry = cursor.get();
IndexEntry<ID, ID> entry = new ForwardIndexEntry();
- entry.setId( (ID)cursorEntry.getId() );
- entry.setKey( ((ParentIdAndRdn<ID>)cursorEntry.getTuple().getKey()).getParentId() );
-
+ entry.setId( ( ID ) cursorEntry.getId() );
+ entry.setKey( ( ( ParentIdAndRdn<ID> ) cursorEntry.getTuple().getKey() ).getParentId() );
+
if ( entry.getKey().equals( parentId ) )
{
prefetched = entry;
return true;
}
}
-
+
return false;
}
-
+
public IndexEntry<ID, ID> get() throws Exception
{
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java Thu Aug 23 16:17:05 2012
@@ -64,7 +64,7 @@ public class CursorBuilder<ID extends Co
}
- public <T> IndexCursor<?, Entry, ID> build( ExprNode node ) throws Exception
+ public <T> IndexCursor<?, ID> build( ExprNode node ) throws Exception
{
switch ( node.getAssertionType() )
{
@@ -130,10 +130,10 @@ public class CursorBuilder<ID extends Co
* @return Cursor over candidates satisfying disjunction expression
* @throws Exception on db access failures
*/
- private IndexCursor<?, Entry, ID> buildOrCursor( OrNode node ) throws Exception
+ private IndexCursor<?, ID> buildOrCursor( OrNode node ) throws Exception
{
List<ExprNode> children = node.getChildren();
- List<IndexCursor<?, Entry, ID>> childCursors = new ArrayList<IndexCursor<?, Entry, ID>>(
+ List<IndexCursor<?, ID>> childCursors = new ArrayList<IndexCursor<?, ID>>(
children.size() );
List<Evaluator<? extends ExprNode, Entry, ID>> childEvaluators = new ArrayList<Evaluator<? extends ExprNode, Entry, ID>>(
children.size() );
@@ -156,7 +156,7 @@ public class CursorBuilder<ID extends Co
* @return Cursor over the conjunction expression
* @throws Exception on db access failures
*/
- private IndexCursor<?, Entry, ID> buildAndCursor( AndNode node ) throws Exception
+ private IndexCursor<?, ID> buildAndCursor( AndNode node ) throws Exception
{
int minIndex = 0;
long minValue = Long.MAX_VALUE;
@@ -204,7 +204,7 @@ public class CursorBuilder<ID extends Co
}
// Do recursive call to build min child Cursor then create AndCursor
- IndexCursor<?, Entry, ID> childCursor = build( minChild );
+ IndexCursor<?, ID> childCursor = build( minChild );
return new AndCursor( childCursor, childEvaluators );
}
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java Thu Aug 23 16:17:05 2012
@@ -97,7 +97,7 @@ public class DefaultSearchEngine<ID exte
/**
* {@inheritDoc}
*/
- public IndexCursor<ID, Entry, ID> cursor( Dn base, AliasDerefMode aliasDerefMode, ExprNode filter,
+ public IndexCursor<ID, ID> cursor( Dn base, AliasDerefMode aliasDerefMode, ExprNode filter,
SearchScope scope ) throws Exception
{
Dn effectiveBase;
@@ -109,7 +109,7 @@ public class DefaultSearchEngine<ID exte
if ( ( ( Partition ) db ).getSuffixDn().equals( base ) )
{
// The context entry is not created yet, return an empty cursor
- return new EmptyIndexCursor<ID, Entry, ID>();
+ return new EmptyIndexCursor<ID, ID>();
}
else
{
@@ -180,7 +180,7 @@ public class DefaultSearchEngine<ID exte
}
else
{
- return new EmptyIndexCursor<ID, Entry, ID>();
+ return new EmptyIndexCursor<ID, ID>();
}
}
@@ -193,7 +193,7 @@ public class DefaultSearchEngine<ID exte
// Annotate the node with the optimizer and return search enumeration.
optimizer.annotate( root );
- return ( IndexCursor<ID, Entry, ID> ) cursorBuilder.build( root );
+ return ( IndexCursor<ID, ID> ) cursorBuilder.build( root );
}
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DescendantCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DescendantCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DescendantCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DescendantCursor.java Thu Aug 23 16:17:05 2012
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class DescendantCursor<ID extends Comparable<ID>> extends AbstractIndexCursor<ID, Entry, ID>
+public class DescendantCursor<ID extends Comparable<ID>> extends AbstractIndexCursor<ID, ID>
{
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
@@ -51,12 +51,12 @@ public class DescendantCursor<ID extends
/** The entry database/store */
private final Store<Entry, ID> db;
-
+
/** The prefetched element */
private IndexEntry prefetched;
-
+
/** The current Cursor over the entries in the scope of the search base */
- private IndexCursor<ParentIdAndRdn<ID>,Entry, ID> currentCursor;
+ private IndexCursor<ParentIdAndRdn<ID>, ID> currentCursor;
/** The current Parent ID */
private ID currentParentId;
@@ -66,13 +66,13 @@ public class DescendantCursor<ID extends
/** The stack of parentIds used to process the depth-first traversal */
private ArrayStack parentIdStack;
-
+
/** The initial entry ID we are looking descendants for */
private ID baseId;
-
+
/** A flag to tell that we are in the top level cursor or not */
private boolean topLevel;
-
+
protected static final boolean TOP_LEVEL = true;
protected static final boolean INNER = false;
@@ -84,12 +84,13 @@ public class DescendantCursor<ID extends
* @param evaluator an IndexEntry (candidate) evaluator
* @throws Exception on db access failures
*/
- public DescendantCursor( Store<Entry, ID> db, ID baseId, ID parentId, IndexCursor<ParentIdAndRdn<ID>, Entry, ID> cursor )
+ public DescendantCursor( Store<Entry, ID> db, ID baseId, ID parentId, IndexCursor<ParentIdAndRdn<ID>, ID> cursor )
throws Exception
{
this( db, baseId, parentId, cursor, TOP_LEVEL );
}
+
/**
* Creates a Cursor over entries satisfying one level scope criteria.
*
@@ -97,7 +98,8 @@ public class DescendantCursor<ID extends
* @param evaluator an IndexEntry (candidate) evaluator
* @throws Exception on db access failures
*/
- public DescendantCursor( Store<Entry, ID> db, ID baseId, ID parentId, IndexCursor<ParentIdAndRdn<ID>, Entry, ID> cursor, boolean topLevel )
+ public DescendantCursor( Store<Entry, ID> db, ID baseId, ID parentId, IndexCursor<ParentIdAndRdn<ID>, ID> cursor,
+ boolean topLevel )
throws Exception
{
LOG_CURSOR.debug( "Creating ChildrenCursor {}", this );
@@ -136,7 +138,7 @@ public class DescendantCursor<ID extends
public boolean first() throws Exception
{
beforeFirst();
-
+
return next();
}
@@ -150,20 +152,20 @@ public class DescendantCursor<ID extends
public boolean previous() throws Exception
{
checkNotClosed( "next()" );
-
+
boolean hasPrevious = currentCursor.previous();
-
+
if ( hasPrevious )
{
IndexEntry entry = currentCursor.get();
-
- if ( ((ParentIdAndRdn<ID>)entry.getTuple().getKey()).getParentId().equals( currentParentId ) )
+
+ if ( ( ( ParentIdAndRdn<ID> ) entry.getTuple().getKey() ).getParentId().equals( currentParentId ) )
{
prefetched = entry;
return true;
}
}
-
+
return false;
}
@@ -179,7 +181,7 @@ public class DescendantCursor<ID extends
while ( !finished )
{
boolean hasNext = currentCursor.next();
-
+
// We will use a depth first approach. The alternative (Breadth-first) would be
// too memory consuming.
// The idea is to use a ChildrenCursor each time we have an entry with chidren,
@@ -187,8 +189,8 @@ public class DescendantCursor<ID extends
if ( hasNext )
{
IndexEntry cursorEntry = currentCursor.get();
- ParentIdAndRdn<ID> parentIdAndRdn = ((ParentIdAndRdn<ID>)(cursorEntry.getKey()));
-
+ ParentIdAndRdn<ID> parentIdAndRdn = ( ( ParentIdAndRdn<ID> ) ( cursorEntry.getKey() ) );
+
// Check that we aren't out of the cursor's limit
if ( !parentIdAndRdn.getParentId().equals( currentParentId ) )
{
@@ -198,10 +200,10 @@ public class DescendantCursor<ID extends
if ( !finished )
{
currentCursor.close();
- currentCursor = (IndexCursor<ParentIdAndRdn<ID>, Entry, ID> )cursorStack.pop();
- currentParentId = (ID)parentIdStack.pop();
+ currentCursor = ( IndexCursor<ParentIdAndRdn<ID>, ID> ) cursorStack.pop();
+ currentParentId = ( ID ) parentIdStack.pop();
}
-
+
// And continue...
}
else
@@ -210,33 +212,33 @@ public class DescendantCursor<ID extends
if ( topLevel )
{
prefetched = new ForwardIndexEntry();
- prefetched.setId( (ID)cursorEntry.getId() );
+ prefetched.setId( cursorEntry.getId() );
prefetched.setKey( baseId );
}
else
{
prefetched = cursorEntry;
}
-
+
// Check if the current entry has children or not.
if ( parentIdAndRdn.getNbDescendants() > 0 )
{
- ID newParentId = (ID)cursorEntry.getId();
-
+ ID newParentId = ( ID ) cursorEntry.getId();
+
// Yes, then create a new cursor and go down one level
- IndexCursor<ParentIdAndRdn<ID>,Entry, ID> cursor = db.getRdnIndex().forwardCursor();
-
+ IndexCursor<ParentIdAndRdn<ID>, ID> cursor = db.getRdnIndex().forwardCursor();
+
IndexEntry<ParentIdAndRdn<ID>, ID> startingPos = new ForwardIndexEntry<ParentIdAndRdn<ID>, ID>();
- startingPos.setKey( new ParentIdAndRdn( newParentId, (Rdn[]) null ) );
+ startingPos.setKey( new ParentIdAndRdn( newParentId, ( Rdn[] ) null ) );
cursor.before( startingPos );
-
+
cursorStack.push( currentCursor );
parentIdStack.push( currentParentId );
currentCursor = cursor;
currentParentId = newParentId;
}
-
+
return true;
}
}
@@ -248,16 +250,16 @@ public class DescendantCursor<ID extends
if ( !finished )
{
currentCursor.close();
- currentCursor = (IndexCursor<ParentIdAndRdn<ID>, Entry, ID> )cursorStack.pop();
- currentParentId = (ID)parentIdStack.pop();
+ currentCursor = ( IndexCursor<ParentIdAndRdn<ID>, ID> ) cursorStack.pop();
+ currentParentId = ( ID ) parentIdStack.pop();
}
// and continue...
}
}
-
+
return false;
}
-
+
public IndexEntry<ID, ID> get() throws Exception
{
@@ -271,11 +273,11 @@ public class DescendantCursor<ID extends
public void close() throws Exception
{
LOG_CURSOR.debug( "Closing ChildrenCursor {}", this );
-
+
// Close the cursors stored in the stack, if we have some
for ( Object cursor : cursorStack )
{
- ((IndexCursor)cursor).close();
+ ( ( IndexCursor ) cursor ).close();
}
// And finally, close the current cursor
@@ -293,7 +295,7 @@ public class DescendantCursor<ID extends
// Close the cursors stored in the stack, if we have some
for ( Object cursor : cursorStack )
{
- ((IndexCursor)cursor).close( cause );
+ ( ( IndexCursor ) cursor ).close( cause );
}
// And finally, close the current cursor
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java Thu Aug 23 16:17:05 2012
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class EqualityCursor<V, ID extends Comparable<ID>> extends AbstractIndexCursor<V, Entry, ID>
+public class EqualityCursor<V, ID extends Comparable<ID>> extends AbstractIndexCursor<V, ID>
{
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
@@ -55,10 +55,10 @@ public class EqualityCursor<V, ID extend
private final EqualityEvaluator<V, ID> equalityEvaluator;
/** Cursor over attribute entry matching filter: set when index present */
- private final IndexCursor<V, Entry, ID> userIdxCursor;
+ private final IndexCursor<V, ID> userIdxCursor;
/** NDN Cursor on all entries in (set when no index on user attribute) */
- private final IndexCursor<String, Entry, ID> uuidIdxCursor;
+ private final IndexCursor<String, ID> uuidIdxCursor;
/**
@@ -338,7 +338,7 @@ public class EqualityCursor<V, ID extend
}
}
-
+
/**
* {@inheritDoc}
*/
@@ -346,7 +346,7 @@ public class EqualityCursor<V, ID extend
{
LOG_CURSOR.debug( "Closing EqualityCursor {}", this );
super.close( cause );
-
+
if ( userIdxCursor != null )
{
userIdxCursor.close( cause );
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java Thu Aug 23 16:17:05 2012
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class GreaterEqCursor<V, ID extends Comparable<ID>> extends AbstractIndexCursor<V, Entry, ID>
+public class GreaterEqCursor<V, ID extends Comparable<ID>> extends AbstractIndexCursor<V, ID>
{
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
@@ -54,10 +54,10 @@ public class GreaterEqCursor<V, ID exten
private final GreaterEqEvaluator<V, ID> greaterEqEvaluator;
/** Cursor over attribute entry matching filter: set when index present */
- private final IndexCursor<V, Entry, ID> userIdxCursor;
+ private final IndexCursor<V, ID> userIdxCursor;
/** NDN Cursor on all entries in (set when no index on user attribute) */
- private final IndexCursor<String, Entry, ID> uuidIdxCursor;
+ private final IndexCursor<String, ID> uuidIdxCursor;
/**
* Used to store indexEntry from uuidCandidate so it can be saved after
@@ -449,7 +449,7 @@ public class GreaterEqCursor<V, ID exten
}
}
-
+
/**
* {@inheritDoc}
*/
@@ -457,7 +457,7 @@ public class GreaterEqCursor<V, ID exten
{
LOG_CURSOR.debug( "Closing GreaterEqCursor {}", this );
super.close( cause );
-
+
if ( userIdxCursor != null )
{
userIdxCursor.close( cause );
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java Thu Aug 23 16:17:05 2012
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class LessEqCursor<V, ID extends Comparable<ID>> extends AbstractIndexCursor<V, Entry, ID>
+public class LessEqCursor<V, ID extends Comparable<ID>> extends AbstractIndexCursor<V, ID>
{
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
@@ -54,10 +54,10 @@ public class LessEqCursor<V, ID extends
private final LessEqEvaluator<V, ID> lessEqEvaluator;
/** Cursor over attribute entry matching filter: set when index present */
- private final IndexCursor<V, Entry, ID> userIdxCursor;
+ private final IndexCursor<V, ID> userIdxCursor;
/** NDN Cursor on all entries in (set when no index on user attribute) */
- private final IndexCursor<V, Entry, ID> uuidIdxCursor;
+ private final IndexCursor<V, ID> uuidIdxCursor;
/**
* Used to store indexEntry from uudCandidate so it can be saved after
@@ -82,7 +82,7 @@ public class LessEqCursor<V, ID extends
}
else
{
- uuidIdxCursor = ( IndexCursor<V, Entry, ID> ) db.getEntryUuidIndex().forwardCursor();
+ uuidIdxCursor = ( IndexCursor<V, ID> ) db.getEntryUuidIndex().forwardCursor();
userIdxCursor = null;
}
}
@@ -301,7 +301,7 @@ public class LessEqCursor<V, ID extends
{
IndexEntry<V, ID> advanceTo = new ForwardIndexEntry<V, ID>();
//noinspection unchecked
- advanceTo.setKey( ( V ) lessEqEvaluator.getExpression().getValue().getValue() );
+ advanceTo.setKey( lessEqEvaluator.getExpression().getValue().getValue() );
userIdxCursor.after( advanceTo );
}
else
@@ -445,7 +445,7 @@ public class LessEqCursor<V, ID extends
}
}
-
+
/**
* {@inheritDoc}
*/
@@ -453,7 +453,7 @@ public class LessEqCursor<V, ID extends
{
LOG_CURSOR.debug( "Closing LessEqCursor {}", this );
super.close( cause );
-
+
if ( userIdxCursor != null )
{
userIdxCursor.close( cause );
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java Thu Aug 23 16:17:05 2012
@@ -38,13 +38,13 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class NotCursor<V, ID extends Comparable<ID>> extends AbstractIndexCursor<V, Entry, ID>
+public class NotCursor<V, ID extends Comparable<ID>> extends AbstractIndexCursor<V, ID>
{
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_718 );
- private final IndexCursor<V, Entry, ID> uuidCursor;
+ private final IndexCursor<V, ID> uuidCursor;
private final Evaluator<? extends ExprNode, Entry, ID> childEvaluator;
@@ -54,7 +54,7 @@ public class NotCursor<V, ID extends Com
{
LOG_CURSOR.debug( "Creating NotCursor {}", this );
this.childEvaluator = childEvaluator;
- this.uuidCursor = ( IndexCursor<V, Entry, ID> ) store.getEntryUuidIndex().forwardCursor();
+ this.uuidCursor = ( IndexCursor<V, ID> ) store.getEntryUuidIndex().forwardCursor();
}
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java Thu Aug 23 16:17:05 2012
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class OneLevelScopeCursor<ID extends Comparable<ID>> extends AbstractIndexCursor<ID, Entry, ID>
+public class OneLevelScopeCursor<ID extends Comparable<ID>> extends AbstractIndexCursor<ID, ID>
{
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
@@ -83,10 +83,10 @@ public class OneLevelScopeCursor<ID exte
// We use the RdnIndex to get all the entries from a starting point
// and below up to the number of children
- IndexCursor<ParentIdAndRdn<ID>,Entry, ID> cursor = db.getRdnIndex().forwardCursor();
-
+ IndexCursor<ParentIdAndRdn<ID>, ID> cursor = db.getRdnIndex().forwardCursor();
+
IndexEntry<ParentIdAndRdn<ID>, ID> startingPos = new ForwardIndexEntry<ParentIdAndRdn<ID>, ID>();
- startingPos.setKey( new ParentIdAndRdn( evaluator.getBaseId(), (Rdn[]) null ) );
+ startingPos.setKey( new ParentIdAndRdn( evaluator.getBaseId(), ( Rdn[] ) null ) );
cursor.before( startingPos );
scopeCursor = new ChildrenCursor( db, evaluator.getBaseId(), cursor );
@@ -301,12 +301,12 @@ public class OneLevelScopeCursor<ID exte
public void close() throws Exception
{
LOG_CURSOR.debug( "Closing OneLevelScopeCursor {}", this );
-
+
if ( cursor != null )
{
cursor.close();
}
-
+
scopeCursor.close();
if ( dereferencedCursor != null )
@@ -322,7 +322,7 @@ public class OneLevelScopeCursor<ID exte
public void close( Exception cause ) throws Exception
{
LOG_CURSOR.debug( "Closing OneLevelScopeCursor {}", this );
-
+
if ( cursor != null )
{
cursor.close( cause );
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java Thu Aug 23 16:17:05 2012
@@ -43,24 +43,24 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class OrCursor<V, ID> extends AbstractIndexCursor<V, Entry, ID>
+public class OrCursor<V, ID> extends AbstractIndexCursor<V, ID>
{
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_722 );
- private final List<IndexCursor<V, Entry, ID>> cursors;
+ private final List<IndexCursor<V, ID>> cursors;
private final List<Evaluator<? extends ExprNode, Entry, ID>> evaluators;
private final List<Set<ID>> blacklists;
private int cursorIndex = -1;
// TODO - do same evaluator fail fast optimization that we do in AndCursor
- public OrCursor( List<IndexCursor<V, Entry, ID>> cursors,
+ public OrCursor( List<IndexCursor<V, ID>> cursors,
List<Evaluator<? extends ExprNode, Entry, ID>> evaluators )
{
LOG_CURSOR.debug( "Creating OrCursor {}", this );
-
+
if ( cursors.size() <= 1 )
{
throw new IllegalArgumentException( I18n.err( I18n.ERR_723 ) );
@@ -74,7 +74,7 @@ public class OrCursor<V, ID> extends Abs
{
this.blacklists.add( new HashSet<ID>() );
}
-
+
this.cursorIndex = 0;
}
@@ -245,7 +245,7 @@ public class OrCursor<V, ID> extends Abs
{
LOG_CURSOR.debug( "Closing OrCursor {}", this );
super.close();
-
+
for ( Cursor<?> cursor : cursors )
{
cursor.close();
@@ -257,7 +257,7 @@ public class OrCursor<V, ID> extends Abs
{
LOG_CURSOR.debug( "Closing OrCursor {}", this );
super.close( cause );
-
+
for ( Cursor<?> cursor : cursors )
{
cursor.close( cause );
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java Thu Aug 23 16:17:05 2012
@@ -37,16 +37,16 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class PresenceCursor<ID extends Comparable<ID>> extends AbstractIndexCursor<String, Entry, ID>
+public class PresenceCursor<ID extends Comparable<ID>> extends AbstractIndexCursor<String, ID>
{
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_724 );
- private final IndexCursor<String, Entry, ID> uuidCursor;
- private final IndexCursor<String, Entry, ID> presenceCursor;
+ private final IndexCursor<String, ID> uuidCursor;
+ private final IndexCursor<String, ID> presenceCursor;
private final PresenceEvaluator<ID> presenceEvaluator;
-
+
/** The prefetched entry, if it's a valid one */
private IndexEntry<String, ID> prefetched;
@@ -251,7 +251,7 @@ public class PresenceCursor<ID extends C
public boolean next() throws Exception
{
checkNotClosed( "next()" );
-
+
if ( presenceCursor != null )
{
return presenceCursor.next();
@@ -265,7 +265,7 @@ public class PresenceCursor<ID extends C
if ( presenceEvaluator.evaluate( candidate ) )
{
prefetched = candidate;
-
+
return setAvailable( true );
}
}
@@ -294,7 +294,7 @@ public class PresenceCursor<ID extends C
{
prefetched = uuidCursor.get();
}
-
+
/*
* The value of NDN indices is the normalized dn and we want the
* value to be the value of the attribute in question. So we will
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java Thu Aug 23 16:17:05 2012
@@ -38,14 +38,14 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class SubstringCursor<ID extends Comparable<ID>> extends AbstractIndexCursor<String, Entry, ID>
+public class SubstringCursor<ID extends Comparable<ID>> extends AbstractIndexCursor<String, ID>
{
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
private static final String UNSUPPORTED_MSG = I18n.err( I18n.ERR_725 );
private final boolean hasIndex;
- private final IndexCursor<String, Entry, ID> wrapped;
+ private final IndexCursor<String, ID> wrapped;
private final SubstringEvaluator<ID> evaluator;
private final ForwardIndexEntry<String, ID> indexEntry = new ForwardIndexEntry<String, ID>();
@@ -192,7 +192,7 @@ public class SubstringCursor<ID extends
this.indexEntry.setId( entry.getId() );
this.indexEntry.setKey( entry.getKey() );
this.indexEntry.setEntry( entry.getEntry() );
-
+
return true;
}
}
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java Thu Aug 23 16:17:05 2012
@@ -20,8 +20,6 @@
package org.apache.directory.server.xdbm.search.impl;
-import java.util.List;
-
import org.apache.directory.server.core.api.partition.Partition;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.xdbm.AbstractIndexCursor;
@@ -32,9 +30,7 @@ import org.apache.directory.server.xdbm.
import org.apache.directory.server.xdbm.SingletonIndexCursor;
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.model.cursor.SingletonCursor;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import org.apache.directory.shared.ldap.model.name.Rdn;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,7 +41,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class SubtreeScopeCursor<ID extends Comparable<ID>> extends AbstractIndexCursor<ID, Entry, ID>
+public class SubtreeScopeCursor<ID extends Comparable<ID>> extends AbstractIndexCursor<ID, ID>
{
/** A dedicated log for cursors */
private static final Logger LOG_CURSOR = LoggerFactory.getLogger( "CURSOR" );
@@ -59,13 +55,13 @@ public class SubtreeScopeCursor<ID exten
private final SubtreeScopeEvaluator<Entry, ID> evaluator;
/** A Cursor over the entries in the scope of the search base */
- private final IndexCursor<ID, Entry, ID> scopeCursor;
+ private final IndexCursor<ID, ID> scopeCursor;
/** A Cursor over entries brought into scope by alias dereferencing */
- private final IndexCursor<ID, Entry, ID> dereferencedCursor;
+ private final IndexCursor<ID, ID> dereferencedCursor;
/** Currently active Cursor: we switch between two cursors */
- private IndexCursor<ID, Entry, ID> cursor;
+ private IndexCursor<ID, ID> cursor;
private ID contextEntryId;
@@ -93,13 +89,14 @@ public class SubtreeScopeCursor<ID exten
// We use the RdnIndex to get all the entries from a starting point
// and below up to the number of children
ID baseId = evaluator.getBaseId();
- ParentIdAndRdn<ID> parentIdAndRdn = db.getRdnIndex().reverseLookup( baseId );
+ ParentIdAndRdn<ID> parentIdAndRdn = db.getRdnIndex().reverseLookup( baseId );
IndexEntry indexEntry = new ForwardIndexEntry();
-
+
indexEntry.setId( baseId );
indexEntry.setKey( parentIdAndRdn );
- IndexCursor<ParentIdAndRdn<ID>,Entry, ID> cursor = new SingletonIndexCursor<ParentIdAndRdn<ID>, ID>( indexEntry );
+ IndexCursor<ParentIdAndRdn<ID>, ID> cursor = new SingletonIndexCursor<ParentIdAndRdn<ID>, ID>(
+ indexEntry );
ID parentId = parentIdAndRdn.getParentId();
scopeCursor = new DescendantCursor( db, baseId, parentId, cursor );
@@ -265,7 +262,7 @@ public class SubtreeScopeCursor<ID exten
public boolean next() throws Exception
{
checkNotClosed( "next()" );
-
+
// if the cursor hasn't been set position it before the first element
if ( cursor == null )
{
@@ -344,7 +341,7 @@ public class SubtreeScopeCursor<ID exten
public void close() throws Exception
{
LOG_CURSOR.debug( "Closing SubtreeScopeCursor {}", this );
-
+
if ( dereferencedCursor != null )
{
dereferencedCursor.close();
@@ -354,7 +351,7 @@ public class SubtreeScopeCursor<ID exten
{
scopeCursor.close();
}
-
+
if ( cursor != null )
{
cursor.close();
@@ -370,7 +367,7 @@ public class SubtreeScopeCursor<ID exten
public void close( Exception cause ) throws Exception
{
LOG_CURSOR.debug( "Closing SubtreeScopeCursor {}", this );
-
+
if ( dereferencedCursor != null )
{
dereferencedCursor.close( cause );
@@ -380,7 +377,7 @@ public class SubtreeScopeCursor<ID exten
{
scopeCursor.close( cause );
}
-
+
if ( cursor != null )
{
cursor.close( cause );
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractIndexCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractIndexCursorTest.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractIndexCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/AbstractIndexCursorTest.java Thu Aug 23 16:17:05 2012
@@ -28,7 +28,6 @@ import java.util.Iterator;
import org.apache.directory.shared.ldap.model.cursor.CursorClosedException;
import org.apache.directory.shared.ldap.model.cursor.DefaultClosureMonitor;
-import org.apache.directory.shared.ldap.model.entry.Entry;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -42,16 +41,16 @@ import org.junit.Test;
public class AbstractIndexCursorTest
{
- private AbstractIndexCursor<String, Entry, Long> indexCursor;
+ private AbstractIndexCursor<String, Long> indexCursor;
@Before
public void setUp()
{
- indexCursor = new EmptyIndexCursor<String, Entry, Long>();
+ indexCursor = new EmptyIndexCursor<String, Long>();
}
-
-
+
+
@After
public void cleanup() throws Exception
{
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/EmptyIndexCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/EmptyIndexCursorTest.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/EmptyIndexCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/EmptyIndexCursorTest.java Thu Aug 23 16:17:05 2012
@@ -23,7 +23,6 @@ package org.apache.directory.server.xdbm
import static junit.framework.Assert.assertFalse;
import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;
-import org.apache.directory.shared.ldap.model.entry.Entry;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -37,16 +36,16 @@ import org.junit.Test;
public class EmptyIndexCursorTest
{
- private EmptyIndexCursor<String, Entry, Long> indexCursor;
+ private EmptyIndexCursor<String, Long> indexCursor;
@Before
public void setUp()
{
- indexCursor = new EmptyIndexCursor<String, Entry, Long>();
+ indexCursor = new EmptyIndexCursor<String, Long>();
}
-
-
+
+
@After
public void cleanup() throws Exception
{
@@ -60,8 +59,8 @@ public class EmptyIndexCursorTest
@Test
public void testConstructor() throws Exception
{
- EmptyIndexCursor<String, Entry, Long> cursor = new EmptyIndexCursor<String, Entry, Long>();
-
+ EmptyIndexCursor<String, Long> cursor = new EmptyIndexCursor<String, Long>();
+
cursor.close();
}
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Thu Aug 23 16:17:05 2012
@@ -175,7 +175,7 @@ public class AndCursorTest
ExprNode exprNode = FilterParser.parse( schemaManager, filter );
- IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
+ IndexCursor<?, Long> cursor = cursorBuilder.build( exprNode );
cursor.beforeFirst();
@@ -212,7 +212,7 @@ public class AndCursorTest
ExprNode exprNode = new SubstringNode( schemaManager.getAttributeType( "cn" ), "J", null );
eval = new SubstringEvaluator( ( SubstringNode ) exprNode, store, schemaManager );
- IndexCursor<?, Entry, Long> wrapped = new SubstringCursor( store, ( SubstringEvaluator ) eval );
+ IndexCursor<?, Long> wrapped = new SubstringCursor( store, ( SubstringEvaluator ) eval );
/* adding this results in NPE adding Presence evaluator not
Substring evaluator but adding Substring cursor as wrapped cursor */
@@ -226,7 +226,7 @@ public class AndCursorTest
andNode.addNode( exprNode );
- IndexCursor<?, Entry, Long> cursor = new AndCursor( wrapped, evaluators ); //cursorBuilder.build( andNode );
+ IndexCursor<?, Long> cursor = new AndCursor( wrapped, evaluators ); //cursorBuilder.build( andNode );
cursor.beforeFirst();