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/25 05:33:37 UTC
svn commit: r1377190 - in
/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm:
AbstractIndexCursor.java search/cursor/OrCursor.java
search/impl/DefaultSearchEngine.java
Author: elecharny
Date: Sat Aug 25 03:33:37 2012
New Revision: 1377190
URL: http://svn.apache.org/viewvc?rev=1377190&view=rev
Log:
Minor formatting
Modified:
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OrCursor.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java?rev=1377190&r1=1377189&r2=1377190&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java Sat Aug 25 03:33:37 2012
@@ -24,7 +24,7 @@ import org.apache.directory.shared.ldap.
/**
- * An abstract TupleCursor.
+ * An abstract Cursor used by the index cursors.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OrCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OrCursor.java?rev=1377190&r1=1377189&r2=1377190&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OrCursor.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/cursor/OrCursor.java Sat Aug 25 03:33:37 2012
@@ -195,6 +195,7 @@ public class OrCursor<V, ID> extends Abs
{
checkNotClosed( "next()" );
IndexEntry<?, ID> candidate = cursors.get( cursorIndex ).get();
+
if ( !isBlackListed( candidate.getId() ) )
{
blackListIfDuplicate( candidate );
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java?rev=1377190&r1=1377189&r2=1377190&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java Sat Aug 25 03:33:37 2012
@@ -55,8 +55,10 @@ public class DefaultSearchEngine<ID exte
/** the Database this DefaultSearchEngine operates on */
private final Store<Entry, ID> db;
+
/** creates Cursors over entries satisfying filter expressions */
private final CursorBuilder<ID> cursorBuilder;
+
/** creates evaluators which check to see if candidates satisfy a filter expression */
private final EvaluatorBuilder<ID> evaluatorBuilder;