Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 06D5F9A5A for ; Thu, 23 Aug 2012 17:24:52 +0000 (UTC) Received: (qmail 70152 invoked by uid 500); 23 Aug 2012 17:24:51 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 70091 invoked by uid 500); 23 Aug 2012 17:24:51 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 70083 invoked by uid 99); 23 Aug 2012 17:24:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Aug 2012 17:24:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Aug 2012 17:24:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CB7082388900 for ; Thu, 23 Aug 2012 17:24:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1376603 [2/2] - in /directory/apacheds/branches/apacheds-mvbt: ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/ xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/ xdbm-partition... Date: Thu, 23 Aug 2012 17:24:04 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120823172406.CB7082388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java?rev=1376603&r1=1376602&r2=1376603&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java Thu Aug 23 17:24:02 2012 @@ -26,6 +26,17 @@ import java.util.List; import org.apache.directory.server.i18n.I18n; import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.search.Evaluator; +import org.apache.directory.server.xdbm.search.evaluator.AndEvaluator; +import org.apache.directory.server.xdbm.search.evaluator.ApproximateEvaluator; +import org.apache.directory.server.xdbm.search.evaluator.EqualityEvaluator; +import org.apache.directory.server.xdbm.search.evaluator.GreaterEqEvaluator; +import org.apache.directory.server.xdbm.search.evaluator.LessEqEvaluator; +import org.apache.directory.server.xdbm.search.evaluator.NotEvaluator; +import org.apache.directory.server.xdbm.search.evaluator.OneLevelScopeEvaluator; +import org.apache.directory.server.xdbm.search.evaluator.OrEvaluator; +import org.apache.directory.server.xdbm.search.evaluator.PresenceEvaluator; +import org.apache.directory.server.xdbm.search.evaluator.SubstringEvaluator; +import org.apache.directory.server.xdbm.search.evaluator.SubtreeScopeEvaluator; import org.apache.directory.shared.ldap.model.entry.Entry; import org.apache.directory.shared.ldap.model.filter.AndNode; import org.apache.directory.shared.ldap.model.filter.ApproximateNode; @@ -69,7 +80,7 @@ public class EvaluatorBuilder Evaluator build( ExprNode node ) throws Exception + public Evaluator build( ExprNode node ) throws Exception { switch ( node.getAssertionType() ) { @@ -129,7 +140,7 @@ public class EvaluatorBuilder buildAndEvaluator( AndNode node ) throws Exception { List children = node.getChildren(); - List> evaluators = new ArrayList>( + List> evaluators = new ArrayList>( children.size() ); for ( ExprNode child : children ) { @@ -142,7 +153,7 @@ public class EvaluatorBuilder buildOrEvaluator( OrNode node ) throws Exception { List children = node.getChildren(); - List> evaluators = new ArrayList>( + List> evaluators = new ArrayList>( children.size() ); for ( ExprNode child : children ) { Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ScanCountComparator.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ScanCountComparator.java?rev=1376603&r1=1376602&r2=1376603&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ScanCountComparator.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ScanCountComparator.java Thu Aug 23 17:24:02 2012 @@ -23,7 +23,6 @@ package org.apache.directory.server.xdbm import java.util.Comparator; import org.apache.directory.server.xdbm.search.Evaluator; -import org.apache.directory.shared.ldap.model.entry.Entry; /** @@ -33,12 +32,12 @@ import org.apache.directory.shared.ldap. * * @param The type of element */ -public class ScanCountComparator implements Comparator> +public class ScanCountComparator implements Comparator> { /** * Compare two scan counts frpm two evaluators */ - public int compare( Evaluator e1, Evaluator e2 ) + public int compare( Evaluator e1, Evaluator e2 ) { long scanCount1 = ( Long ) e1.getExpression().get( "count" ); long scanCount2 = ( Long ) e2.getExpression().get( "count" ); Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java?rev=1376603&r1=1376602&r2=1376603&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java Thu Aug 23 17:24:02 2012 @@ -38,6 +38,10 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.xdbm.StoreUtils; import org.apache.directory.server.xdbm.impl.avl.AvlIndex; import org.apache.directory.server.xdbm.search.Evaluator; +import org.apache.directory.server.xdbm.search.cursor.AndCursor; +import org.apache.directory.server.xdbm.search.cursor.SubstringCursor; +import org.apache.directory.server.xdbm.search.evaluator.PresenceEvaluator; +import org.apache.directory.server.xdbm.search.evaluator.SubstringEvaluator; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.model.entry.Entry; @@ -207,8 +211,8 @@ public class AndCursorTest { AndNode andNode = new AndNode(); - List> evaluators = new ArrayList>(); - Evaluator eval; + List> evaluators = new ArrayList>(); + Evaluator eval; ExprNode exprNode = new SubstringNode( schemaManager.getAttributeType( "cn" ), "J", null ); eval = new SubstringEvaluator( ( SubstringNode ) exprNode, store, schemaManager ); Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java?rev=1376603&r1=1376602&r2=1376603&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java Thu Aug 23 17:24:02 2012 @@ -41,6 +41,8 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.StoreUtils; import org.apache.directory.server.xdbm.impl.avl.AvlIndex; +import org.apache.directory.server.xdbm.search.cursor.GreaterEqCursor; +import org.apache.directory.server.xdbm.search.evaluator.GreaterEqEvaluator; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.csn.CsnFactory; import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java?rev=1376603&r1=1376602&r2=1376603&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java Thu Aug 23 17:24:02 2012 @@ -41,6 +41,8 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.StoreUtils; import org.apache.directory.server.xdbm.impl.avl.AvlIndex; +import org.apache.directory.server.xdbm.search.cursor.LessEqCursor; +import org.apache.directory.server.xdbm.search.evaluator.LessEqEvaluator; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.csn.CsnFactory; import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java?rev=1376603&r1=1376602&r2=1376603&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java Thu Aug 23 17:24:02 2012 @@ -38,6 +38,8 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.xdbm.StoreUtils; import org.apache.directory.server.xdbm.impl.avl.AvlIndex; import org.apache.directory.server.xdbm.search.Evaluator; +import org.apache.directory.server.xdbm.search.cursor.NotCursor; +import org.apache.directory.server.xdbm.search.evaluator.SubstringEvaluator; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.model.entry.Entry; @@ -209,7 +211,7 @@ public class NotCursorTest NotNode notNode = new NotNode(); ExprNode exprNode = new SubstringNode( schemaManager.getAttributeType( "cn" ), "J", null ); - Evaluator eval = new SubstringEvaluator( ( SubstringNode ) exprNode, store, + Evaluator eval = new SubstringEvaluator( ( SubstringNode ) exprNode, store, schemaManager ); notNode.addNode( exprNode ); Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java?rev=1376603&r1=1376602&r2=1376603&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java Thu Aug 23 17:24:02 2012 @@ -38,6 +38,8 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.StoreUtils; import org.apache.directory.server.xdbm.impl.avl.AvlIndex; +import org.apache.directory.server.xdbm.search.cursor.OneLevelScopeCursor; +import org.apache.directory.server.xdbm.search.evaluator.OneLevelScopeEvaluator; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.csn.CsnFactory; import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java?rev=1376603&r1=1376602&r2=1376603&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java Thu Aug 23 17:24:02 2012 @@ -39,6 +39,9 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.xdbm.StoreUtils; import org.apache.directory.server.xdbm.impl.avl.AvlIndex; import org.apache.directory.server.xdbm.search.Evaluator; +import org.apache.directory.server.xdbm.search.cursor.OrCursor; +import org.apache.directory.server.xdbm.search.cursor.SubstringCursor; +import org.apache.directory.server.xdbm.search.evaluator.SubstringEvaluator; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.cursor.Cursor; import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; @@ -255,9 +258,9 @@ public class OrCursorTest @SuppressWarnings("unchecked") public void testOrCursor() throws Exception { - List> evaluators = new ArrayList>(); + List> evaluators = new ArrayList>(); List>> cursors = new ArrayList>>(); - Evaluator eval; + Evaluator eval; Cursor> cursor; OrNode orNode = new OrNode(); Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java?rev=1376603&r1=1376602&r2=1376603&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java Thu Aug 23 17:24:02 2012 @@ -38,6 +38,8 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.StoreUtils; import org.apache.directory.server.xdbm.impl.avl.AvlIndex; +import org.apache.directory.server.xdbm.search.cursor.PresenceCursor; +import org.apache.directory.server.xdbm.search.evaluator.PresenceEvaluator; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.model.entry.Entry; Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=1376603&r1=1376602&r2=1376603&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Thu Aug 23 17:24:02 2012 @@ -34,6 +34,8 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.StoreUtils; import org.apache.directory.server.xdbm.impl.avl.AvlIndex; +import org.apache.directory.server.xdbm.search.cursor.SubstringCursor; +import org.apache.directory.server.xdbm.search.evaluator.SubstringEvaluator; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException; import org.apache.directory.shared.ldap.model.entry.Entry; Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=1376603&r1=1376602&r2=1376603&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original) +++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Thu Aug 23 17:24:02 2012 @@ -40,6 +40,8 @@ import org.apache.directory.server.xdbm. import org.apache.directory.server.xdbm.Store; import org.apache.directory.server.xdbm.StoreUtils; import org.apache.directory.server.xdbm.impl.avl.AvlIndex; +import org.apache.directory.server.xdbm.search.cursor.SubtreeScopeCursor; +import org.apache.directory.server.xdbm.search.evaluator.SubtreeScopeEvaluator; import org.apache.directory.shared.ldap.model.constants.SchemaConstants; import org.apache.directory.shared.ldap.model.csn.CsnFactory; import org.apache.directory.shared.ldap.model.cursor.InvalidCursorPositionException;