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 19:54:09 UTC
svn commit: r1376612 -
/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/
Author: elecharny
Date: Thu Aug 23 17:54:08 2012
New Revision: 1376612
URL: http://svn.apache.org/viewvc?rev=1376612&view=rev
Log:
o Made some method private
o Removed the use of the index, use the entry instead
Modified:
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/AndEvaluator.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/ApproximateEvaluator.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/GreaterEqEvaluator.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LessEqEvaluator.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/PresenceEvaluator.java
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/AndEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/AndEvaluator.java?rev=1376612&r1=1376611&r2=1376612&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/AndEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/AndEvaluator.java Thu Aug 23 17:54:08 2012
@@ -69,7 +69,7 @@ public class AndEvaluator<ID> implements
* @param unoptimized the unoptimized list of Evaluators
* @return optimized Evaluator list with increasing scan count ordering
*/
- List<Evaluator<? extends ExprNode, ID>> optimize(
+ private List<Evaluator<? extends ExprNode, ID>> optimize(
List<Evaluator<? extends ExprNode, ID>> unoptimized )
{
List<Evaluator<? extends ExprNode, ID>> optimized = new ArrayList<Evaluator<? extends ExprNode, ID>>(
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/ApproximateEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/ApproximateEvaluator.java?rev=1376612&r1=1376611&r2=1376612&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/ApproximateEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/ApproximateEvaluator.java Thu Aug 23 17:54:08 2012
@@ -134,11 +134,6 @@ public class ApproximateEvaluator<T, ID
*/
public boolean evaluate( IndexEntry<?, ID> indexEntry ) throws Exception
{
- if ( idx != null )
- {
- return idx.forward( node.getValue().getValue(), indexEntry.getId() );
- }
-
Entry entry = indexEntry.getEntry();
// resuscitate the entry if it has not been and set entry in IndexEntry
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java?rev=1376612&r1=1376611&r2=1376612&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/EqualityEvaluator.java Thu Aug 23 17:54:08 2012
@@ -94,11 +94,6 @@ public class EqualityEvaluator<T, ID ext
public boolean evaluate( IndexEntry<?, ID> indexEntry ) throws Exception
{
- if ( idx != null )
- {
- return idx.forward( node.getValue().getValue(), indexEntry.getId() );
- }
-
Entry entry = indexEntry.getEntry();
// resuscitate the entry if it has not been and set entry in IndexEntry
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/GreaterEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/GreaterEqEvaluator.java?rev=1376612&r1=1376611&r2=1376612&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/GreaterEqEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/GreaterEqEvaluator.java Thu Aug 23 17:54:08 2012
@@ -209,6 +209,7 @@ public class GreaterEqEvaluator<T, ID ex
{
indexEntry.setKey( value.getNormValue() );
}
+
return true;
}
}
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LessEqEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LessEqEvaluator.java?rev=1376612&r1=1376611&r2=1376612&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LessEqEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/LessEqEvaluator.java Thu Aug 23 17:54:08 2012
@@ -89,11 +89,6 @@ public class LessEqEvaluator<T, ID exten
public boolean evaluate( IndexEntry<?, ID> indexEntry ) throws Exception
{
- if ( ( idx != null ) && idx.isDupsEnabled() )
- {
- return idx.reverseLessOrEq( indexEntry.getId(), node.getValue().getValue() );
- }
-
Entry entry = indexEntry.getEntry();
// resuscitate the entry if it has not been and set entry in IndexEntry
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/PresenceEvaluator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/PresenceEvaluator.java?rev=1376612&r1=1376611&r2=1376612&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/PresenceEvaluator.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/evaluator/PresenceEvaluator.java Thu Aug 23 17:54:08 2012
@@ -92,11 +92,6 @@ public class PresenceEvaluator<ID extend
// wrapper or the raw normalized value
public boolean evaluate( IndexEntry<?, ID> indexEntry ) throws Exception
{
- if ( idx != null )
- {
- return idx.forward( attributeType.getOid(), indexEntry.getId() );
- }
-
Entry entry = indexEntry.getEntry();
// resuscitate the entry if it has not been and set entry in IndexEntry