directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r640686 - in /directory/sandbox/akarasulu/bigbang: ./ apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/ apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/search/ apacheds/core/src/main/java/org/apache/dire...
Date Tue, 25 Mar 2008 03:39:06 GMT
Author: akarasulu
Date: Mon Mar 24 20:39:04 2008
New Revision: 640686

URL: http://svn.apache.org/viewvc?rev=640686&view=rev
Log:
changes to search engine implementation

 o moved search engine implementation classes to new xdbm-search module
 o cleaned up various interface issues 
     - not using naming exceptions anymore just Exceptions
     - fixed generics issues
 o making a few things compile propertly
 o switching to use Store instead of Partition


Added:
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java   (contents, props changed)
      - copied, changed from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java   (contents, props changed)
      - copied, changed from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DisjunctionEnumeration.java   (contents, props changed)
      - copied, changed from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/Enumerator.java   (contents, props changed)
      - copied, changed from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Enumerator.java
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/Evaluator.java   (contents, props changed)
      - copied, changed from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Evaluator.java
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEnumerator.java   (contents, props changed)
      - copied, changed from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEvaluator.java   (contents, props changed)
      - copied, changed from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java   (contents, props changed)
      - copied, changed from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NoOpOptimizer.java   (contents, props changed)
      - copied, changed from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/NoOpOptimizer.java
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ScopeEnumerator.java   (contents, props changed)
      - copied, changed from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ScopeEvaluator.java   (contents, props changed)
      - copied, changed from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEnumerator.java   (contents, props changed)
      - copied, changed from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java   (contents, props changed)
      - copied, changed from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java
Removed:
    directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java
    directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java
    directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java
    directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Enumerator.java
    directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Evaluator.java
    directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java
    directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java
    directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java
    directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/NoOpOptimizer.java
    directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java
    directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java
    directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java
    directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java
Modified:
    directory/sandbox/akarasulu/bigbang/   (props changed)
    directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Store.java
    directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/search/Optimizer.java
    directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java

Propchange: directory/sandbox/akarasulu/bigbang/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 24 20:39:04 2008
@@ -1,6 +1,7 @@
 workspace
 .clover
 *.ipr
+*.iml
 lost+found
 *.log
 server-work

Modified: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Store.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Store.java?rev=640686&r1=640685&r2=640686&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Store.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/Store.java Mon Mar 24 20:39:04 2008
@@ -23,9 +23,6 @@
 import org.apache.directory.server.schema.registries.OidRegistry;
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.server.schema.registries.Registries;
-import org.apache.directory.server.xdbm.IndexNotFoundException;
-import org.apache.directory.server.xdbm.IndexEntry;
-import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.core.cursor.Cursor;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -179,43 +176,43 @@
     void addIndex( Index index ) throws NamingException;
 
 
-    Index getExistanceIndex();
+    Index<String,E> getExistanceIndex();
 
 
     void setExistanceIndex( Index<String,E> index ) throws NamingException;
 
 
-    Index getHierarchyIndex();
+    Index<Long,E> getHierarchyIndex();
 
 
     void setHierarchyIndex( Index<Long,E> index ) throws NamingException;
 
 
-    Index getAliasIndex();
+    Index<String,E> getAliasIndex();
 
 
     void setAliasIndex( Index<String,E> index ) throws NamingException;
 
 
-    Index getOneAliasIndex();
+    Index<Long,E> getOneAliasIndex();
 
 
     void setOneAliasIndex( Index<Long,E> index ) throws NamingException;
 
 
-    Index getSubAliasIndex();
+    Index<Long,E> getSubAliasIndex();
 
 
     void setSubAliasIndex( Index<Long,E> index ) throws NamingException;
 
 
-    Index getUpdnIndex();
+    Index<String,E> getUpdnIndex();
 
 
     void setUpdnIndex( Index<String,E> index ) throws NamingException;
 
 
