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 39A198379 for ; Wed, 24 Aug 2011 21:20:14 +0000 (UTC) Received: (qmail 27945 invoked by uid 500); 24 Aug 2011 21:20:14 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 27882 invoked by uid 500); 24 Aug 2011 21:20:13 -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 27875 invoked by uid 99); 24 Aug 2011 21:20:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Aug 2011 21:20:13 +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, 24 Aug 2011 21:20:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4AA082388ABA for ; Wed, 24 Aug 2011 21:19:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1161279 [4/4] - in /directory/apacheds/branches/one-sub-level-index-removal: ./ all/ core-annotations/ core-api/ core-api/src/main/java/org/apache/directory/server/core/filtering/ core-avl/ core-avl/src/test/java/org/apache/directory/serve... Date: Wed, 24 Aug 2011 21:19:37 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110824211943.4AA082388ABA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=1161279&r1=1161278&r2=1161279&view=diff ============================================================================== --- directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original) +++ directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Wed Aug 24 21:19:34 2011 @@ -67,7 +67,7 @@ public class OneLevelScopeTest extends T assertTrue( cursor.next() ); assertTrue( cursor.available() ); - IndexEntry indexEntry = cursor.get(); + IndexEntry indexEntry = cursor.get(); assertNotNull( indexEntry ); assertEquals( 6L, ( long ) indexEntry.getId() ); assertEquals( 2L, ( long ) indexEntry.getValue() ); @@ -210,7 +210,7 @@ public class OneLevelScopeTest extends T assertTrue( cursor.next() ); assertTrue( cursor.available() ); - IndexEntry indexEntry = cursor.get(); + IndexEntry indexEntry = cursor.get(); assertNotNull( indexEntry ); assertEquals( 8L, ( long ) indexEntry.getId() ); assertEquals( 4L, ( long ) indexEntry.getValue() ); @@ -354,7 +354,7 @@ public class OneLevelScopeTest extends T assertTrue( cursor.next() ); assertTrue( cursor.available() ); - IndexEntry indexEntry = cursor.get(); + IndexEntry indexEntry = cursor.get(); assertNotNull( indexEntry ); assertEquals( 7L, ( long ) indexEntry.getId() ); assertEquals( 3L, ( long ) indexEntry.getValue() ); @@ -477,7 +477,7 @@ public class OneLevelScopeTest extends T assertTrue( cursor.next() ); assertTrue( cursor.available() ); - IndexEntry indexEntry = cursor.get(); + IndexEntry indexEntry = cursor.get(); assertNotNull( indexEntry ); assertEquals( 6L, ( long ) indexEntry.getId() ); assertEquals( 7L, ( long ) indexEntry.getValue() ); @@ -590,7 +590,7 @@ public class OneLevelScopeTest extends T assertTrue( cursor.next() ); assertTrue( cursor.available() ); - IndexEntry indexEntry = cursor.get(); + IndexEntry indexEntry = cursor.get(); assertNotNull( indexEntry ); assertEquals( 7L, ( long ) indexEntry.getId() ); assertEquals( 3L, ( long ) indexEntry.getValue() ); @@ -810,7 +810,7 @@ public class OneLevelScopeTest extends T OneLevelScopeEvaluator evaluator = new OneLevelScopeEvaluator( store, node ); - ForwardIndexEntry indexEntry = new ForwardIndexEntry(); + ForwardIndexEntry indexEntry = new ForwardIndexEntry(); indexEntry.setId( 6L ); assertTrue( evaluator.evaluate( indexEntry ) ); } @@ -830,19 +830,19 @@ public class OneLevelScopeTest extends T * will not accept an alias candidate because aliases are not returned * when alias dereferencing while searching is enabled. */ - ForwardIndexEntry indexEntry = new ForwardIndexEntry(); + ForwardIndexEntry indexEntry = new ForwardIndexEntry(); indexEntry.setId( 11L ); assertFalse( evaluator.evaluate( indexEntry ) ); - indexEntry = new ForwardIndexEntry(); + indexEntry = new ForwardIndexEntry(); indexEntry.setId( 8L ); assertTrue( evaluator.evaluate( indexEntry ) ); - indexEntry = new ForwardIndexEntry(); + indexEntry = new ForwardIndexEntry(); indexEntry.setId( 5L ); assertTrue( evaluator.evaluate( indexEntry ) ); - indexEntry = new ForwardIndexEntry(); + indexEntry = new ForwardIndexEntry(); indexEntry.setId( 6L ); assertFalse( evaluator.evaluate( indexEntry ) ); } @@ -870,7 +870,7 @@ public class OneLevelScopeTest extends T OneLevelScopeCursor cursor = new OneLevelScopeCursor( store, evaluator ); // test before() - ForwardIndexEntry entry = new ForwardIndexEntry(); + ForwardIndexEntry entry = new ForwardIndexEntry(); entry.setValue( 3L ); cursor.before( entry ); } @@ -886,7 +886,7 @@ public class OneLevelScopeTest extends T OneLevelScopeCursor cursor = new OneLevelScopeCursor( store, evaluator ); // test after() - ForwardIndexEntry entry = new ForwardIndexEntry(); + ForwardIndexEntry entry = new ForwardIndexEntry(); entry.setValue( 3L ); cursor.after( entry ); } Modified: directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=1161279&r1=1161278&r2=1161279&view=diff ============================================================================== --- directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original) +++ directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Wed Aug 24 21:19:34 2011 @@ -156,9 +156,9 @@ public class OrCursorTest extends TestBa public void testOrCursor() throws Exception { List> evaluators = new ArrayList>(); - List>> cursors = new ArrayList>>(); + List>> cursors = new ArrayList>>(); Evaluator eval; - Cursor> cursor; + Cursor> cursor; OrNode orNode = new OrNode(); Modified: directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=1161279&r1=1161278&r2=1161279&view=diff ============================================================================== --- directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original) +++ directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Wed Aug 24 21:19:34 2011 @@ -101,7 +101,7 @@ public class PresenceTest extends TestBa assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getValue() ); // test before() - ForwardIndexEntry entry = new ForwardIndexEntry(); + ForwardIndexEntry entry = new ForwardIndexEntry(); entry.setValue( SchemaConstants.CN_AT_OID ); cursor.before( entry ); assertTrue( cursor.next() ); @@ -109,7 +109,7 @@ public class PresenceTest extends TestBa assertEquals( SchemaConstants.CN_AT_OID, cursor.get().getValue() ); // test after() - entry = new ForwardIndexEntry(); + entry = new ForwardIndexEntry(); cursor.after( entry ); assertTrue( cursor.previous() ); assertTrue( cursor.available() ); @@ -272,11 +272,11 @@ public class PresenceTest extends TestBa { PresenceNode node = new PresenceNode( schemaManager.getAttributeType( "cn" ) ); PresenceEvaluator evaluator = new PresenceEvaluator( node, store, schemaManager ); - ForwardIndexEntry entry = new ForwardIndexEntry(); + ForwardIndexEntry entry = new ForwardIndexEntry(); entry.setValue( SchemaConstants.CN_AT_OID ); entry.setId( ( long ) 3 ); assertFalse( evaluator.evaluate( entry ) ); - entry = new ForwardIndexEntry(); + entry = new ForwardIndexEntry(); entry.setValue( SchemaConstants.CN_AT_OID ); entry.setId( ( long ) 5 ); assertTrue( evaluator.evaluate( entry ) ); @@ -297,12 +297,12 @@ public class PresenceTest extends TestBa PresenceNode node = new PresenceNode( schemaManager.getAttributeType( oid ) ); PresenceEvaluator evaluator = new PresenceEvaluator( node, store, schemaManager ); - ForwardIndexEntry entry = new ForwardIndexEntry(); + ForwardIndexEntry entry = new ForwardIndexEntry(); // no need to set a value or id, because the evaluator must always evaluate to true // as each entry contains an objectClass, entryUUID, and entryCSN attribute assertTrue( evaluator.evaluate( entry ) ); - entry = new ForwardIndexEntry(); + entry = new ForwardIndexEntry(); entry.setValue( oid ); entry.setId( ( long ) 5 ); assertTrue( evaluator.evaluate( entry ) ); @@ -314,37 +314,37 @@ public class PresenceTest extends TestBa { PresenceNode node = new PresenceNode( schemaManager.getAttributeType( "name" ) ); PresenceEvaluator evaluator = new PresenceEvaluator( node, store, schemaManager ); - ForwardIndexEntry entry = new ForwardIndexEntry(); + ForwardIndexEntry entry = new ForwardIndexEntry(); entry.setValue( SchemaConstants.NAME_AT_OID ); entry.setId( ( long ) 3 ); assertTrue( evaluator.evaluate( entry ) ); - entry = new ForwardIndexEntry(); + entry = new ForwardIndexEntry(); entry.setValue( SchemaConstants.NAME_AT_OID ); entry.setId( ( long ) 5 ); assertTrue( evaluator.evaluate( entry ) ); node = new PresenceNode( schemaManager.getAttributeType( "searchGuide" ) ); evaluator = new PresenceEvaluator( node, store, schemaManager ); - entry = new ForwardIndexEntry(); + entry = new ForwardIndexEntry(); entry.setValue( SchemaConstants.SEARCHGUIDE_AT_OID ); entry.setId( ( long ) 3 ); assertFalse( evaluator.evaluate( entry ) ); - entry = new ForwardIndexEntry(); + entry = new ForwardIndexEntry(); entry.setValue( SchemaConstants.SEARCHGUIDE_AT_OID ); entry.setId( ( long ) 5 ); - entry.setObject( store.lookup( ( long ) 5 ) ); + entry.setEntry( store.lookup( ( long ) 5 ) ); assertFalse( evaluator.evaluate( entry ) ); node = new PresenceNode( schemaManager.getAttributeType( "st" ) ); evaluator = new PresenceEvaluator( node, store, schemaManager ); - entry = new ForwardIndexEntry(); + entry = new ForwardIndexEntry(); entry.setValue( SchemaConstants.ST_AT_OID ); entry.setId( ( long ) 3 ); assertFalse( evaluator.evaluate( entry ) ); - entry = new ForwardIndexEntry(); + entry = new ForwardIndexEntry(); entry.setValue( SchemaConstants.ST_AT_OID ); entry.setId( ( long ) 5 ); - entry.setObject( store.lookup( ( long ) 5 ) ); + entry.setEntry( store.lookup( ( long ) 5 ) ); assertFalse( evaluator.evaluate( entry ) ); } @@ -377,7 +377,7 @@ public class PresenceTest extends TestBa PresenceCursor cursor = new PresenceCursor( store, evaluator ); // test before() - ForwardIndexEntry entry = new ForwardIndexEntry(); + ForwardIndexEntry entry = new ForwardIndexEntry(); entry.setValue( SchemaConstants.SN_AT_OID ); cursor.before( entry ); } @@ -391,7 +391,7 @@ public class PresenceTest extends TestBa PresenceCursor cursor = new PresenceCursor( store, evaluator ); // test before() - ForwardIndexEntry entry = new ForwardIndexEntry(); + ForwardIndexEntry entry = new ForwardIndexEntry(); entry.setValue( SchemaConstants.SN_AT_OID ); cursor.after( entry ); } Modified: directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/RdnIndexTreeCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/RdnIndexTreeCursorTest.java?rev=1161279&r1=1161278&r2=1161279&view=diff ============================================================================== --- directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/RdnIndexTreeCursorTest.java (original) +++ directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/RdnIndexTreeCursorTest.java Wed Aug 24 21:19:34 2011 @@ -247,7 +247,7 @@ public class RdnIndexTreeCursorTest exte { assertTrue( cursor.next() ); assertTrue( cursor.available() ); - IndexEntry indexEntry = cursor.get(); + IndexEntry indexEntry = cursor.get(); assertNotNull( indexEntry ); assertEquals( value, indexEntry.getValue() ); assertEquals( id, indexEntry.getId() ); @@ -258,7 +258,7 @@ public class RdnIndexTreeCursorTest exte { assertTrue( cursor.previous() ); assertTrue( cursor.available() ); - IndexEntry indexEntry = cursor.get(); + IndexEntry indexEntry = cursor.get(); assertNotNull( indexEntry ); assertEquals( value, indexEntry.getValue() ); assertEquals( id, indexEntry.getId() ); @@ -269,7 +269,7 @@ public class RdnIndexTreeCursorTest exte { assertTrue( cursor.first() ); assertTrue( cursor.available() ); - IndexEntry indexEntry = cursor.get(); + IndexEntry indexEntry = cursor.get(); assertNotNull( indexEntry ); assertEquals( value, indexEntry.getValue() ); assertEquals( id, indexEntry.getId() ); @@ -280,7 +280,7 @@ public class RdnIndexTreeCursorTest exte { assertTrue( cursor.last() ); assertTrue( cursor.available() ); - IndexEntry indexEntry = cursor.get(); + IndexEntry indexEntry = cursor.get(); assertNotNull( indexEntry ); assertEquals( value, indexEntry.getValue() ); assertEquals( id, indexEntry.getId() ); Modified: directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=1161279&r1=1161278&r2=1161279&view=diff ============================================================================== --- directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original) +++ directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Wed Aug 24 21:19:34 2011 @@ -499,49 +499,49 @@ public class SubstringTest extends TestB { SubstringNode node = new SubstringNode( schemaManager.getAttributeType( "sn" ), "walk", null ); SubstringEvaluator evaluator = new SubstringEvaluator( node, store, schemaManager ); - ForwardIndexEntry indexEntry = new ForwardIndexEntry(); + ForwardIndexEntry indexEntry = new ForwardIndexEntry(); indexEntry.setId( 5L ); assertTrue( evaluator.evaluate( indexEntry ) ); indexEntry.setId( 3L ); - indexEntry.setObject( null ); + indexEntry.setEntry( null ); assertFalse( evaluator.evaluate( indexEntry ) ); indexEntry.setId( 6L ); - indexEntry.setObject( null ); + indexEntry.setEntry( null ); assertFalse( evaluator.evaluate( indexEntry ) ); node = new SubstringNode( schemaManager.getAttributeType( "sn" ), "wa", null ); evaluator = new SubstringEvaluator( node, store, schemaManager ); - indexEntry = new ForwardIndexEntry(); + indexEntry = new ForwardIndexEntry(); indexEntry.setId( 5L ); - indexEntry.setObject( store.lookup( 5L ) ); + indexEntry.setEntry( store.lookup( 5L ) ); assertTrue( evaluator.evaluate( indexEntry ) ); node = new SubstringNode( schemaManager.getAttributeType( "searchGuide" ), "j", null ); evaluator = new SubstringEvaluator( node, store, schemaManager ); - indexEntry = new ForwardIndexEntry(); + indexEntry = new ForwardIndexEntry(); indexEntry.setId( 6L ); - indexEntry.setObject( store.lookup( 6L ) ); + indexEntry.setEntry( store.lookup( 6L ) ); assertFalse( evaluator.evaluate( indexEntry ) ); node = new SubstringNode( schemaManager.getAttributeType( "st" ), "j", null ); evaluator = new SubstringEvaluator( node, store, schemaManager ); - indexEntry = new ForwardIndexEntry(); + indexEntry = new ForwardIndexEntry(); indexEntry.setId( 6L ); - indexEntry.setObject( store.lookup( 6L ) ); + indexEntry.setEntry( store.lookup( 6L ) ); assertFalse( evaluator.evaluate( indexEntry ) ); node = new SubstringNode( schemaManager.getAttributeType( "name" ), "j", null ); evaluator = new SubstringEvaluator( node, store, schemaManager ); - indexEntry = new ForwardIndexEntry(); + indexEntry = new ForwardIndexEntry(); indexEntry.setId( 6L ); - indexEntry.setObject( store.lookup( 6L ) ); + indexEntry.setEntry( store.lookup( 6L ) ); assertTrue( evaluator.evaluate( indexEntry ) ); node = new SubstringNode( schemaManager.getAttributeType( "name" ), "s", null ); evaluator = new SubstringEvaluator( node, store, schemaManager ); - indexEntry = new ForwardIndexEntry(); + indexEntry = new ForwardIndexEntry(); indexEntry.setId( 6L ); - indexEntry.setObject( store.lookup( 6L ) ); + indexEntry.setEntry( store.lookup( 6L ) ); assertTrue( evaluator.evaluate( indexEntry ) ); } @@ -551,25 +551,25 @@ public class SubstringTest extends TestB { SubstringNode node = new SubstringNode( schemaManager.getAttributeType( "cn" ), "jim", null ); SubstringEvaluator evaluator = new SubstringEvaluator( node, store, schemaManager ); - ForwardIndexEntry indexEntry = new ForwardIndexEntry(); + ForwardIndexEntry indexEntry = new ForwardIndexEntry(); indexEntry.setId( 6L ); assertTrue( evaluator.evaluate( indexEntry ) ); indexEntry.setId( 3L ); - indexEntry.setObject( null ); + indexEntry.setEntry( null ); assertFalse( evaluator.evaluate( indexEntry ) ); node = new SubstringNode( schemaManager.getAttributeType( "cn" ), "j", null ); evaluator = new SubstringEvaluator( node, store, schemaManager ); - indexEntry = new ForwardIndexEntry(); + indexEntry = new ForwardIndexEntry(); indexEntry.setId( 6L ); - indexEntry.setObject( store.lookup( 6L ) ); + indexEntry.setEntry( store.lookup( 6L ) ); assertTrue( evaluator.evaluate( indexEntry ) ); node = new SubstringNode( schemaManager.getAttributeType( "cn" ), "s", null ); evaluator = new SubstringEvaluator( node, store, schemaManager ); - indexEntry = new ForwardIndexEntry(); + indexEntry = new ForwardIndexEntry(); indexEntry.setId( 6L ); - indexEntry.setObject( store.lookup( 6L ) ); + indexEntry.setEntry( store.lookup( 6L ) ); assertFalse( evaluator.evaluate( indexEntry ) ); } @@ -608,7 +608,7 @@ public class SubstringTest extends TestB SubstringCursor cursor = new SubstringCursor( store, evaluator ); // test before() - ForwardIndexEntry entry = new ForwardIndexEntry(); + ForwardIndexEntry entry = new ForwardIndexEntry(); entry.setValue( SchemaConstants.SN_AT_OID ); cursor.before( entry ); } @@ -622,7 +622,7 @@ public class SubstringTest extends TestB SubstringCursor cursor = new SubstringCursor( store, evaluator ); // test before() - ForwardIndexEntry entry = new ForwardIndexEntry(); + ForwardIndexEntry entry = new ForwardIndexEntry(); entry.setValue( SchemaConstants.SN_AT_OID ); cursor.after( entry ); } Modified: directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=1161279&r1=1161278&r2=1161279&view=diff ============================================================================== --- directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original) +++ directory/apacheds/branches/one-sub-level-index-removal/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Wed Aug 24 21:19:34 2011 @@ -67,7 +67,7 @@ public class SubtreeScopeTest extends Te assertTrue( cursor.next() ); assertTrue( cursor.available() ); - IndexEntry indexEntry = cursor.get(); + IndexEntry indexEntry = cursor.get(); assertNotNull( indexEntry ); assertEquals( 2L, ( long ) indexEntry.getId() ); assertEquals( 2L, ( long ) indexEntry.getValue() ); @@ -223,7 +223,7 @@ public class SubtreeScopeTest extends Te assertTrue( cursor.next() ); assertTrue( cursor.available() ); - IndexEntry indexEntry = cursor.get(); + IndexEntry indexEntry = cursor.get(); assertNotNull( indexEntry ); assertEquals( 3L, ( long ) indexEntry.getId() ); assertEquals( 3L, ( long ) indexEntry.getValue() ); @@ -409,7 +409,7 @@ public class SubtreeScopeTest extends Te assertTrue( cursor.next() ); assertTrue( cursor.available() ); - IndexEntry indexEntry = cursor.get(); + IndexEntry indexEntry = cursor.get(); assertNotNull( indexEntry ); assertEquals( 7L, ( long ) indexEntry.getId() ); assertEquals( 7L, ( long ) indexEntry.getValue() ); @@ -556,7 +556,7 @@ public class SubtreeScopeTest extends Te assertTrue( cursor.next() ); assertTrue( cursor.available() ); - IndexEntry indexEntry = cursor.get(); + IndexEntry indexEntry = cursor.get(); assertNotNull( indexEntry ); assertEquals( 3L, ( long ) indexEntry.getId() ); assertEquals( 3L, ( long ) indexEntry.getValue() ); @@ -811,7 +811,7 @@ public class SubtreeScopeTest extends Te + "=sales," + SchemaConstants.O_AT_OID + "=good times co." ), SearchScope.SUBTREE ); SubtreeScopeEvaluator evaluator = new SubtreeScopeEvaluator( store, node ); - ForwardIndexEntry indexEntry = new ForwardIndexEntry(); + ForwardIndexEntry indexEntry = new ForwardIndexEntry(); indexEntry.setId( 6L ); assertTrue( evaluator.evaluate( indexEntry ) ); } @@ -829,15 +829,15 @@ public class SubtreeScopeTest extends Te * With dereferencing the evaluator does not accept candidates that * are aliases. This is done to filter out aliases from the results. */ - ForwardIndexEntry indexEntry = new ForwardIndexEntry(); + ForwardIndexEntry indexEntry = new ForwardIndexEntry(); indexEntry.setId( 11L ); assertFalse( evaluator.evaluate( indexEntry ) ); - indexEntry = new ForwardIndexEntry(); + indexEntry = new ForwardIndexEntry(); indexEntry.setId( 8L ); assertTrue( evaluator.evaluate( indexEntry ) ); - indexEntry = new ForwardIndexEntry(); + indexEntry = new ForwardIndexEntry(); indexEntry.setId( 6L ); assertFalse( evaluator.evaluate( indexEntry ) ); } @@ -863,7 +863,7 @@ public class SubtreeScopeTest extends Te SubtreeScopeCursor cursor = new SubtreeScopeCursor( store, evaluator ); // test before() - ForwardIndexEntry entry = new ForwardIndexEntry(); + ForwardIndexEntry entry = new ForwardIndexEntry(); entry.setValue( 3L ); cursor.before( entry ); } @@ -878,7 +878,7 @@ public class SubtreeScopeTest extends Te SubtreeScopeCursor cursor = new SubtreeScopeCursor( store, evaluator ); // test after() - ForwardIndexEntry entry = new ForwardIndexEntry(); + ForwardIndexEntry entry = new ForwardIndexEntry(); entry.setValue( 3L ); cursor.after( entry ); } Propchange: directory/apacheds/branches/one-sub-level-index-removal/xdbm-tools/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 24 21:19:34 2011 @@ -3,5 +3,5 @@ /directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-tools:980138-980938 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-tools:1040956-1043765 /directory/apacheds/branches/milestones/xdbm-tools:1072812-1075328 -/directory/apacheds/trunk/xdbm-tools:1066126-1067785,1068026-1072718,1072800-1075329 +/directory/apacheds/trunk/xdbm-tools:1066126-1067785,1068026-1072718,1072800-1075329,1158399-1161268 /directory/studio/trunk/xdbm-tools:1067786-1067997 Modified: directory/apacheds/branches/one-sub-level-index-removal/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java?rev=1161279&r1=1161278&r2=1161279&view=diff ============================================================================== --- directory/apacheds/branches/one-sub-level-index-removal/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java (original) +++ directory/apacheds/branches/one-sub-level-index-removal/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java Wed Aug 24 21:19:34 2011 @@ -46,12 +46,11 @@ import javax.swing.table.DefaultTableMod import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.server.xdbm.ForwardIndexEntry; import org.apache.directory.server.xdbm.Index; +import org.apache.directory.server.xdbm.IndexEntry; import org.apache.directory.shared.ldap.model.cursor.Cursor; import org.apache.directory.shared.util.exception.NotImplementedException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -288,7 +287,7 @@ public class IndexDialog exten try { - Cursor> list; + Cursor> list; if ( scanType.equals( EQUALITY_CURSOR ) ) { @@ -296,7 +295,7 @@ public class IndexDialog exten list.beforeFirst(); while ( list.next() ) { - IndexEntry rec = list.get(); + IndexEntry rec = list.get(); row = new Object[2]; row[0] = rec.getValue(); row[1] = rec.getId(); @@ -307,12 +306,12 @@ public class IndexDialog exten else if ( scanType.equals( GREATER_CURSOR ) ) { list = index.forwardCursor(); - ForwardIndexEntry entry = new ForwardIndexEntry(); + ForwardIndexEntry entry = new ForwardIndexEntry(); entry.setValue( key ); list.before( entry ); while ( list.next() ) { - IndexEntry rec = list.get(); + IndexEntry rec = list.get(); row = new Object[2]; row[0] = rec.getValue(); row[1] = rec.getId(); @@ -323,12 +322,12 @@ public class IndexDialog exten else if ( scanType.equals( LESS_CURSOR ) ) { list = index.forwardCursor(); - ForwardIndexEntry entry = new ForwardIndexEntry(); + ForwardIndexEntry entry = new ForwardIndexEntry(); entry.setValue( key ); list.after( entry ); while ( list.previous() ) { - IndexEntry rec = list.get(); + IndexEntry rec = list.get(); row = new Object[2]; row[0] = rec.getValue(); row[1] = rec.getId(); @@ -361,7 +360,7 @@ public class IndexDialog exten list = index.forwardCursor(); while ( list.next() ) { - IndexEntry rec = list.get(); + IndexEntry rec = list.get(); row = new Object[2]; row[0] = rec.getValue(); row[1] = rec.getId(); Modified: directory/apacheds/branches/one-sub-level-index-removal/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/one-sub-level-index-removal/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java?rev=1161279&r1=1161278&r2=1161279&view=diff ============================================================================== --- directory/apacheds/branches/one-sub-level-index-removal/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java (original) +++ directory/apacheds/branches/one-sub-level-index-removal/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java Wed Aug 24 21:19:34 2011 @@ -45,14 +45,13 @@ import javax.swing.border.TitledBorder; import javax.swing.table.DefaultTableModel; import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.directory.server.i18n.I18n; +import org.apache.directory.server.xdbm.ForwardIndexEntry; import org.apache.directory.server.xdbm.Index; import org.apache.directory.server.xdbm.IndexEntry; -import org.apache.directory.server.xdbm.ForwardIndexEntry; -import org.apache.directory.server.i18n.I18n; import org.apache.directory.shared.ldap.model.cursor.Cursor; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.util.exception.NotImplementedException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -290,7 +289,7 @@ public class IndexDialog exten try { - Cursor> list; + Cursor> list; if ( scanType.equals( EQUALITY_CURSOR ) ) { @@ -298,7 +297,7 @@ public class IndexDialog exten list.beforeFirst(); while ( list.next() ) { - IndexEntry rec = list.get(); + IndexEntry rec = list.get(); row = new Object[2]; row[0] = rec.getValue(); row[1] = rec.getId(); @@ -309,12 +308,12 @@ public class IndexDialog exten else if ( scanType.equals( GREATER_CURSOR ) ) { list = index.forwardCursor(); - ForwardIndexEntry entry = new ForwardIndexEntry(); + ForwardIndexEntry entry = new ForwardIndexEntry(); entry.setValue( key ); list.before( entry ); while ( list.next() ) { - IndexEntry rec = list.get(); + IndexEntry rec = list.get(); row = new Object[2]; row[0] = rec.getValue(); row[1] = rec.getId(); @@ -325,12 +324,12 @@ public class IndexDialog exten else if ( scanType.equals( LESS_CURSOR ) ) { list = index.forwardCursor(); - ForwardIndexEntry entry = new ForwardIndexEntry(); + ForwardIndexEntry entry = new ForwardIndexEntry(); entry.setValue( key ); list.after( entry ); while ( list.previous() ) { - IndexEntry rec = list.get(); + IndexEntry rec = list.get(); row = new Object[2]; row[0] = rec.getValue(); row[1] = rec.getId(); @@ -363,7 +362,7 @@ public class IndexDialog exten list = index.forwardCursor(); while ( list.next() ) { - IndexEntry rec = list.get(); + IndexEntry rec = list.get(); row = new Object[2]; row[0] = rec.getValue(); row[1] = rec.getId();