directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
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 GMT
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<Long, Entry, Long> indexEntry = cursor.get();
+        IndexEntry<Long, Long> 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<Long, Entry, Long> indexEntry = cursor.get();
+        IndexEntry<Long, Long> 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<Long, Entry, Long> indexEntry = cursor.get();
+        IndexEntry<Long, Long> 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<Long, Entry, Long> indexEntry = cursor.get();
+        IndexEntry<Long, Long> 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<Long, Entry, Long> indexEntry = cursor.get();
+        IndexEntry<Long, Long> 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<Entry, Long> evaluator = new OneLevelScopeEvaluator<Entry,
Long>( store,
             node );
 
-        ForwardIndexEntry<Long, Entry, Long> indexEntry = new ForwardIndexEntry<Long,
Entry, Long>();
+        ForwardIndexEntry<Long, Long> indexEntry = new ForwardIndexEntry<Long, Long>();
         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<Long, Entry, Long> indexEntry = new ForwardIndexEntry<Long,
Entry, Long>();
+        ForwardIndexEntry<Long, Long> indexEntry = new ForwardIndexEntry<Long, Long>();
         indexEntry.setId( 11L );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<Long, Entry, Long>();
+        indexEntry = new ForwardIndexEntry<Long, Long>();
         indexEntry.setId( 8L );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<Long, Entry, Long>();
+        indexEntry = new ForwardIndexEntry<Long, Long>();
         indexEntry.setId( 5L );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<Long, Entry, Long>();
+        indexEntry = new ForwardIndexEntry<Long, Long>();
         indexEntry.setId( 6L );
         assertFalse( evaluator.evaluate( indexEntry ) );
     }
@@ -870,7 +870,7 @@ public class OneLevelScopeTest extends T
         OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store,
evaluator );
 
         // test before()
-        ForwardIndexEntry<Long, Entry, Long> entry = new ForwardIndexEntry<Long,
Entry, Long>();
+        ForwardIndexEntry<Long, Long> entry = new ForwardIndexEntry<Long, Long>();
         entry.setValue( 3L );
         cursor.before( entry );
     }
@@ -886,7 +886,7 @@ public class OneLevelScopeTest extends T
         OneLevelScopeCursor<Long> cursor = new OneLevelScopeCursor<Long>( store,
evaluator );
 
         // test after()
-        ForwardIndexEntry<Long, Entry, Long> entry = new ForwardIndexEntry<Long,
Entry, Long>();
+        ForwardIndexEntry<Long, Long> entry = new ForwardIndexEntry<Long, Long>();
         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<Evaluator<? extends ExprNode, Entry, Long>> evaluators = new ArrayList<Evaluator<?
extends ExprNode, Entry, Long>>();
-        List<Cursor<IndexEntry<?, Entry, Long>>> cursors = new ArrayList<Cursor<IndexEntry<?,
Entry, Long>>>();
+        List<Cursor<IndexEntry<?, Long>>> cursors = new ArrayList<Cursor<IndexEntry<?,
Long>>>();
         Evaluator<? extends ExprNode, Entry, Long> eval;
-        Cursor<IndexEntry<?, Entry, Long>> cursor;
+        Cursor<IndexEntry<?, Long>> 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<String, Entry, Long> entry = new ForwardIndexEntry<String,
Entry, Long>();
+        ForwardIndexEntry<String, Long> entry = new ForwardIndexEntry<String, Long>();
         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<String, Entry, Long>();
+        entry = new ForwardIndexEntry<String, Long>();
         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<Long> evaluator = new PresenceEvaluator<Long>( node,
store, schemaManager );
-        ForwardIndexEntry<String, Entry, Long> entry = new ForwardIndexEntry<String,
Entry, Long>();
+        ForwardIndexEntry<String, Long> entry = new ForwardIndexEntry<String, Long>();
         entry.setValue( SchemaConstants.CN_AT_OID );
         entry.setId( ( long ) 3 );
         assertFalse( evaluator.evaluate( entry ) );
-        entry = new ForwardIndexEntry<String, Entry, Long>();
+        entry = new ForwardIndexEntry<String, Long>();
         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<Long> evaluator = new PresenceEvaluator<Long>( node,
store, schemaManager );
 
-        ForwardIndexEntry<String, Entry, Long> entry = new ForwardIndexEntry<String,
Entry, Long>();
+        ForwardIndexEntry<String, Long> entry = new ForwardIndexEntry<String, Long>();
         // 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<String, Entry, Long>();