-    Index getNdnIndex();
+    Index<String,E> getNdnIndex();
 
 
     void setNdnIndex( Index<String,E> index ) throws NamingException;

Modified: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/search/Optimizer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/search/Optimizer.java?rev=640686&r1=640685&r2=640686&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/search/Optimizer.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/xdbm/search/Optimizer.java Mon Mar 24 20:39:04 2008
@@ -20,8 +20,6 @@
 package org.apache.directory.server.xdbm.search;
 
 
-import javax.naming.NamingException;
-
 import org.apache.directory.shared.ldap.filter.ExprNode;
 
 
@@ -42,7 +40,7 @@
      * Annotates the expression node tree for optimized traversal metrics.
      *
      * @param node the root of the expression node tree
-     * @throws NamingException if there are failures while optimizing
+     * @throws Exception if there are failures while optimizing
      */
     void annotate( ExprNode node ) throws Exception;
 }

Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java?rev=640686&r1=640685&r2=640686&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStore.java Mon Mar 24 20:39:04 2008
@@ -574,7 +574,7 @@
     }
 
 
-    public Index getExistanceIndex()
+    public Index<String,E> getExistanceIndex()
     {
         return existanceIdx;
     }
@@ -588,7 +588,7 @@
     }
 
 
-    public Index getHierarchyIndex()
+    public Index<Long,E> getHierarchyIndex()
     {
         return hierarchyIdx;
     }
@@ -602,7 +602,7 @@
     }
 
 
-    public Index getAliasIndex()
+    public Index<String,E> getAliasIndex()
     {
         return aliasIdx;
     }
@@ -616,7 +616,7 @@
     }
 
 
-    public Index getOneAliasIndex()
+    public Index<Long,E> getOneAliasIndex()
     {
         return oneAliasIdx;
     }
@@ -630,7 +630,7 @@
     }
 
 
-    public Index getSubAliasIndex()
+    public Index<Long,E> getSubAliasIndex()
     {
         return subAliasIdx;
     }
@@ -644,7 +644,7 @@
     }
 
 
-    public Index getUpdnIndex()
+    public Index<String,E> getUpdnIndex()
     {
         return updnIdx;
     }
@@ -658,7 +658,7 @@
     }
 
 
-    public Index getNdnIndex()
+    public Index<String,E> getNdnIndex()
     {
         return ndnIdx;
     }

