svn commit: r947414 - in /directory/apacheds/trunk/xdbm-search/src: main/java/org/apache/directory/server/xdbm/AbstractStore.java test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java

[se...@apache.org]

Author: seelmann
Date: Sun May 23 13:53:40 2010
New Revision: 947414

URL: http://svn.apache.org/viewvc?rev=947414&view=rev
Log:
If values are added the values must be added to the objectClass index.

Added:
    directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java
Modified:
    directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java

Modified: directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java?rev=947414&r1=947413&r2=947414&view=diff
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java (original)
+++ directory/apacheds/trunk/xdbm-search/src/main/java/org/apache/directory/server/xdbm/AbstractStore.java Sun May 23 13:53:40 2010
@@ -1271,7 +1271,7 @@ public abstract class AbstractStore<E, I
         {
             for ( Value<?> value : mods )
             {
-                objectClassIdx.drop( value.getString(), id );
+                objectClassIdx.add( value.getString(), id );
             }
         }
         else if ( hasUserIndexOn( modsOid ) )

Added: directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java?rev=947414&view=auto
==============================================================================
--- directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java (added)
+++ directory/apacheds/trunk/xdbm-search/src/test/java/org/apache/directory/server/xdbm/AbstractStoreTest.java Sun May 23 13:53:40 2010
@@ -0,0 +1,184 @@
+/*
+ *  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;
+
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
+import org.apache.directory.server.xdbm.impl.avl.AvlStore;
+import org.apache.directory.server.xdbm.impl.avl.AvlStoreTest;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.entry.DefaultModification;
+import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.entry.Modification;
+import org.apache.directory.shared.ldap.entry.ModificationOperation;
+import org.apache.directory.shared.ldap.name.DN;
+import org.apache.directory.shared.ldap.schema.SchemaManager;
+import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
+import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
+import org.apache.directory.shared.ldap.schema.loader.ldif.LdifSchemaLoader;
+import org.apache.directory.shared.ldap.schema.manager.impl.DefaultSchemaManager;
+import org.apache.directory.shared.ldap.util.LdapExceptionUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Tests the {@link AbstractStore} class.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class AbstractStoreTest
+{
+    private static final Logger LOG = LoggerFactory.getLogger( AbstractStoreTest.class );
+
+    private static File wkdir;
+    private static Store<Entry, Long> store;
+    private static SchemaManager schemaManager = null;
+    private static DN EXAMPLE_COM;
+
+
+    @BeforeClass
+    public static void setup() throws Exception
+    {
+        String workingDirectory = System.getProperty( "workingDirectory" );
+
+        if ( workingDirectory == null )
+        {
+            String path = AvlStoreTest.class.getResource( "" ).getPath();
+            int targetPos = path.indexOf( "target" );
+            workingDirectory = path.substring( 0, targetPos + 6 );
+        }
+
+        File schemaRepository = new File( workingDirectory, "schema" );
+        SchemaLdifExtractor extractor = new DefaultSchemaLdifExtractor( new File( workingDirectory ) );
+        extractor.extractOrCopy( true );
+        LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
+
+        schemaManager = new DefaultSchemaManager( loader );
+
+        boolean loaded = schemaManager.loadAllEnabled();
+
+        if ( !loaded )
+        {
+            fail( "Schema load failed : " + LdapExceptionUtils.printErrors( schemaManager.getErrors() ) );
+        }
+
+        EXAMPLE_COM = new DN( "dc=example,dc=com" );
+        EXAMPLE_COM.normalize( schemaManager.getNormalizerMapping() );
+    }
+
+
+    @Before
+    public void createStore() throws Exception
+    {
+        destroyStore();
+
+        // setup the working directory for the store
+        wkdir = File.createTempFile( getClass().getSimpleName(), "db" );
+        wkdir.delete();
+        wkdir = new File( wkdir.getParentFile(), getClass().getSimpleName() );
+        wkdir.mkdirs();
+
+        // initialize the store
+        store = new AvlStore<Entry>();
+        store.setId( "example" );
+        store.setSyncOnWrite( false );
+
+        store.addIndex( new AvlIndex<String, Entry>( SchemaConstants.OU_AT_OID ) );
+        store.addIndex( new AvlIndex<String, Entry>( SchemaConstants.UID_AT_OID ) );
+        store.addIndex( new AvlIndex<String, Entry>( SchemaConstants.CN_AT_OID ) );
+        StoreUtils.loadExampleData( store, schemaManager );
+        LOG.debug( "Created new store" );
+    }
+
+
+    @After
+    public void destroyStore() throws Exception
+    {
+    }
+
+
+    @Test
+    public void testExampleDataIndices() throws Exception
+    {
+        assertEquals( 11, store.getRdnIndex().count() );
+        assertEquals( 11, store.getOneLevelIndex().count() );
+        assertEquals( 19, store.getSubLevelIndex().count() );
+        assertEquals( 3, store.getAliasIndex().count() );
+        assertEquals( 3, store.getOneAliasIndex().count() );
+        assertEquals( 3, store.getSubAliasIndex().count() );
+        assertEquals( 15, store.getPresenceIndex().count() );
+        assertEquals( 27, store.getObjectClassIndex().count() );
+        assertEquals( 11, store.getEntryCsnIndex().count() );
+        assertEquals( 11, store.getEntryUuidIndex().count() );
+        assertEquals( 3, store.getUserIndices().size() );
+        assertEquals( 9, store.getUserIndex( SchemaConstants.OU_AT_OID ).count() );
+        assertEquals( 0, store.getUserIndex( SchemaConstants.UID_AT_OID ).count() );
+        assertEquals( 6, store.getUserIndex( SchemaConstants.CN_AT_OID ).count() );
+    }
+
+
+    @Test
+    public void testModifyAddObjectClass() throws Exception
+    {
+        DN dn = new DN( "cn=JOhnny WAlkeR,ou=Sales,o=Good Times Co." );
+        dn.normalize( schemaManager.getNormalizerMapping() );
+
+        List<Modification> mods = new ArrayList<Modification>();
+        EntryAttribute attrib = new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT, schemaManager
+            .lookupAttributeTypeRegistry( SchemaConstants.OBJECT_CLASS_AT ) );
+
+        String attribVal = "uidObject";
+        attrib.add( attribVal );
+
+        Modification add = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE, attrib );
+        mods.add( add );
+
+        Long entryId = store.getEntryId( dn );
+        Entry lookedup = store.lookup( entryId );
+
+        // before modification: no "uidObject" tuple in objectClass index
+        assertFalse( store.getObjectClassIndex().forward( "uidObject", entryId ) );
+        assertFalse( lookedup.get( "objectClass" ).contains( attribVal ) );
+
+        store.modify( dn, mods );
+
+        // after modification: expect "uidObject" tuple in objectClass index
+        assertTrue( store.getObjectClassIndex().forward( "uidObject", entryId ) );
+        assertTrue( lookedup.get( "objectClass" ).contains( attribVal ) );
+    }
+
+}