directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r642356 - in /directory/sandbox/akarasulu/bigbang/apacheds: btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/
Date Fri, 28 Mar 2008 20:06:21 GMT
Author: akarasulu
Date: Fri Mar 28 13:06:19 2008
New Revision: 642356

URL: http://svn.apache.org/viewvc?rev=642356&view=rev
Log:
completed initial SubtringCursor and SubstringEvaluator implementation

Added:
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java
Removed:
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursorBuilder.java
Modified:
    directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java
    directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java

Modified: directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java?rev=642356&r1=642355&r2=642356&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java
(original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexAssertion.java
Fri Mar 28 13:06:19 2008
@@ -33,7 +33,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-public interface IndexAssertion
+public interface IndexAssertion<K,E>
 {
     /**
      * Tests to see if a perspective candidate should be returned based on 
@@ -47,5 +47,5 @@
      * @throws NamingException if their are failures while asserting the 
      * condition
      */
-    boolean assertCandidate( IndexEntry entry ) throws Exception;
+    boolean assertCandidate( IndexEntry<K,E> entry ) throws Exception;
 }

Added: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java?rev=642356&view=auto
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java
(added)
+++ directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java
Fri Mar 28 13:06:19 2008
@@ -0,0 +1,214 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
+package org.apache.directory.server.xdbm.search.impl;
+
+
+import org.apache.directory.server.core.cursor.AbstractCursor;
+import org.apache.directory.server.core.cursor.Cursor;
+import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
+import org.apache.directory.server.core.partition.impl.btree.IndexAssertion;
+import org.apache.directory.server.xdbm.IndexEntry;
+import org.apache.directory.server.xdbm.Store;
+import org.apache.directory.server.xdbm.Index;
+import org.apache.directory.shared.ldap.filter.SubstringNode;
+
+import javax.naming.directory.Attributes;
+
+
+/**
+ * A Cursor traversing candidates matching a Substring assertion expression.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $$Rev$$
+ */
+public class SubstringCursor extends AbstractCursor<IndexEntry<String, Attributes>>
+{
+    private static final String UNSUPPORTED_MSG =
+        "SubstringCursors may not be ordered and do not support positioning by element.";
+    private Cursor<IndexEntry<String,Attributes>> wrapped;
+    private IndexAssertion<String,Attributes> indexAssertion;
+    private boolean available = false;
+
+
+    public SubstringCursor( Store<Attributes> db,
+                            final SubstringEvaluator substringEvaluator ) throws Exception
+    {
+        SubstringNode node = ( SubstringNode ) substringEvaluator.getExpression();
+
+        if ( db.hasUserIndexOn( node.getAttribute() ) )
+        {
+            /*
+             * Get the user index and return an index enumeration using the the
+             * compiled regular expression.  Try to constrain even further if
+             * an initial term is available in the substring expression.
+             */
+            //noinspection unchecked
+            Index<String,Attributes> idx = db.getUserIndex( node.getAttribute() );
+
+            if ( null == node.getInitial() )
+            {
+                wrapped = idx.forwardCursor();
+            }
+            else
+            {
+                wrapped = idx.forwardCursor( node.getInitial() );
+            }
+
+            /*
+             * The Cursor used is over the index for this attribute so the
+             * values are already normalized.  The value of the IndexEntry is
+             * the value of the attribute (not the ndn as below when we do not
+             * have an Index for the attribute).  All we have to do is see if
+             * the value of the IndexEntry is matched by the filter and
+             * return the result.  We reuse the regex Pattern already compiled
+             * for the substringEvaluator instead of recompiling for this
+             * Cursor.
+             */
+            indexAssertion = new IndexAssertion<String,Attributes>()
+            {
+                public boolean assertCandidate( final IndexEntry<String,Attributes>
entry ) throws Exception
+                {
+                    return substringEvaluator.getPattern().matcher( entry.getValue() ).matches();
+                }
+            };
+        }
+        else
+        {
+            /*
+             * There is no index on the attribute here.  We have no choice but
+             * to perform a full table scan but need to leverage an index for the
+             * wrapped Cursor.  We know that all entries are listed under
+             * the ndn index and so this will enumerate over all entries.  The
+             * substringEvaluator is used in an assertion to constrain the
+             * result set to only those entries matching the pattern.  The
+             * substringEvaluator handles all the details of normalization and
+             * knows to use it, when it itself detects the lack of an index on
+             * the node's attribute.
+             */
+            wrapped = db.getNdnIndex().forwardCursor();
+
+            indexAssertion = new IndexAssertion<String,Attributes>()
+            {
+                public boolean assertCandidate( final IndexEntry<String,Attributes>
entry ) throws Exception
+                {
+                    return substringEvaluator.evaluate( entry );
+                }
+            };
+        }
+    }
+
+
+    public boolean available()
+    {
+        return false;
+    }
+
+
+    public void before( IndexEntry<String, Attributes> element ) throws Exception
+    {
+        throw new UnsupportedOperationException( UNSUPPORTED_MSG );
+    }
+
+
+    public void after( IndexEntry<String, Attributes> element ) throws Exception
+    {
+        throw new UnsupportedOperationException( UNSUPPORTED_MSG );
+    }
+
+
+    public void beforeFirst() throws Exception
+    {
+        wrapped.beforeFirst();
+    }
+
+
+    public void afterLast() throws Exception
+    {
+        wrapped.afterLast();
+    }
+
+
+    public boolean first() throws Exception
+    {
+        beforeFirst();
+        return next();
+    }
+
+
+    public boolean last() throws Exception
+    {
+        afterLast();
+        return previous();
+    }
+
+
+    public boolean previous() throws Exception
+    {
+        while ( wrapped.previous() )
+        {
+            IndexEntry<String,Attributes> entry = wrapped.get();
+            if ( indexAssertion.assertCandidate( entry ) )
+            {
+                return available = true;
+            }
+        }
+
+        return available = false;
+    }
+
+
+    public boolean next() throws Exception
+    {
+        while ( wrapped.next() )
+        {
+            IndexEntry<String,Attributes> entry = wrapped.get();
+            if ( indexAssertion.assertCandidate( entry ) )
+            {
+                return available = true;
+            }
+        }
+
+        return available = false;
+    }
+
+
+    public IndexEntry<String, Attributes> get() throws Exception
+    {
+        if ( available )
+        {
+            return wrapped.get();
+        }
+
+        throw new InvalidCursorPositionException( "Cursor has yet to be positioned." );
+    }
+
+
+    public boolean isElementReused()
+    {
+        return wrapped.isElementReused();
+    }
+
+
+    public void close() throws Exception
+    {
+        super.close();
+        wrapped.close();
+    }
+}

Modified: directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/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?rev=642356&r1=642355&r2=642356&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
(original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/xdbm-search/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
Fri Mar 28 13:06:19 2008
@@ -123,6 +123,12 @@
     }
 
 
+    public Pattern getPattern()
+    {
+        return regex;
+    }
+
+
     public ExprNode getExpression()
     {
         return node;



Mime
View raw message