You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2012/08/23 18:17:07 UTC
svn commit: r1376574 [2/2] - in /directory/apacheds/branches/apacheds-mvbt:
jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/
ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/
server-co...
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java Thu Aug 23 16:17:05 2012
@@ -156,7 +156,7 @@ public class NestedFilterTest
}
store = null;
-
+
if ( wkdir != null )
{
FileUtils.deleteDirectory( wkdir );
@@ -175,8 +175,8 @@ public class NestedFilterTest
exprNode.accept( visitor );
optimizer.annotate( exprNode );
- IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
-
+ IndexCursor<?, Long> cursor = cursorBuilder.build( exprNode );
+
assertTrue( cursor.next() );
assertTrue( cursor.available() );
assertEquals( 5, ( long ) cursor.get().getId() );
@@ -205,7 +205,7 @@ public class NestedFilterTest
ExprNode exprNode = FilterParser.parse( schemaManager, filter );
optimizer.annotate( exprNode );
- IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
+ IndexCursor<?, Long> cursor = cursorBuilder.build( exprNode );
assertTrue( cursor.next() );
assertTrue( cursor.available() );
@@ -227,17 +227,17 @@ public class NestedFilterTest
ExprNode exprNode = FilterParser.parse( schemaManager, filter );
optimizer.annotate( exprNode );
- IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
+ IndexCursor<?, Long> cursor = cursorBuilder.build( exprNode );
Set<Long> set = new HashSet<Long>();
-
+
while ( cursor.next() )
{
assertTrue( cursor.available() );
set.add( cursor.get().getId() );
assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getKey() ) );
}
-
+
assertEquals( 2, set.size() );
assertTrue( set.contains( 7L ) );
assertTrue( set.contains( 8L ) );
@@ -255,7 +255,7 @@ public class NestedFilterTest
ExprNode exprNode = FilterParser.parse( schemaManager, filter );
optimizer.annotate( exprNode );
- IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
+ IndexCursor<?, Long> cursor = cursorBuilder.build( exprNode );
cursor.close();
}
}
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Thu Aug 23 16:17:05 2012
@@ -173,21 +173,21 @@ public class NotCursorTest
ExprNode exprNode = FilterParser.parse( schemaManager, filter );
- IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
+ IndexCursor<?, Long> cursor = cursorBuilder.build( exprNode );
assertFalse( cursor.available() );
cursor.beforeFirst();
Set<Long> set = new HashSet<Long>();
-
+
while ( cursor.next() )
{
assertTrue( cursor.available() );
set.add( cursor.get().getId() );
assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getKey() ) );
}
-
+
assertEquals( 5, set.size() );
assertTrue( set.contains( 1L ) );
assertTrue( set.contains( 2L ) );
@@ -217,14 +217,14 @@ public class NotCursorTest
cursor.beforeFirst();
Set<Long> set = new HashSet<Long>();
-
+
while ( cursor.next() )
{
assertTrue( cursor.available() );
set.add( cursor.get().getId() );
assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getKey() ) );
}
-
+
assertEquals( 5, set.size() );
assertTrue( set.contains( 1L ) );
assertTrue( set.contains( 2L ) );
@@ -238,14 +238,14 @@ public class NotCursorTest
cursor.afterLast();
set.clear();
-
+
while ( cursor.previous() )
{
assertTrue( cursor.available() );
set.add( cursor.get().getId() );
assertTrue( uuidSynChecker.isValidSyntax( cursor.get().getKey() ) );
}
-
+
assertEquals( 5, set.size() );
assertTrue( set.contains( 1L ) );
assertTrue( set.contains( 2L ) );
@@ -282,7 +282,7 @@ public class NotCursorTest
catch ( UnsupportedOperationException uoe )
{
}
-
+
cursor.close();
}
}
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Thu Aug 23 16:17:05 2012
@@ -174,7 +174,7 @@ public class OrCursorTest
ExprNode exprNode = FilterParser.parse( schemaManager, filter );
- IndexCursor<?, Entry, Long> cursor = cursorBuilder.build( exprNode );
+ IndexCursor<?, Long> cursor = cursorBuilder.build( exprNode );
cursor.afterLast();
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java Thu Aug 23 16:17:05 2012
@@ -80,7 +80,7 @@ public class EntryNode implements TreeNo
try
{
List<ForwardIndexEntry> recordForwards = new ArrayList<ForwardIndexEntry>();
- IndexCursor<Long, Entry, Long> childList = db.list( id );
+ IndexCursor<Long, Long> childList = db.list( id );
while ( childList.next() )
{
@@ -155,7 +155,7 @@ public class EntryNode implements TreeNo
public TreeNode getChildAt( int childIndex )
{
- return ( TreeNode ) children.get( childIndex );
+ return children.get( childIndex );
}
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java Thu Aug 23 16:17:05 2012
@@ -654,7 +654,7 @@ public class PartitionFrame extends JFra
limitMax = Integer.parseInt( limit );
}
- IndexCursor<Long, Entry, Long> cursor = partition.getSearchEngine().cursor( new Dn( base ),
+ IndexCursor<Long, Long> cursor = partition.getSearchEngine().cursor( new Dn( base ),
AliasDerefMode.DEREF_ALWAYS, root, searchScope );
String[] cols = new String[2];
cols[0] = "id";
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexUtils.java?rev=1376574&r1=1376573&r2=1376574&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexUtils.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexUtils.java Thu Aug 23 16:17:05 2012
@@ -20,13 +20,13 @@
package org.apache.directory.server.xdbm.tools;
+import java.io.OutputStream;
+import java.io.PrintStream;
+
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.server.xdbm.IndexCursor;
import org.apache.directory.shared.ldap.model.entry.Entry;
-import java.io.OutputStream;
-import java.io.PrintStream;
-
/**
* Utility methods for Index objects.
@@ -58,7 +58,7 @@ public class IndexUtils
out = new PrintStream( outputStream );
}
- IndexCursor<?, Entry, Long> cursor = idx.forwardCursor();
+ IndexCursor<?, Long> cursor = idx.forwardCursor();
cursor.first();
for ( Object entry : cursor )
{