+        entry = new ForwardIndexEntry<String, Long>();
         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<Long> evaluator = new PresenceEvaluator<Long>( node,
store, schemaManager );
-        ForwardIndexEntry<String, Entry, Long> entry = new ForwardIndexEntry<String,
Entry, Long>();
+        ForwardIndexEntry<String, Long> entry = new ForwardIndexEntry<String, Long>();
         entry.setValue( SchemaConstants.NAME_AT_OID );
         entry.setId( ( long ) 3 );
         assertTrue( evaluator.evaluate( entry ) );
-        entry = new ForwardIndexEntry<String, Entry, Long>();
+        entry = new ForwardIndexEntry<String, Long>();
         entry.setValue( SchemaConstants.NAME_AT_OID );
         entry.setId( ( long ) 5 );
         assertTrue( evaluator.evaluate( entry ) );
 
         node = new PresenceNode( schemaManager.getAttributeType( "searchGuide" ) );
         evaluator = new PresenceEvaluator<Long>( node, store, schemaManager );
-        entry = new ForwardIndexEntry<String, Entry, Long>();
+        entry = new ForwardIndexEntry<String, Long>();
         entry.setValue( SchemaConstants.SEARCHGUIDE_AT_OID );
         entry.setId( ( long ) 3 );
         assertFalse( evaluator.evaluate( entry ) );
-        entry = new ForwardIndexEntry<String, Entry, Long>();
+        entry = new ForwardIndexEntry<String, Long>();
         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<Long>( node, store, schemaManager );
-        entry = new ForwardIndexEntry<String, Entry, Long>();
+        entry = new ForwardIndexEntry<String, Long>();
         entry.setValue( SchemaConstants.ST_AT_OID );
         entry.setId( ( long ) 3 );
         assertFalse( evaluator.evaluate( entry ) );
-        entry = new ForwardIndexEntry<String, Entry, Long>();
+        entry = new ForwardIndexEntry<String, Long>();
         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<Long> cursor = new PresenceCursor<Long>( store, evaluator
);
 
         // test before()
-        ForwardIndexEntry<String, Entry, Long> entry = new ForwardIndexEntry<String,
Entry, Long>();
+        ForwardIndexEntry<String, Long> entry = new ForwardIndexEntry<String, Long>();
         entry.setValue( SchemaConstants.SN_AT_OID );
         cursor.before( entry );
     }
@@ -391,7 +391,7 @@ public class PresenceTest extends TestBa
         PresenceCursor<Long> cursor = new PresenceCursor<Long>( store, evaluator
);
 
         // test before()
-        ForwardIndexEntry<String, Entry, Long> entry = new ForwardIndexEntry<String,
Entry, Long>();
+        ForwardIndexEntry<String, Long> entry = new ForwardIndexEntry<String, Long>();
         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<Long, Entry, Long> indexEntry = cursor.get();
+        IndexEntry<Long, Long> 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<Long, Entry, Long> indexEntry = cursor.get();
+        IndexEntry<Long, Long> 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<Long, Entry, Long> indexEntry = cursor.get();
+        IndexEntry<Long, Long> 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<Long, Entry, Long> indexEntry = cursor.get();
+        IndexEntry<Long, Long> 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<Long> evaluator = new SubstringEvaluator<Long>( node,
store, schemaManager );
-        ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String,
Entry, Long>();
+        ForwardIndexEntry<String, Long> indexEntry = new ForwardIndexEntry<String,
Long>();
         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<Long>( node, store, schemaManager );
-        indexEntry = new ForwardIndexEntry<String, Entry, Long>();
+        indexEntry = new ForwardIndexEntry<String, Long>();
         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<Long>( node, store, schemaManager );
-        indexEntry = new ForwardIndexEntry<String, Entry, Long>();
+        indexEntry = new ForwardIndexEntry<String, Long>();
         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<Long>( node, store, schemaManager );
-        indexEntry = new ForwardIndexEntry<String, Entry, Long>();
+        indexEntry = new ForwardIndexEntry<String, Long>();
         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<Long>( node, store, schemaManager );
-        indexEntry = new ForwardIndexEntry<String, Entry, Long>();
+        indexEntry = new ForwardIndexEntry<String, Long>();
         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<Long>( node, store, schemaManager );
