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 6AC5540E3 for ; Thu, 7 Jul 2011 20:28:06 +0000 (UTC) Received: (qmail 11151 invoked by uid 500); 7 Jul 2011 20:28:06 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 11102 invoked by uid 500); 7 Jul 2011 20:28:06 -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 11090 invoked by uid 99); 7 Jul 2011 20:28:05 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jul 2011 20:28:05 +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, 07 Jul 2011 20:28:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 56ED823888CF for ; Thu, 7 Jul 2011 20:27:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1144020 - in /directory/apacheds/trunk/xdbm-partition/src: main/java/org/apache/directory/server/xdbm/ main/java/org/apache/directory/server/xdbm/impl/avl/ main/java/org/apache/directory/server/xdbm/search/impl/ test/java/org/apache/direct... Date: Thu, 07 Jul 2011 20:27:44 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110707202744.56ED823888CF@eris.apache.org> Author: elecharny Date: Thu Jul 7 20:27:43 2011 New Revision: 1144020 URL: http://svn.apache.org/viewvc?rev=1144020&view=rev Log: o Renamed the apacheExistence AT to apachePresence Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlStore.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceEvaluator.java directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlStoreTest.java Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=1144020&r1=1144019&r2=1144020&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Thu Jul 7 20:27:43 2011 @@ -291,7 +291,7 @@ public abstract class AbstractStore index = new GenericIndex( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID ) ; + Index index = new GenericIndex( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID ) ; index.setWkDirPath( partitionPath ); addIndex( index ); } @@ -369,7 +369,7 @@ public abstract class AbstractStore, E, ID> ) systemIndices.get( ApacheSchemaConstants.APACHE_RDN_AT_OID ); - presenceIdx = ( Index ) systemIndices.get( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID ); + presenceIdx = ( Index ) systemIndices.get( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID ); oneLevelIdx = ( Index ) systemIndices.get( ApacheSchemaConstants.APACHE_ONE_LEVEL_AT_OID ); subLevelIdx = ( Index ) systemIndices.get( ApacheSchemaConstants.APACHE_SUB_LEVEL_AT_OID ); aliasIdx = ( Index ) systemIndices.get( ApacheSchemaConstants.APACHE_ALIAS_AT_OID ); @@ -627,7 +627,7 @@ public abstract class AbstractStore getPresenceIndex() { - return ( Index ) systemIndices.get( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID ); + return ( Index ) systemIndices.get( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID ); } @@ -1503,7 +1503,7 @@ public abstract class AbstractStore extends Abstrac /** - * always returns null, cause this is a in-memory store + * always returns null, because this is a in-memory store */ @Override public URI getPartitionPath() { - // returns null always + // returns null, always return null; } Modified: directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java?rev=1144020&r1=1144019&r2=1144020&view=diff ============================================================================== --- directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java (original) +++ directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java Thu Jul 7 20:27:43 2011 @@ -338,7 +338,7 @@ public class DefaultOptimizer( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID ) ); + store.addIndex( new AvlIndex( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID ) ); assertNotNull( store.getPresenceIndex() ); assertNull( store.getOneLevelIndex() ); @@ -238,7 +238,7 @@ public class AvlStoreTest try { - store.addIndex( new AvlIndex( ApacheSchemaConstants.APACHE_EXISTENCE_AT_OID ) ); + store.addIndex( new AvlIndex( ApacheSchemaConstants.APACHE_PRESENCE_AT_OID ) ); fail(); } catch ( IllegalStateException e )