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/09/11 12:50:23 UTC
svn commit: r1383346 - in
/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src:
main/java/org/apache/directory/server/core/partition/impl/btree/
main/java/org/apache/directory/server/xdbm/
test/java/org/apache/directory/server/xdbm/
Author: elecharny
Date: Tue Sep 11 10:50:23 2012
New Revision: 1383346
URL: http://svn.apache.org/viewvc?rev=1383346&view=rev
Log:
o Removed the ReverseIndexEntry class, we don't use it anymore
o The IndexCursorAdaptor just use the FowardIndexEntry from now on
Removed:
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/ReverseIndexEntryTest.java
Modified:
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java?rev=1383346&r1=1383345&r2=1383346&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java Tue Sep 11 10:50:23 2012
@@ -25,7 +25,6 @@ import java.util.Iterator;
import org.apache.directory.server.xdbm.AbstractIndexCursor;
import org.apache.directory.server.xdbm.ForwardIndexEntry;
import org.apache.directory.server.xdbm.IndexEntry;
-import org.apache.directory.server.xdbm.ReverseIndexEntry;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.model.cursor.ClosureMonitor;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
@@ -49,7 +48,6 @@ public class IndexCursorAdaptor<K> exten
@SuppressWarnings("unchecked")
final Cursor<Tuple> wrappedCursor;
final ForwardIndexEntry<K, String> forwardEntry;
- final ReverseIndexEntry<K, String> reverseEntry;
/**
@@ -65,16 +63,7 @@ public class IndexCursorAdaptor<K> exten
{
this.wrappedCursor = wrappedCursor;
- if ( forwardIndex )
- {
- forwardEntry = new ForwardIndexEntry<K, String>();
- reverseEntry = null;
- }
- else
- {
- forwardEntry = null;
- reverseEntry = new ReverseIndexEntry<K, String>();
- }
+ forwardEntry = new ForwardIndexEntry<K, String>();
LOG_CURSOR.debug( "Creating IndexCursorAdaptor {}", this );
}
@@ -143,18 +132,10 @@ public class IndexCursorAdaptor<K> exten
@SuppressWarnings("unchecked")
public IndexEntry<K, String> get() throws Exception
{
- if ( forwardEntry != null )
- {
- Tuple<K, String> tuple = wrappedCursor.get();
- forwardEntry.setTuple( tuple );
- return forwardEntry;
- }
- else
- {
- Tuple<String, K> tuple = wrappedCursor.get();
- reverseEntry.setTuple( tuple );
- return reverseEntry;
- }
+ Tuple<K, String> tuple = wrappedCursor.get();
+ forwardEntry.setTuple( tuple );
+
+ return forwardEntry;
}