-        indexEntry = new ForwardIndexEntry<String, Entry, Long>();
+        indexEntry = new ForwardIndexEntry<String, Long>();
         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<Long> evaluator = new SubstringEvaluator<Long>( node,
store, schemaManager );
-        ForwardIndexEntry<String, Entry, Long> indexEntry = new ForwardIndexEntry<String,
Entry, Long>();
+        ForwardIndexEntry<String, Long> indexEntry = new ForwardIndexEntry<String,
Long>();
         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<Long>( node, store, schemaManager );
-        indexEntry = new ForwardIndexEntry<String, Entry, Long>();
+        indexEntry = new ForwardIndexEntry<String, Long>();
         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<Long>( node, store, schemaManager );
-        indexEntry = new ForwardIndexEntry<String, Entry, Long>();
+        indexEntry = new ForwardIndexEntry<String, Long>();
         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<Long> cursor = new SubstringCursor<Long>( store, evaluator
);
 
         // test before()
-        ForwardIndexEntry<String, Entry, Long> entry = new ForwardIndexEntry<String,
Entry, Long>();
+        ForwardIndexEntry<String, Long> entry = new ForwardIndexEntry<String, Long>();
         entry.setValue( SchemaConstants.SN_AT_OID );
         cursor.before( entry );
     }
@@ -622,7 +622,7 @@ public class SubstringTest extends TestB
         SubstringCursor<Long> cursor = new SubstringCursor<Long>( store, evaluator
);
 
         // test before()
-        ForwardIndexEntry<String, Entry, Long> entry = new ForwardIndexEntry<String,
Entry, Long>();
+        ForwardIndexEntry<String, Long> entry = new ForwardIndexEntry<String, Long>();
         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<Long, Entry, Long> indexEntry = cursor.get();
+        IndexEntry<Long, Long> 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<Long, Entry, Long> indexEntry = cursor.get();
+        IndexEntry<Long, Long> 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<Long, Entry, Long> indexEntry = cursor.get();
+        IndexEntry<Long, Long> 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<Long, Entry, Long> indexEntry = cursor.get();
+        IndexEntry<Long, Long> 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<Entry, Long> evaluator = new SubtreeScopeEvaluator<Entry,
Long>( store, node );
 
-        ForwardIndexEntry<Long, Entry, Long> indexEntry = new ForwardIndexEntry<Long,
Entry, Long>();
+        ForwardIndexEntry<Long, Long> indexEntry = new ForwardIndexEntry<Long, Long>();
         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<Long, Entry, Long> indexEntry = new ForwardIndexEntry<Long,
Entry, Long>();
+        ForwardIndexEntry<Long, Long> indexEntry = new ForwardIndexEntry<Long, Long>();
         indexEntry.setId( 11L );
         assertFalse( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<Long, Entry, Long>();
+        indexEntry = new ForwardIndexEntry<Long, Long>();
         indexEntry.setId( 8L );
         assertTrue( evaluator.evaluate( indexEntry ) );
 
-        indexEntry = new ForwardIndexEntry<Long, Entry, Long>();
+        indexEntry = new ForwardIndexEntry<Long, Long>();
         indexEntry.setId( 6L );
         assertFalse( evaluator.evaluate( indexEntry ) );
     }
@@ -863,7 +863,7 @@ public class SubtreeScopeTest extends Te
         SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store,
evaluator );
 
         // test before()
-        ForwardIndexEntry<Long, Entry, Long> entry = new ForwardIndexEntry<Long,
Entry, Long>();
+        ForwardIndexEntry<Long, Long> entry = new ForwardIndexEntry<Long, Long>();
         entry.setValue( 3L );
         cursor.before( entry );
     }
@@ -878,7 +878,7 @@ public class SubtreeScopeTest extends Te
         SubtreeScopeCursor<Long> cursor = new SubtreeScopeCursor<Long>( store,
evaluator );
 
         // test after()
