Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C9F9EDC76 for ; Wed, 29 Aug 2012 15:03:41 +0000 (UTC) Received: (qmail 10224 invoked by uid 500); 29 Aug 2012 15:03:41 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 10187 invoked by uid 500); 29 Aug 2012 15:03:41 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 10180 invoked by uid 99); 29 Aug 2012 15:03:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Aug 2012 15:03:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Aug 2012 15:03:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BE6FE2388900 for ; Wed, 29 Aug 2012 15:02:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1378598 - in /directory/apacheds/branches/apacheds-mvbt: ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/ xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ xdbm-partition/src/m... Date: Wed, 29 Aug 2012 15:02:48 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120829150249.BE6FE2388900@eris.apache.org> Author: elecharny Date: Wed Aug 29 15:02:48 2012 New Revision: 1378598 URL: http://svn.apache.org/viewvc?rev=1378598&view=rev Log: Removed the generic parameter from the ParentIdAndRdn, it's mplicitly an UUID Modified: 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/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/xdbm/ParentIdAndRdn.java directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.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/AvlRdnIndex.java directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OneLevelScopeCursor.java directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubtreeScopeCursor.java directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OneLevelScopeEvaluator.java directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ParentIdAndRdnTest.java directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java 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=1378598&r1=1378597&r2=1378598&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 Wed Aug 29 15:02:48 2012 @@ -386,13 +386,13 @@ public class LdifPartition extends Abstr UUID baseId = getEntryId( modifiedEntry.getDn() ); - ParentIdAndRdn parentIdAndRdn = getRdnIndex().reverseLookup( baseId ); + ParentIdAndRdn parentIdAndRdn = getRdnIndex().reverseLookup( baseId ); IndexEntry indexEntry = new ForwardIndexEntry(); indexEntry.setId( baseId ); indexEntry.setKey( parentIdAndRdn ); - Cursor, UUID>> cursor = new SingletonIndexCursor>( + Cursor> cursor = new SingletonIndexCursor( indexEntry ); UUID parentId = parentIdAndRdn.getParentId(); 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=1378598&r1=1378597&r2=1378598&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 Wed Aug 29 15:02:48 2012 @@ -299,7 +299,7 @@ public class SingleFileLdifPartition ext return; } - ParentIdAndRdn suffixEntry = rdnIdx.reverseLookup( suffixId ); + ParentIdAndRdn suffixEntry = rdnIdx.reverseLookup( suffixId ); if ( suffixEntry != null ) { @@ -328,16 +328,16 @@ public class SingleFileLdifPartition ext private void appendRecursive( UUID id, int nbSibbling ) throws Exception { // Start with the root - Cursor, UUID>> cursor = rdnIdx.forwardCursor(); + Cursor> cursor = rdnIdx.forwardCursor(); - IndexEntry, UUID> startingPos = new ForwardIndexEntry, UUID>(); - startingPos.setKey( new ParentIdAndRdn( id, ( Rdn[] ) null ) ); + IndexEntry startingPos = new ForwardIndexEntry(); + startingPos.setKey( new ParentIdAndRdn( id, ( Rdn[] ) null ) ); cursor.before( startingPos ); int countChildren = 0; while ( cursor.next() && ( countChildren < nbSibbling ) ) { - IndexEntry, UUID> element = cursor.get(); + IndexEntry element = cursor.get(); UUID childId = element.getId(); Entry entry = lookup( childId ); 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=1378598&r1=1378597&r2=1378598&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 Wed Aug 29 15:02:48 2012 @@ -140,7 +140,7 @@ public abstract class AbstractBTreeParti protected Map> systemIndices = new HashMap>(); /** the relative distinguished name index */ - protected Index, Entry, UUID> rdnIdx; + protected Index rdnIdx; /** a system index on objectClass attribute*/ protected Index objectClassIdx; @@ -292,7 +292,7 @@ public abstract class AbstractBTreeParti if ( getRdnIndex() == null ) { - Index, Entry, UUID> index = createSystemIndex( + Index index = createSystemIndex( ApacheSchemaConstants.APACHE_RDN_AT_OID, partitionPath, WITH_REVERSE ); addIndex( index ); @@ -349,7 +349,7 @@ public abstract class AbstractBTreeParti } // set index shortcuts - rdnIdx = ( Index, Entry, UUID> ) systemIndices + rdnIdx = ( Index ) systemIndices .get( ApacheSchemaConstants.APACHE_RDN_AT_OID ); presenceIdx = ( Index ) systemIndices.get( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID ); aliasIdx = ( Index ) systemIndices.get( ApacheSchemaConstants.APACHE_ALIAS_AT_OID ); @@ -537,15 +537,15 @@ public abstract class AbstractBTreeParti public void dumpRdnIdx( UUID id, String tabs ) throws Exception { // Start with the root - Cursor, UUID>> cursor = rdnIdx.forwardCursor(); + Cursor> cursor = rdnIdx.forwardCursor(); - IndexEntry, UUID> startingPos = new ForwardIndexEntry, UUID>(); + IndexEntry startingPos = new ForwardIndexEntry(); startingPos.setKey( new ParentIdAndRdn( id, ( Rdn[] ) null ) ); cursor.before( startingPos ); while ( cursor.next() ) { - IndexEntry, UUID> entry = cursor.get(); + IndexEntry entry = cursor.get(); System.out.println( tabs + entry ); } @@ -556,16 +556,16 @@ public abstract class AbstractBTreeParti private void dumpRdnIdx( UUID id, int nbSibbling, String tabs ) throws Exception { // Start with the root - Cursor, UUID>> cursor = rdnIdx.forwardCursor(); + Cursor> cursor = rdnIdx.forwardCursor(); - IndexEntry, UUID> startingPos = new ForwardIndexEntry, UUID>(); + IndexEntry startingPos = new ForwardIndexEntry(); startingPos.setKey( new ParentIdAndRdn( id, ( Rdn[] ) null ) ); cursor.before( startingPos ); int countChildren = 0; while ( cursor.next() && ( countChildren < nbSibbling ) ) { - IndexEntry, UUID> entry = cursor.get(); + IndexEntry entry = cursor.get(); System.out.println( tabs + entry ); countChildren++; @@ -611,19 +611,19 @@ public abstract class AbstractBTreeParti // entry sequences start at 1. // Dn parentDn = null; - ParentIdAndRdn key = null; + ParentIdAndRdn key = null; if ( entryDn.equals( suffixDn ) ) { parentId = Partition.ROOT_ID; - key = new ParentIdAndRdn( parentId, suffixDn.getRdns() ); + key = new ParentIdAndRdn( parentId, suffixDn.getRdns() ); } else { parentDn = entryDn.getParent(); parentId = getEntryId( parentDn ); - key = new ParentIdAndRdn( parentId, entryDn.getRdn() ); + key = new ParentIdAndRdn( parentId, entryDn.getRdn() ); } // don't keep going if we cannot find the parent Id @@ -792,7 +792,7 @@ public abstract class AbstractBTreeParti return; } - ParentIdAndRdn parent = rdnIdx.reverseLookup( parentId ); + ParentIdAndRdn parent = rdnIdx.reverseLookup( parentId ); while ( parent != null ) { @@ -862,7 +862,7 @@ public abstract class AbstractBTreeParti } // Update the parent's nbChildren and nbDescendants values - ParentIdAndRdn parent = rdnIdx.reverseLookup( id ); + ParentIdAndRdn parent = rdnIdx.reverseLookup( id ); updateRdnIdx( parent.getParentId(), REMOVE_CHILD, 0 ); // Update the rdn, oneLevel, subLevel, entryCsn and entryUuid indexes @@ -931,9 +931,9 @@ public abstract class AbstractBTreeParti { // We use the OneLevel index to get all the entries from a starting point // and below up to the number of children - Cursor, UUID>> cursor = rdnIdx.forwardCursor(); + Cursor> cursor = rdnIdx.forwardCursor(); - IndexEntry, UUID> startingPos = new ForwardIndexEntry, UUID>(); + IndexEntry startingPos = new ForwardIndexEntry(); startingPos.setKey( new ParentIdAndRdn( id, ( Rdn[] ) null ) ); cursor.before( startingPos ); @@ -1552,7 +1552,7 @@ public abstract class AbstractBTreeParti // Update the Rdn index // First drop the old entry - ParentIdAndRdn movedEntry = rdnIdx.reverseLookup( entryId ); + ParentIdAndRdn movedEntry = rdnIdx.reverseLookup( entryId ); updateRdnIdx( oldParentId, REMOVE_CHILD, movedEntry.getNbDescendants() ); @@ -1732,7 +1732,7 @@ public abstract class AbstractBTreeParti * Update the Rdn index */ // First drop the old entry - ParentIdAndRdn movedEntry = rdnIdx.reverseLookup( entryId ); + ParentIdAndRdn movedEntry = rdnIdx.reverseLookup( entryId ); updateRdnIdx( oldParentId, REMOVE_CHILD, movedEntry.getNbDescendants() ); @@ -1924,7 +1924,7 @@ public abstract class AbstractBTreeParti UUID parentId = getParentId( oldId ); // Get the old parentIdAndRdn to get the nb of children and descendant - ParentIdAndRdn parentIdAndRdn = rdnIdx.reverseLookup( oldId ); + ParentIdAndRdn parentIdAndRdn = rdnIdx.reverseLookup( oldId ); // Now we can drop it rdnIdx.drop( oldId ); @@ -2015,7 +2015,7 @@ public abstract class AbstractBTreeParti do { - ParentIdAndRdn cur = rdnIdx.reverseLookup( parentId ); + ParentIdAndRdn cur = rdnIdx.reverseLookup( parentId ); Rdn[] rdns = cur.getRdns(); for ( Rdn rdn : rdns ) @@ -2057,7 +2057,7 @@ public abstract class AbstractBTreeParti { try { - ParentIdAndRdn parentIdAndRdn = rdnIdx.reverseLookup( id ); + ParentIdAndRdn parentIdAndRdn = rdnIdx.reverseLookup( id ); return parentIdAndRdn.getNbChildren(); } @@ -2089,7 +2089,7 @@ public abstract class AbstractBTreeParti return Partition.ROOT_ID; } - ParentIdAndRdn suffixKey = new ParentIdAndRdn( Partition.ROOT_ID, suffixDn.getRdns() ); + ParentIdAndRdn suffixKey = new ParentIdAndRdn( Partition.ROOT_ID, suffixDn.getRdns() ); // Check into the Rdn index, starting with the partition Suffix UUID currentId = rdnIdx.forwardLookup( suffixKey ); @@ -2097,7 +2097,7 @@ public abstract class AbstractBTreeParti for ( int i = dn.size() - suffixDn.size(); i > 0; i-- ) { Rdn rdn = dn.getRdn( i - 1 ); - ParentIdAndRdn currentRdn = new ParentIdAndRdn( currentId, rdn ); + ParentIdAndRdn currentRdn = new ParentIdAndRdn( currentId, rdn ); currentId = rdnIdx.forwardLookup( currentRdn ); if ( currentId == null ) @@ -2120,7 +2120,7 @@ public abstract class AbstractBTreeParti */ public UUID getParentId( UUID childId ) throws Exception { - ParentIdAndRdn key = rdnIdx.reverseLookup( childId ); + ParentIdAndRdn key = rdnIdx.reverseLookup( childId ); if ( key == null ) { @@ -2138,7 +2138,7 @@ public abstract class AbstractBTreeParti { if ( suffixId == null ) { - ParentIdAndRdn key = new ParentIdAndRdn( Partition.ROOT_ID, suffixDn.getRdns() ); + ParentIdAndRdn key = new ParentIdAndRdn( Partition.ROOT_ID, suffixDn.getRdns() ); suffixId = rdnIdx.forwardLookup( key ); } @@ -2371,9 +2371,9 @@ public abstract class AbstractBTreeParti * {@inheritDoc} */ @SuppressWarnings("unchecked") - public Index, Entry, UUID> getRdnIndex() + public Index getRdnIndex() { - return ( Index, Entry, UUID> ) systemIndices.get( ApacheSchemaConstants.APACHE_RDN_AT_OID ); + return ( Index ) systemIndices.get( ApacheSchemaConstants.APACHE_RDN_AT_OID ); } Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java?rev=1378598&r1=1378597&r2=1378598&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java Wed Aug 29 15:02:48 2012 @@ -26,6 +26,7 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import java.util.Arrays; import java.util.List; +import java.util.UUID; import org.apache.directory.shared.ldap.model.name.Rdn; @@ -37,10 +38,10 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class ParentIdAndRdn> implements Externalizable, Comparable> +public class ParentIdAndRdn implements Externalizable, Comparable { /** The entry ID */ - protected ID parentId; + protected UUID parentId; /** The list of Rdn for this instance */ protected Rdn[] rdns; @@ -51,6 +52,7 @@ public class ParentIdAndRdn rdns ) + public ParentIdAndRdn( UUID parentId, List rdns ) { this.parentId = parentId; this.rdns = rdns.toArray( new Rdn[rdns.size()] ); @@ -92,7 +94,7 @@ public class ParentIdAndRdn ) ) + if ( !( obj instanceof ParentIdAndRdn ) ) { return false; } - ParentIdAndRdn that = ( ParentIdAndRdn ) obj; + ParentIdAndRdn that = ( ParentIdAndRdn ) obj; if ( rdns == null ) { @@ -183,18 +185,18 @@ public class ParentIdAndRdn that ) + public int compareTo( ParentIdAndRdn that ) { // Special case when that.rdns = null : we are searching for oneLevel or subLevel scope if ( that.rdns == null ) { int val = parentId.compareTo( that.parentId ); - + if ( val != 0 ) { return val; @@ -209,7 +211,7 @@ public class ParentIdAndRdn" ); - + sb.append( "[nbC:" ).append( nbChildren ).append( ", nbD:" ).append( nbDescendants ).append( "]" ); } - return sb.toString(); } } Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java?rev=1378598&r1=1378597&r2=1378598&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java Wed Aug 29 15:02:48 2012 @@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class ParentIdAndRdnComparator> extends SerializableComparator> +public class ParentIdAndRdnComparator> extends SerializableComparator { /** The serial version UID */ private static final long serialVersionUID = 2L; @@ -50,7 +50,7 @@ public class ParentIdAndRdnComparator rdn1, ParentIdAndRdn rdn2 ) + public int compare( ParentIdAndRdn rdn1, ParentIdAndRdn rdn2 ) { return rdn1.compareTo( rdn2 ); } 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=1378598&r1=1378597&r2=1378598&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 Wed Aug 29 15:02:48 2012 @@ -192,7 +192,7 @@ public interface Store /** * @return The Rdn system index */ - Index, E, UUID> getRdnIndex(); + Index getRdnIndex(); /** Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java?rev=1378598&r1=1378597&r2=1378598&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndex.java Wed Aug 29 15:02:48 2012 @@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap. * * @author Apache Directory Project */ -public class AvlRdnIndex extends AvlIndex, Entry> +public class AvlRdnIndex extends AvlIndex { public AvlRdnIndex() { @@ -84,9 +84,9 @@ public class AvlRdnIndex extends AvlInde * primary keys. A value for an attribute can occur several times in * different entries so the forward map can have more than one value. */ - forward = new AvlTable, UUID>( attributeType.getName(), comp, UuidComparator.INSTANCE, + forward = new AvlTable( attributeType.getName(), comp, UuidComparator.INSTANCE, false ); - reverse = new AvlTable>( attributeType.getName(), UuidComparator.INSTANCE, comp, + reverse = new AvlTable( attributeType.getName(), UuidComparator.INSTANCE, comp, false ); } } Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java?rev=1378598&r1=1378597&r2=1378598&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/ChildrenCursor.java Wed Aug 29 15:02:48 2012 @@ -49,7 +49,7 @@ public class ChildrenCursor extends Abst 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 Cursor, UUID>> cursor; + private final Cursor> cursor; /** The Parent ID */ private UUID parentId; @@ -65,7 +65,7 @@ public class ChildrenCursor extends Abst * @param evaluator an IndexEntry (candidate) evaluator * @throws Exception on db access failures */ - public ChildrenCursor( Store db, UUID parentId, Cursor, UUID>> cursor ) + public ChildrenCursor( Store db, UUID parentId, Cursor> cursor ) throws Exception { LOG_CURSOR.debug( "Creating ChildrenCursor {}", this ); @@ -120,7 +120,7 @@ public class ChildrenCursor extends Abst { IndexEntry entry = cursor.get(); - if ( ( ( ParentIdAndRdn ) entry.getTuple().getKey() ).getParentId().equals( parentId ) ) + if ( ( ( ParentIdAndRdn ) entry.getTuple().getKey() ).getParentId().equals( parentId ) ) { prefetched = entry; return true; @@ -145,7 +145,7 @@ public class ChildrenCursor extends Abst IndexEntry cursorEntry = cursor.get(); IndexEntry entry = new ForwardIndexEntry(); entry.setId( ( UUID ) cursorEntry.getId() ); - entry.setKey( ( ( ParentIdAndRdn ) cursorEntry.getTuple().getKey() ).getParentId() ); + entry.setKey( ( ( ParentIdAndRdn ) cursorEntry.getTuple().getKey() ).getParentId() ); if ( entry.getKey().equals( parentId ) ) { Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java?rev=1378598&r1=1378597&r2=1378598&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/DescendantCursor.java Wed Aug 29 15:02:48 2012 @@ -58,7 +58,7 @@ public class DescendantCursor extends Ab private IndexEntry prefetched; /** The current Cursor over the entries in the scope of the search base */ - private Cursor, UUID>> currentCursor; + private Cursor> currentCursor; /** The current Parent ID */ private UUID currentParentId; @@ -87,7 +87,7 @@ public class DescendantCursor extends Ab * @throws Exception on db access failures */ public DescendantCursor( Store db, UUID baseId, UUID parentId, - Cursor, UUID>> cursor ) + Cursor> cursor ) throws Exception { this( db, baseId, parentId, cursor, TOP_LEVEL ); @@ -102,7 +102,7 @@ public class DescendantCursor extends Ab * @throws Exception on db access failures */ public DescendantCursor( Store db, UUID baseId, UUID parentId, - Cursor, UUID>> cursor, + Cursor> cursor, boolean topLevel ) throws Exception { @@ -163,7 +163,7 @@ public class DescendantCursor extends Ab { IndexEntry entry = currentCursor.get(); - if ( ( ( ParentIdAndRdn ) entry.getTuple().getKey() ).getParentId().equals( currentParentId ) ) + if ( ( ( ParentIdAndRdn ) entry.getTuple().getKey() ).getParentId().equals( currentParentId ) ) { prefetched = entry; return true; @@ -193,7 +193,7 @@ public class DescendantCursor extends Ab if ( hasNext ) { IndexEntry cursorEntry = currentCursor.get(); - ParentIdAndRdn parentIdAndRdn = ( ( ParentIdAndRdn ) ( cursorEntry.getKey() ) ); + ParentIdAndRdn parentIdAndRdn = ( ( ParentIdAndRdn ) ( cursorEntry.getKey() ) ); // Check that we aren't out of the cursor's limit if ( !parentIdAndRdn.getParentId().equals( currentParentId ) ) @@ -204,7 +204,7 @@ public class DescendantCursor extends Ab if ( !finished ) { currentCursor.close(); - currentCursor = ( Cursor, UUID>> ) cursorStack.pop(); + currentCursor = ( Cursor> ) cursorStack.pop(); currentParentId = ( UUID ) parentIdStack.pop(); } @@ -230,9 +230,9 @@ public class DescendantCursor extends Ab UUID newParentId = ( UUID ) cursorEntry.getId(); // Yes, then create a new cursor and go down one level - Cursor, UUID>> cursor = db.getRdnIndex().forwardCursor(); + Cursor> cursor = db.getRdnIndex().forwardCursor(); - IndexEntry, UUID> startingPos = new ForwardIndexEntry, UUID>(); + IndexEntry startingPos = new ForwardIndexEntry(); startingPos.setKey( new ParentIdAndRdn( newParentId, ( Rdn[] ) null ) ); cursor.before( startingPos ); @@ -254,7 +254,7 @@ public class DescendantCursor extends Ab if ( !finished ) { currentCursor.close(); - currentCursor = ( Cursor, UUID>> ) cursorStack.pop(); + currentCursor = ( Cursor> ) cursorStack.pop(); currentParentId = ( UUID ) parentIdStack.pop(); } // and continue... Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OneLevelScopeCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OneLevelScopeCursor.java?rev=1378598&r1=1378597&r2=1378598&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OneLevelScopeCursor.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OneLevelScopeCursor.java Wed Aug 29 15:02:48 2012 @@ -85,9 +85,9 @@ public class OneLevelScopeCursor extends // We use the RdnIndex to get all the entries from a starting point // and below up to the number of children - Cursor, UUID>> cursor = db.getRdnIndex().forwardCursor(); + Cursor> cursor = db.getRdnIndex().forwardCursor(); - IndexEntry, UUID> startingPos = new ForwardIndexEntry, UUID>(); + IndexEntry startingPos = new ForwardIndexEntry(); startingPos.setKey( new ParentIdAndRdn( evaluator.getBaseId(), ( Rdn[] ) null ) ); cursor.before( startingPos ); Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubtreeScopeCursor.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubtreeScopeCursor.java?rev=1378598&r1=1378597&r2=1378598&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubtreeScopeCursor.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/SubtreeScopeCursor.java Wed Aug 29 15:02:48 2012 @@ -92,13 +92,13 @@ public class SubtreeScopeCursor extends // We use the RdnIndex to get all the entries from a starting point // and below up to the number of children UUID baseId = evaluator.getBaseId(); - ParentIdAndRdn parentIdAndRdn = db.getRdnIndex().reverseLookup( baseId ); + ParentIdAndRdn parentIdAndRdn = db.getRdnIndex().reverseLookup( baseId ); IndexEntry indexEntry = new ForwardIndexEntry(); indexEntry.setId( baseId ); indexEntry.setKey( parentIdAndRdn ); - Cursor, UUID>> cursor = new SingletonIndexCursor>( + Cursor> cursor = new SingletonIndexCursor( indexEntry ); UUID parentId = parentIdAndRdn.getParentId(); Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OneLevelScopeEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OneLevelScopeEvaluator.java?rev=1378598&r1=1378597&r2=1378598&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OneLevelScopeEvaluator.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/OneLevelScopeEvaluator.java Wed Aug 29 15:02:48 2012 @@ -100,7 +100,7 @@ public class OneLevelScopeEvaluator i */ public boolean evaluate( IndexEntry candidate ) throws Exception { - ParentIdAndRdn parent = db.getRdnIndex().reverseLookup( candidate.getId() ); + ParentIdAndRdn parent = db.getRdnIndex().reverseLookup( candidate.getId() ); boolean isChild = parent.getParentId().equals( baseId ); /* Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java?rev=1378598&r1=1378597&r2=1378598&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/SubtreeScopeEvaluator.java Wed Aug 29 15:02:48 2012 @@ -127,7 +127,7 @@ public class SubtreeScopeEvaluator im while ( true ) { - ParentIdAndRdn parentIdAndRdn = db.getRdnIndex().reverseLookup( tmp ); + ParentIdAndRdn parentIdAndRdn = db.getRdnIndex().reverseLookup( tmp ); if ( parentIdAndRdn == null ) { Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ParentIdAndRdnTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ParentIdAndRdnTest.java?rev=1378598&r1=1378597&r2=1378598&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ParentIdAndRdnTest.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ParentIdAndRdnTest.java Wed Aug 29 15:02:48 2012 @@ -20,9 +20,11 @@ package org.apache.directory.server.xdbm; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import java.io.File; + import org.apache.directory.server.xdbm.impl.avl.AvlPartitionTest; import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.apache.directory.shared.ldap.model.name.Rdn; @@ -31,12 +33,12 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.schemaextractor.impl.DefaultSchemaLdifExtractor; import org.apache.directory.shared.ldap.schemaloader.LdifSchemaLoader; import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager; +import org.apache.directory.shared.util.Strings; import org.apache.directory.shared.util.exception.Exceptions; import org.junit.BeforeClass; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; /** @@ -82,42 +84,43 @@ public class ParentIdAndRdnTest @Test public void testCompareEquals() throws LdapInvalidDnException { - ParentIdAndRdn rdn1 = new ParentIdAndRdn( 2L, new Rdn( schemaManager, "cn=test" ) ); - ParentIdAndRdn rdn2 = new ParentIdAndRdn( 2L, new Rdn( schemaManager, "CN=test2" ) ); - ParentIdAndRdn rdn3 = new ParentIdAndRdn( 2L, new Rdn( schemaManager, "ou=test" ) ); - ParentIdAndRdn rdn4 = new ParentIdAndRdn( 2L, new Rdn( schemaManager, "2.5.4.11=test2" ) ); - ParentIdAndRdn rdn5 = new ParentIdAndRdn( 1L, new Rdn( schemaManager, "CommonName= Test " ) ); - ParentIdAndRdn rdn6 = new ParentIdAndRdn( 2L, new Rdn( schemaManager, "cn=test+sn=small" ) ); - ParentIdAndRdn rdn7 = new ParentIdAndRdn( 2L, new Rdn( schemaManager, "2.5.4.4= Small + 2.5.4.3 = TEST " ) ); - + ParentIdAndRdn rdn1 = new ParentIdAndRdn( Strings.getUUID( 2L ), new Rdn( schemaManager, "cn=test" ) ); + ParentIdAndRdn rdn2 = new ParentIdAndRdn( Strings.getUUID( 2L ), new Rdn( schemaManager, "CN=test2" ) ); + ParentIdAndRdn rdn3 = new ParentIdAndRdn( Strings.getUUID( 2L ), new Rdn( schemaManager, "ou=test" ) ); + ParentIdAndRdn rdn4 = new ParentIdAndRdn( Strings.getUUID( 2L ), new Rdn( schemaManager, "2.5.4.11=test2" ) ); + ParentIdAndRdn rdn5 = new ParentIdAndRdn( Strings.getUUID( 1L ), new Rdn( schemaManager, "CommonName= Test " ) ); + ParentIdAndRdn rdn6 = new ParentIdAndRdn( Strings.getUUID( 2L ), new Rdn( schemaManager, "cn=test+sn=small" ) ); + ParentIdAndRdn rdn7 = new ParentIdAndRdn( Strings.getUUID( 2L ), new Rdn( schemaManager, + "2.5.4.4= Small + 2.5.4.3 = TEST " ) ); + // First rdn assertEquals( 0, rdn1.compareTo( rdn1 ) ); assertEquals( -1, rdn1.compareTo( rdn2 ) ); assertEquals( 2, rdn1.compareTo( rdn3 ) ); assertEquals( 2, rdn1.compareTo( rdn4 ) ); assertEquals( 1, rdn1.compareTo( rdn5 ) ); - + // Second rdn assertEquals( 1, rdn2.compareTo( rdn1 ) ); assertEquals( 0, rdn2.compareTo( rdn2 ) ); assertEquals( 2, rdn2.compareTo( rdn3 ) ); assertEquals( 2, rdn2.compareTo( rdn4 ) ); assertEquals( 1, rdn2.compareTo( rdn5 ) ); - + // Third rdn assertEquals( -2, rdn3.compareTo( rdn1 ) ); assertEquals( -2, rdn3.compareTo( rdn2 ) ); assertEquals( 0, rdn3.compareTo( rdn3 ) ); assertEquals( -1, rdn3.compareTo( rdn4 ) ); assertEquals( 1, rdn3.compareTo( rdn5 ) ); - + // Forth rdn assertEquals( -2, rdn4.compareTo( rdn1 ) ); assertEquals( -2, rdn4.compareTo( rdn2 ) ); assertEquals( 1, rdn4.compareTo( rdn3 ) ); assertEquals( 0, rdn4.compareTo( rdn4 ) ); assertEquals( 1, rdn4.compareTo( rdn5 ) ); - + // Fifth rdn assertEquals( -1, rdn5.compareTo( rdn1 ) ); assertEquals( -1, rdn5.compareTo( rdn2 ) ); Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java?rev=1378598&r1=1378597&r2=1378598&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java Wed Aug 29 15:02:48 2012 @@ -58,7 +58,7 @@ import org.junit.Test; public class AvlRdnIndexTest { private static File dbFileDir; - Index, Entry, UUID> idx; + Index idx; private static SchemaManager schemaManager; @@ -189,13 +189,13 @@ public class AvlRdnIndexTest initIndex(); assertEquals( 0, idx.count() ); - ParentIdAndRdn key = new ParentIdAndRdn( Strings.getUUID( 0L ), new Rdn( "cn=key" ) ); + ParentIdAndRdn key = new ParentIdAndRdn( Strings.getUUID( 0L ), new Rdn( "cn=key" ) ); idx.add( key, Strings.getUUID( 0L ) ); assertEquals( 1, idx.count() ); // setting a different parentId should make this key a different key - key = new ParentIdAndRdn( Strings.getUUID( 1L ), new Rdn( "cn=key" ) ); + key = new ParentIdAndRdn( Strings.getUUID( 1L ), new Rdn( "cn=key" ) ); idx.add( key, Strings.getUUID( 1L ) ); assertEquals( 2, idx.count() ); @@ -204,7 +204,7 @@ public class AvlRdnIndexTest idx.add( key, Strings.getUUID( 2L ) ); assertEquals( 2, idx.count() ); - key = new ParentIdAndRdn( Strings.getUUID( 2L ), new Rdn( "cn=key" ) ); + key = new ParentIdAndRdn( Strings.getUUID( 2L ), new Rdn( "cn=key" ) ); idx.add( key, Strings.getUUID( 3L ) ); assertEquals( 3, idx.count() ); } @@ -215,7 +215,7 @@ public class AvlRdnIndexTest { initIndex(); - ParentIdAndRdn key = new ParentIdAndRdn( Strings.getUUID( 0L ), new Rdn( "cn=key" ) ); + ParentIdAndRdn key = new ParentIdAndRdn( Strings.getUUID( 0L ), new Rdn( "cn=key" ) ); assertEquals( 0, idx.count( key ) ); @@ -233,7 +233,7 @@ public class AvlRdnIndexTest { initIndex(); - ParentIdAndRdn key = new ParentIdAndRdn( Strings.getUUID( 0L ), new Rdn( "cn=key" ) ); + ParentIdAndRdn key = new ParentIdAndRdn( Strings.getUUID( 0L ), new Rdn( "cn=key" ) ); assertNull( idx.forwardLookup( key ) ); @@ -248,7 +248,7 @@ public class AvlRdnIndexTest { initIndex(); - ParentIdAndRdn key = new ParentIdAndRdn( Strings.getUUID( 0L ), new Rdn( "cn=key" ) ); + ParentIdAndRdn key = new ParentIdAndRdn( Strings.getUUID( 0L ), new Rdn( "cn=key" ) ); assertNull( idx.forwardLookup( key ) ); @@ -271,7 +271,7 @@ public class AvlRdnIndexTest { initIndex(); - ParentIdAndRdn key = new ParentIdAndRdn( Strings.getUUID( 0L ), new Rdn( "cn=key" ) ); + ParentIdAndRdn key = new ParentIdAndRdn( Strings.getUUID( 0L ), new Rdn( "cn=key" ) ); assertEquals( 0, idx.count() ); @@ -280,7 +280,7 @@ public class AvlRdnIndexTest for ( long i = 1; i < 5; i++ ) { - key = new ParentIdAndRdn( Strings.getUUID( i ), new Rdn( "cn=key" + i ) ); + key = new ParentIdAndRdn( Strings.getUUID( i ), new Rdn( "cn=key" + i ) ); idx.add( key, Strings.getUUID( i ) ); } @@ -288,23 +288,23 @@ public class AvlRdnIndexTest assertEquals( 5, idx.count() ); // use forward index's cursor - Cursor, UUID>> cursor = idx.forwardCursor(); + Cursor> cursor = idx.forwardCursor(); cursor.beforeFirst(); cursor.next(); - IndexEntry, UUID> e1 = cursor.get(); + IndexEntry e1 = cursor.get(); assertEquals( Strings.getUUID( 0L ), e1.getId() ); assertEquals( "cn=key", e1.getKey().getRdns()[0].getName() ); assertEquals( Strings.getUUID( 0L ), e1.getKey().getParentId() ); cursor.next(); - IndexEntry, UUID> e2 = cursor.get(); + IndexEntry e2 = cursor.get(); assertEquals( Strings.getUUID( 1L ), e2.getId() ); assertEquals( "cn=key1", e2.getKey().getRdns()[0].getName() ); assertEquals( Strings.getUUID( 1L ), e2.getKey().getParentId() ); cursor.next(); - IndexEntry, UUID> e3 = cursor.get(); + IndexEntry e3 = cursor.get(); assertEquals( Strings.getUUID( 2L ), e3.getId() ); assertEquals( "cn=key2", e3.getKey().getRdns()[0].getName() ); assertEquals( Strings.getUUID( 2L ), e3.getKey().getParentId() );