Copied: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java (from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java&r1=640678&r2=640686&rev=640686&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java Mon Mar 24 20:39:04 2008
@@ -17,12 +17,11 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree;
+package org.apache.directory.server.xdbm.search.impl;
 
 
 import java.util.List;
 
-import javax.naming.NamingException;
 import javax.naming.directory.SearchControls;
 
 import org.apache.directory.shared.ldap.filter.AndNode;
@@ -52,17 +51,17 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class DefaultOptimizer implements Optimizer
+public class DefaultOptimizer<E> implements Optimizer
 {
     /** the database this optimizer operates on */
-    private Store db;
+    private Store<E> db;
 
     /**
      * Creates an optimizer on a database.
      *
      * @param db the database this optimizer works for.
      */
-    public DefaultOptimizer( Store db )
+    public DefaultOptimizer( Store<E> db )
     {
         this.db = db;
     }
@@ -161,7 +160,13 @@
             }
             else if ( node instanceof NotNode )
             {
-            	count = getNegationScan( (NotNode)node );
+                /*
+                 * A negation filter is always worst case since we will have
+                 * to retrieve all entries from the master table then test
+                 * each one against the negated child filter.  There is no way
+                 * to use the indices.
+                 */
+                count = Long.MAX_VALUE;
             }
             else
             {
@@ -188,7 +193,7 @@
      *
      * @param node a AND (Conjunction) BranchNode
      * @return the calculated scan count
-     * @throws NamingException if there is an error
+     * @throws Exception if there is an error
      */
     private long getConjunctionScan( BranchNode node ) throws Exception
     {
@@ -206,28 +211,13 @@
 
 
     /**
-     * A negation filter is always worst case since we will have to retrieve all
-     * entries from the master table then test each one against the negated
-     * child filter.  There is no way to use the indices.
-     *
-     * @param node the negation node
-     * @return the scan count
-     * @throws NamingException if there is an error
-     */
-    private long getNegationScan( BranchNode node ) throws NamingException
-    {
-        return Long.MAX_VALUE;
-    }
-
-
-    /**
      * Disjunctions (OR) are the union of candidates across all subexpressions 
      * so we add all the counts of the child nodes. Notice that we annotate the 
      * child node with a recursive call.
      *
      * @param node the OR branch node
      * @return the scan count on the OR node
-     * @throws NamingException if there is an error
+     * @throws Exception if there is an error
      */
     private long getDisjunctionScan( BranchNode node ) throws Exception
     {
@@ -250,13 +240,14 @@
      *
      * @param node the node to get a scan count for 
      * @return the worst case
-     * @throws NamingException if there is an error accessing an index
+     * @throws Exception if there is an error accessing an index
      */
     private long getEqualityScan( SimpleNode node ) throws Exception
     {
         if ( db.hasUserIndexOn( node.getAttribute() ) )
         {
-            Index idx = db.getUserIndex( node.getAttribute() );
+            //noinspection unchecked
+            Index<Object,E> idx = db.getUserIndex( node.getAttribute() );
             return idx.count( node.getValue() );
         }
 
@@ -272,13 +263,14 @@
      * @param node the greater or less than node to get a count for 
      * @param isGreaterThan if true test is for >=, otherwise <=
      * @return the scan count of all nodes satisfying the AVA
-     * @throws NamingException if there is an error accessing an index
+     * @throws Exception if there is an error accessing an index
      */
     private long getGreaterLessScan( SimpleNode node, boolean isGreaterThan ) throws Exception
     {
         if ( db.hasUserIndexOn( node.getAttribute() ) )
         {
-            Index idx = db.getUserIndex( node.getAttribute() );
+            //noinspection unchecked
+            Index<Object, E> idx = db.getUserIndex( node.getAttribute() );
             if ( isGreaterThan )
             {
                 return idx.greaterThanCount( node.getValue() );
@@ -301,7 +293,7 @@
      *
      * @param node the leaf node to get a full scan count for 
      * @return the worst case full scan count
-     * @throws NamingException if there is an error access database indices
+     * @throws Exception if there is an error access database indices
      */
     private long getFullScan( LeafNode node ) throws Exception
     {
@@ -321,13 +313,13 @@
      *
      * @param node the presence node
      * @return the number of entries matched for the presence of an attribute
-     * @throws NamingException if errors result
+     * @throws Exception if errors result
      */
     private long getPresenceScan( PresenceNode node ) throws Exception
     {
         if ( db.hasUserIndexOn( node.getAttribute() ) )
         {
-            Index idx = db.getExistanceIndex();
+            Index<String,E> idx = db.getExistanceIndex();
             return idx.count( node.getAttribute() );
         }
 
@@ -340,7 +332,7 @@
      *
      * @param node the ScopeNode
      * @return the scan count for scope
-     * @throws NamingException if any errors result
+     * @throws Exception if any errors result
      */
     private long getScopeScan( ScopeNode node ) throws Exception
     {

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Mar 24 20:39:04 2008
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java (from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java&r1=640678&r2=640686&rev=640686&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java Mon Mar 24 20:39:04 2008
@@ -17,12 +17,9 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree;
+package org.apache.directory.server.xdbm.search.impl;
 
 
-import javax.naming.Name;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
 import javax.naming.directory.SearchControls;
 
 import org.apache.directory.shared.ldap.filter.AndNode;
@@ -34,6 +31,7 @@
 import org.apache.directory.server.xdbm.*;
 import org.apache.directory.server.xdbm.search.Optimizer;
 import org.apache.directory.server.xdbm.search.SearchEngine;
+import org.apache.directory.server.core.cursor.Cursor;
 
 
 /**
@@ -43,16 +41,16 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public class DefaultSearchEngine implements SearchEngine
+public class DefaultSearchEngine<E> implements SearchEngine<E>
 {
     /** the Optimizer used by this DefaultSearchEngine */
     private final Optimizer optimizer;
     /** the Database this DefaultSearchEngine operates on */
-    private Store db;
+    private Store<E> db;
     /** Evaluator flyweight used for filter expression assertions */
-    private ExpressionEvaluator evaluator;
+    private Evaluator<E> evaluator;
     /** Enumerator flyweight that creates enumerations on filter expressions */
-    private ExpressionEnumerator enumerator;
+    private Enumerator<E> enumerator;
 
 
     // ------------------------------------------------------------------------
@@ -67,8 +65,7 @@
      * @param evaluator an expression evaluator
      * @param optimizer an optimizer to use during search
      */
-    public DefaultSearchEngine( Store db, ExpressionEvaluator evaluator,
-        ExpressionEnumerator enumerator, Optimizer optimizer )
+    public DefaultSearchEngine( Store<E> db, Evaluator<E> evaluator, Enumerator<E> enumerator, Optimizer optimizer )
     {
         this.db = db;
         this.evaluator = evaluator;
@@ -88,12 +85,12 @@
     }
 
 
-    public NamingEnumeration<IndexEntry> search( Name base, AliasDerefMode aliasDerefMode, ExprNode filter, SearchControls searchCtls )
+    public Cursor<IndexEntry<Long,E>> search( LdapDN base, AliasDerefMode aliasDerefMode, ExprNode filter, SearchControls searchCtls )
         throws Exception
     {
-        Name effectiveBase;
+        LdapDN effectiveBase;
         Long baseId = db.getEntryId( base.toString() );
-        String aliasedBase = ( String ) db.getAliasIndex().reverseLookup( baseId );
+        String aliasedBase = db.getAliasIndex().reverseLookup( baseId );
 
         // --------------------------------------------------------------------
         // Determine the effective base with aliases
@@ -132,11 +129,11 @@
 
 
     /**
-     * @see org.apache.directory.server.xdbm.search.SearchEngine#evaluate(ExprNode, Long)
+     * @see SearchEngine#evaluate(ExprNode, Long)
      */
-    public boolean evaluate( ExprNode ilter, Long id ) throws NamingException
+    public boolean evaluate( ExprNode ilter, Long id ) throws Exception
     {
-        IndexEntry rec = new ForwardIndexEntry();
+        IndexEntry<Long,E> rec = new ForwardIndexEntry<Long,E>();
         rec.setId( id );
         return evaluator.evaluate( ilter, rec );
     }

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Mar 24 20:39:04 2008
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DisjunctionEnumeration.java (from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DisjunctionEnumeration.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DisjunctionEnumeration.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java&r1=640678&r2=640686&rev=640686&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DisjunctionEnumeration.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DisjunctionEnumeration.java Mon Mar 24 20:39:04 2008
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree;
+package org.apache.directory.server.xdbm.search.impl;
 
 
 import org.apache.directory.server.xdbm.ForwardIndexEntry;

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DisjunctionEnumeration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/DisjunctionEnumeration.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Mar 24 20:39:04 2008
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/Enumerator.java (from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Enumerator.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/Enumerator.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/Enumerator.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Enumerator.java&r1=640678&r2=640686&rev=640686&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Enumerator.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/Enumerator.java Mon Mar 24 20:39:04 2008
@@ -17,22 +17,21 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree;
+package org.apache.directory.server.xdbm.search.impl;
 
 
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-
 import org.apache.directory.shared.ldap.filter.ExprNode;
+import org.apache.directory.server.xdbm.IndexEntry;
+import org.apache.directory.server.core.cursor.Cursor;
 
 
 /**
- * An enumeration builder or factory for filter expressions.
+ * Builds a Cursor over IndexEntry set satisfying a filter expression.
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface Enumerator
+public interface Enumerator<E>
 {
     /**
      * Creates an enumeration to enumerate through the set of candidates 
@@ -40,7 +39,7 @@
      * 
      * @param node a filter expression root
      * @return an enumeration over the 
-     * @throws NamingException if database access fails
+     * @throws Exception if database access fails
      */
-    NamingEnumeration<IndexRecord> enumerate( ExprNode node ) throws NamingException;
+    Cursor<IndexEntry<Long,E>> enumerate( ExprNode node ) throws Exception;
 }

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/Enumerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/Enumerator.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Mar 24 20:39:04 2008
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/Evaluator.java (from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Evaluator.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/Evaluator.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/Evaluator.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Evaluator.java&r1=640678&r2=640686&rev=640686&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/Evaluator.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/Evaluator.java Mon Mar 24 20:39:04 2008
@@ -17,11 +17,9 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree;
+package org.apache.directory.server.xdbm.search.impl;
 
 
-import javax.naming.NamingException;
-
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.server.xdbm.IndexEntry;
 
@@ -34,7 +32,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface Evaluator
+public interface Evaluator<E>
 {
     /**
      * Evaluates a candidate to determine if a filter expression selects it.
@@ -42,7 +40,7 @@
      * @param node the filter expression to evaluate on the candidate
      * @param entry the index record of the entry to evaluate
      * @return true if the filter selects the candidate false otherwise
-     * @throws NamingException if there is a database fault during evaluation
+     * @throws Exception if there is a database fault during evaluation
      */
-    boolean evaluate( ExprNode node, IndexEntry entry ) throws NamingException;
+    boolean evaluate( ExprNode node, IndexEntry<Long,E> entry ) throws Exception;
 }

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/Evaluator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/Evaluator.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Mar 24 20:39:04 2008
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEnumerator.java (from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEnumerator.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEnumerator.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java&r1=640678&r2=640686&rev=640686&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEnumerator.java Mon Mar 24 20:39:04 2008
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree;
+package org.apache.directory.server.xdbm.search.impl;
 
 
 import java.util.List;
@@ -29,6 +29,8 @@
 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.core.partition.impl.btree.IndexAssertion;
+import org.apache.directory.server.core.partition.impl.btree.IndexAssertionEnumeration;
 import org.apache.directory.shared.ldap.NotImplementedException;
 import org.apache.directory.shared.ldap.filter.AndNode;
 import org.apache.directory.shared.ldap.filter.ApproximateNode;

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEnumerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEnumerator.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Mar 24 20:39:04 2008
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEvaluator.java (from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEvaluator.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEvaluator.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java&r1=640678&r2=640686&rev=640686&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEvaluator.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEvaluator.java Mon Mar 24 20:39:04 2008
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree;
+package org.apache.directory.server.xdbm.search.impl;
 
 
 import javax.naming.NamingException;
@@ -94,7 +94,7 @@
     // ------------------------------------------------------------------------
 
     /**
-     * @see org.apache.directory.server.core.partition.impl.btree.Evaluator#evaluate(ExprNode, IndexEntry)
+     * @see Evaluator#evaluate(ExprNode, IndexEntry)
      */
     public boolean evaluate( ExprNode node, IndexEntry entry ) throws NamingException
     {

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEvaluator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ExpressionEvaluator.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Mar 24 20:39:04 2008
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java (from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java&r1=640678&r2=640686&rev=640686&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java Mon Mar 24 20:39:04 2008
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree;
+package org.apache.directory.server.xdbm.search.impl;
 
 
 import java.util.Comparator;
@@ -180,7 +180,7 @@
 
 
     /**
-     * @see org.apache.directory.server.core.partition.impl.btree.Evaluator#evaluate(ExprNode, IndexEntry)
+     * @see Evaluator#evaluate(ExprNode, IndexEntry)
      */
     public boolean evaluate( ExprNode node, IndexEntry entry ) throws NamingException
     {

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Mar 24 20:39:04 2008
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NoOpOptimizer.java (from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/NoOpOptimizer.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NoOpOptimizer.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NoOpOptimizer.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/NoOpOptimizer.java&r1=640678&r2=640686&rev=640686&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/NoOpOptimizer.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NoOpOptimizer.java Mon Mar 24 20:39:04 2008
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree;
+package org.apache.directory.server.xdbm.search.impl;
 
 import javax.naming.NamingException;
 

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/NoOpOptimizer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ScopeEnumerator.java (from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ScopeEnumerator.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ScopeEnumerator.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java&r1=640678&r2=640686&rev=640686&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEnumerator.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ScopeEnumerator.java Mon Mar 24 20:39:04 2008
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree;
+package org.apache.directory.server.xdbm.search.impl;
 
 
 import javax.naming.NamingEnumeration;
@@ -30,6 +30,8 @@
 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.core.partition.impl.btree.IndexAssertionEnumeration;
+import org.apache.directory.server.core.partition.impl.btree.IndexAssertion;
 
 
 /**
@@ -60,7 +62,7 @@
      * @param node the scope node 
      * @return the candidates that are within scope
      * @throws NamingException if any system indices fail
-     * @see org.apache.directory.server.core.partition.impl.btree.Enumerator#enumerate(ExprNode)
+     * @see Enumerator#enumerate(ExprNode)
      */
     public NamingEnumeration<ForwardIndexEntry> enumerate( ExprNode node ) throws NamingException
     {

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ScopeEnumerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ScopeEnumerator.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Mar 24 20:39:04 2008
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ScopeEvaluator.java (from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ScopeEvaluator.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ScopeEvaluator.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java&r1=640678&r2=640686&rev=640686&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ScopeEvaluator.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ScopeEvaluator.java Mon Mar 24 20:39:04 2008
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree;
+package org.apache.directory.server.xdbm.search.impl;
 
 
 import javax.naming.NamingException;
@@ -54,7 +54,7 @@
 
 
     /**
-     * @see org.apache.directory.server.core.partition.impl.btree.Evaluator#evaluate(ExprNode, org.apache.directory.server.xdbm.IndexEntry)
+     * @see Evaluator#evaluate(ExprNode, org.apache.directory.server.xdbm.IndexEntry)
      */
     public boolean evaluate( ExprNode node, IndexEntry entry ) throws NamingException
     {

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ScopeEvaluator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/ScopeEvaluator.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Mar 24 20:39:04 2008
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEnumerator.java (from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEnumerator.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEnumerator.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java&r1=640678&r2=640686&rev=640686&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEnumerator.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEnumerator.java Mon Mar 24 20:39:04 2008
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree;
+package org.apache.directory.server.xdbm.search.impl;
 
 
 import java.util.regex.Pattern;
@@ -30,6 +30,8 @@
 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.core.partition.impl.btree.IndexAssertion;
+import org.apache.directory.server.core.partition.impl.btree.IndexAssertionEnumeration;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.SubstringNode;
 import org.apache.directory.shared.ldap.schema.AttributeType;

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEnumerator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEnumerator.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Mar 24 20:39:04 2008
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id

Copied: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java (from r640678, directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java&r1=640678&r2=640686&rev=640686&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/SubstringEvaluator.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java Mon Mar 24 20:39:04 2008
@@ -17,7 +17,7 @@
  *  under the License. 
  *  
  */
-package org.apache.directory.server.core.partition.impl.btree;
+package org.apache.directory.server.xdbm.search.impl;
 
 
 import java.util.Iterator;
@@ -70,7 +70,7 @@
 
 
     /**
-     * @see org.apache.directory.server.core.partition.impl.btree.Evaluator#evaluate(ExprNode, IndexEntry)
+     * @see Evaluator#evaluate(ExprNode, IndexEntry)
      */
     public boolean evaluate( ExprNode node, IndexEntry entry ) throws NamingException
     {

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Mon Mar 24 20:39:04 2008
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id



Mime
View raw message