-        ForwardIndexEntry<Long, Entry, Long> entry = new ForwardIndexEntry<Long,
Entry, Long>();
+        ForwardIndexEntry<Long, Long> entry = new ForwardIndexEntry<Long, Long>();
         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<K, O, ID> exten
 
         try
         {
-            Cursor<IndexEntry<K, O, ID>> list;
+            Cursor<IndexEntry<K, ID>> list;
 
             if ( scanType.equals( EQUALITY_CURSOR ) )
             {
@@ -296,7 +295,7 @@ public class IndexDialog<K, O, ID> exten
                 list.beforeFirst();
                 while ( list.next() )
                 {
-                    IndexEntry<K, O, ID> rec = list.get();
+                    IndexEntry<K, ID> rec = list.get();
                     row = new Object[2];
                     row[0] = rec.getValue();
                     row[1] = rec.getId();
@@ -307,12 +306,12 @@ public class IndexDialog<K, O, ID> exten
             else if ( scanType.equals( GREATER_CURSOR ) )
             {
                 list = index.forwardCursor();
-                ForwardIndexEntry<K, O, ID> entry = new ForwardIndexEntry<K, O,
ID>();
+                ForwardIndexEntry<K, ID> entry = new ForwardIndexEntry<K, ID>();
                 entry.setValue( key );
                 list.before( entry );
                 while ( list.next() )
                 {
-                    IndexEntry<K, O, ID> rec = list.get();
+                    IndexEntry<K, ID> rec = list.get();
                     row = new Object[2];
                     row[0] = rec.getValue();
                     row[1] = rec.getId();
@@ -323,12 +322,12 @@ public class IndexDialog<K, O, ID> exten
             else if ( scanType.equals( LESS_CURSOR ) )
             {
                 list = index.forwardCursor();
-                ForwardIndexEntry<K, O, ID> entry = new ForwardIndexEntry<K, O,
ID>();
+                ForwardIndexEntry<K, ID> entry = new ForwardIndexEntry<K, ID>();
                 entry.setValue( key );
                 list.after( entry );
                 while ( list.previous() )
                 {
-                    IndexEntry<K, O, ID> rec = list.get();
+                    IndexEntry<K, ID> rec = list.get();
                     row = new Object[2];
                     row[0] = rec.getValue();
                     row[1] = rec.getId();
@@ -361,7 +360,7 @@ public class IndexDialog<K, O, ID> exten
                 list = index.forwardCursor();
                 while ( list.next() )
                 {
-                    IndexEntry<K, O, ID> rec = list.get();
+                    IndexEntry<K, ID> 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<K, O, ID> exten
 
         try
         {
-            Cursor<IndexEntry<K, O, ID>> list;
+            Cursor<IndexEntry<K, ID>> list;
 
             if ( scanType.equals( EQUALITY_CURSOR ) )
             {
@@ -298,7 +297,7 @@ public class IndexDialog<K, O, ID> exten
                 list.beforeFirst();
                 while ( list.next() )
                 {
-                    IndexEntry<K, O, ID> rec = list.get();
+                    IndexEntry<K, ID> rec = list.get();
                     row = new Object[2];
                     row[0] = rec.getValue();
                     row[1] = rec.getId();
@@ -309,12 +308,12 @@ public class IndexDialog<K, O, ID> exten
             else if ( scanType.equals( GREATER_CURSOR ) )
             {
                 list = index.forwardCursor();
-                ForwardIndexEntry<K, O, ID> entry = new ForwardIndexEntry<K, O,
ID>();
+                ForwardIndexEntry<K, ID> entry = new ForwardIndexEntry<K, ID>();
                 entry.setValue( key );
                 list.before( entry );
                 while ( list.next() )
                 {
-                    IndexEntry<K, O, ID> rec = list.get();
+                    IndexEntry<K, ID> rec = list.get();
                     row = new Object[2];
                     row[0] = rec.getValue();
                     row[1] = rec.getId();
@@ -325,12 +324,12 @@ public class IndexDialog<K, O, ID> exten
             else if ( scanType.equals( LESS_CURSOR ) )
             {
                 list = index.forwardCursor();
-                ForwardIndexEntry<K, O, ID> entry = new ForwardIndexEntry<K, O,
ID>();
+                ForwardIndexEntry<K, ID> entry = new ForwardIndexEntry<K, ID>();
                 entry.setValue( key );
                 list.after( entry );
                 while ( list.previous() )
                 {
-                    IndexEntry<K, O, ID> rec = list.get();
+                    IndexEntry<K, ID> rec = list.get();
                     row = new Object[2];
                     row[0] = rec.getValue();
                     row[1] = rec.getId();
@@ -363,7 +362,7 @@ public class IndexDialog<K, O, ID> exten
                 list = index.forwardCursor();
                 while ( list.next() )
                 {
-                    IndexEntry<K, O, ID> rec = list.get();
+                    IndexEntry<K, ID> rec = list.get();
                     row = new Object[2];
                     row[0] = rec.getValue();
                     row[1] = rec.getId();



Mime
View raw message