You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2012/09/16 09:48:41 UTC
svn commit: r1385222 - in /directory/apacheds/branches/apacheds-mvbt:
core-annotations/src/main/java/org/apache/directory/server/core/factory/
interceptors/authz/src/main/java/org/apache/directory/server/core/authz/
jdbm-partition/src/main/java/org/apa...
Author: elecharny
Date: Sun Sep 16 07:48:41 2012
New Revision: 1385222
URL: http://svn.apache.org/viewvc?rev=1385222&view=rev
Log:
o Added the ParentIdAndRdnSerializer class
o Used this class in the Rdn index initialization
o Fixed the way we initialize the system index when we process the RDN index
Added:
directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ParentIdAndRdnSerializer.java
Modified:
directory/apacheds/branches/apacheds-mvbt/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
directory/apacheds/branches/apacheds-mvbt/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java
directory/apacheds/branches/apacheds-mvbt/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java
directory/apacheds/branches/apacheds-mvbt/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java
directory/apacheds/branches/apacheds-mvbt/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
Modified: directory/apacheds/branches/apacheds-mvbt/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java?rev=1385222&r1=1385221&r2=1385222&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/core-annotations/src/main/java/org/apache/directory/server/core/factory/AvlPartitionFactory.java Sun Sep 16 07:48:41 2012
@@ -67,7 +67,7 @@ public class AvlPartitionFactory impleme
}
AvlPartition avlPartition = ( AvlPartition ) partition;
- Set<Index<?, Entry, String>> indexedAttributes = avlPartition.getIndexedAttributes();
+ Set<Index<?, ?, String>> indexedAttributes = avlPartition.getIndexedAttributes();
AvlIndex<Object, Entry> index = new AvlIndex<Object, Entry>( attributeId, false );
//index.setCacheSize( cacheSize );
Modified: directory/apacheds/branches/apacheds-mvbt/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java?rev=1385222&r1=1385221&r2=1385222&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/core-annotations/src/main/java/org/apache/directory/server/core/factory/JdbmPartitionFactory.java Sun Sep 16 07:48:41 2012
@@ -67,7 +67,7 @@ public class JdbmPartitionFactory implem
}
JdbmPartition jdbmPartition = ( JdbmPartition ) partition;
- Set<Index<?, Entry, String>> indexedAttributes = jdbmPartition.getIndexedAttributes();
+ Set<Index<?, ?, String>> indexedAttributes = jdbmPartition.getIndexedAttributes();
JdbmIndex<Object, Entry> index = new JdbmIndex<Object, Entry>( attributeId, false );
index.setCacheSize( cacheSize );
Modified: directory/apacheds/branches/apacheds-mvbt/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java?rev=1385222&r1=1385221&r2=1385222&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/core-annotations/src/main/java/org/apache/directory/server/core/factory/LdifPartitionFactory.java Sun Sep 16 07:48:41 2012
@@ -67,7 +67,7 @@ public class LdifPartitionFactory implem
}
LdifPartition ldifPartition = ( LdifPartition ) partition;
- Set<Index<?, Entry, String>> indexedAttributes = ldifPartition.getIndexedAttributes();
+ Set<Index<?, ?, String>> indexedAttributes = ldifPartition.getIndexedAttributes();
AvlIndex<Object, Entry> index = new AvlIndex<Object, Entry>( attributeId, false );
//index.setCacheSize( cacheSize );
Modified: directory/apacheds/branches/apacheds-mvbt/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/GroupCache.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/GroupCache.java?rev=1385222&r1=1385221&r2=1385222&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/GroupCache.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/interceptors/authz/src/main/java/org/apache/directory/server/core/authz/GroupCache.java Sun Sep 16 07:48:41 2012
@@ -185,6 +185,7 @@ public class GroupCache
}
catch ( Exception e )
{
+ e.printStackTrace();
LdapOperationException le = new LdapOperationException( e.getMessage(), e );
le.initCause( e );
throw le;
Modified: directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java?rev=1385222&r1=1385221&r2=1385222&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmIndex.java Sun Sep 16 07:48:41 2012
@@ -26,6 +26,7 @@ import java.io.IOException;
import java.net.URI;
import jdbm.RecordManager;
+import jdbm.helper.ByteArraySerializer;
import jdbm.helper.MRU;
import jdbm.recman.BaseRecordManager;
import jdbm.recman.CacheRecordManager;
@@ -209,8 +210,18 @@ public class JdbmIndex<K, V> extends Abs
UuidComparator.INSTANCE.setSchemaManager( schemaManager );
comp.setSchemaManager( schemaManager );
- forward = new JdbmTable<K, String>( schemaManager, attributeType.getOid() + FORWARD_BTREE, numDupLimit, recMan,
- comp, UuidComparator.INSTANCE, null, UuidSerializer.INSTANCE );
+ if ( mr.getSyntax().isHumanReadable() )
+ {
+ forward = new JdbmTable<K, String>( schemaManager, attributeType.getOid() + FORWARD_BTREE, numDupLimit,
+ recMan,
+ comp, UuidComparator.INSTANCE, new StringSerializer(), UuidSerializer.INSTANCE );
+ }
+ else
+ {
+ forward = new JdbmTable<K, String>( schemaManager, attributeType.getOid() + FORWARD_BTREE, numDupLimit,
+ recMan,
+ comp, UuidComparator.INSTANCE, new ByteArraySerializer(), UuidSerializer.INSTANCE );
+ }
/*
* Now the reverse map stores the primary key into the master table as
Modified: directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java?rev=1385222&r1=1385221&r2=1385222&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmMasterTable.java Sun Sep 16 07:48:41 2012
@@ -68,7 +68,8 @@ public class JdbmMasterTable extends Jdb
{
super( schemaManager, DBF, recMan, UuidComparator.INSTANCE, UuidSerializer.INSTANCE,
new EntrySerializer( schemaManager ) );
- adminTbl = new JdbmTable<String, String>( schemaManager, "admin", recMan, STRING_COMPARATOR, null, null );
+ adminTbl = new JdbmTable<String, String>( schemaManager, "admin", recMan, STRING_COMPARATOR,
+ new StringSerializer(), new StringSerializer() );
String seqValue = adminTbl.get( SEQPROP_KEY );
if ( null == seqValue )
@@ -85,7 +86,8 @@ public class JdbmMasterTable extends Jdb
throws Exception
{
super( schemaManager, DBF, recMan, UuidComparator.INSTANCE, UuidSerializer.INSTANCE, serializer );
- adminTbl = new JdbmTable<String, String>( schemaManager, dbName, recMan, STRING_COMPARATOR, null, null );
+ adminTbl = new JdbmTable<String, String>( schemaManager, dbName, recMan, STRING_COMPARATOR,
+ new StringSerializer(), new StringSerializer() );
String seqValue = adminTbl.get( SEQPROP_KEY );
if ( null == seqValue )
Modified: directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java?rev=1385222&r1=1385221&r2=1385222&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmRdnIndex.java Sun Sep 16 07:48:41 2012
@@ -132,9 +132,11 @@ public class JdbmRdnIndex extends JdbmIn
UuidComparator.INSTANCE.setSchemaManager( schemaManager );
+ ParentIdAndRdnSerializer parentIdAndSerializer = new ParentIdAndRdnSerializer( schemaManager );
+
forward = new JdbmTable<ParentIdAndRdn, String>( schemaManager, attributeType.getOid() + FORWARD_BTREE,
- recMan, comp, null, UuidSerializer.INSTANCE );
+ recMan, comp, parentIdAndSerializer, UuidSerializer.INSTANCE );
reverse = new JdbmTable<String, ParentIdAndRdn>( schemaManager, attributeType.getOid() + REVERSE_BTREE,
- recMan, UuidComparator.INSTANCE, UuidSerializer.INSTANCE, null );
+ recMan, UuidComparator.INSTANCE, UuidSerializer.INSTANCE, parentIdAndSerializer );
}
}
Added: directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ParentIdAndRdnSerializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ParentIdAndRdnSerializer.java?rev=1385222&view=auto
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ParentIdAndRdnSerializer.java (added)
+++ directory/apacheds/branches/apacheds-mvbt/jdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ParentIdAndRdnSerializer.java Sun Sep 16 07:48:41 2012
@@ -0,0 +1,183 @@
+/*
+ * 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.core.partition.impl.btree.jdbm;
+
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutput;
+import java.io.ObjectOutputStream;
+
+import jdbm.helper.Serializer;
+
+import org.apache.directory.server.i18n.I18n;
+import org.apache.directory.server.xdbm.ParentIdAndRdn;
+import org.apache.directory.shared.ldap.model.name.Rdn;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+/**
+ * Serialize and deserialize a ParentidAndRdn.
+ * </br></br>
+ * <b>This class must *not* be used outside of the server.</b>
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class ParentIdAndRdnSerializer implements Serializer
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1L;
+
+ /** the logger for this class */
+ private static final Logger LOG = LoggerFactory.getLogger( ParentIdAndRdnSerializer.class );
+
+ /**
+ * Speedup for logs
+ */
+ private static final boolean IS_DEBUG = LOG.isDebugEnabled();
+
+ /** The schemaManager reference */
+ private transient SchemaManager schemaManager;
+
+
+ /**
+ * Creates a new instance of ParentIdAndRdnSerializer.
+ *
+ * @param schemaManager The reference to the global schemaManager
+ */
+ public ParentIdAndRdnSerializer( SchemaManager schemaManager )
+ {
+ this.schemaManager = schemaManager;
+ }
+
+
+ /**
+ * <p>
+ *
+ * This is the place where we serialize ParentIdAndRdn
+ * <p>
+ */
+ public byte[] serialize( Object object ) throws IOException
+ {
+ ParentIdAndRdn parentIdAndRdn = ( ParentIdAndRdn ) object;
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutput out = new ObjectOutputStream( baos );
+
+ // First, the Dn
+ Rdn[] rdns = parentIdAndRdn.getRdns();
+
+ // Write the Rdn of the Dn
+ if ( ( rdns == null ) || ( rdns.length == 0 ) )
+ {
+ out.writeByte( 0 );
+ }
+ else
+ {
+ out.writeByte( rdns.length );
+
+ for ( Rdn rdn : rdns )
+ {
+ rdn.writeExternal( out );
+ }
+ }
+
+ // Then the parentId.
+ out.writeUTF( parentIdAndRdn.getParentId() );
+
+ // The number of children
+ out.writeInt( parentIdAndRdn.getNbChildren() );
+
+ // The number of descendants
+ out.writeInt( parentIdAndRdn.getNbDescendants() );
+
+ out.flush();
+
+ if ( IS_DEBUG )
+ {
+ LOG.debug( ">------------------------------------------------" );
+ LOG.debug( "Serialize " + parentIdAndRdn );
+ }
+
+ return baos.toByteArray();
+ }
+
+
+ /**
+ * Deserialize a ParentIdAndRdn.
+ *
+ * @param bytes the byte array containing the serialized ParentIdAndRdn
+ * @return An instance of a ParentIdAndRdn object
+ * @throws IOException if we can't deserialize the ParentIdAndRdn
+ */
+ public Object deserialize( byte[] bytes ) throws IOException
+ {
+ ObjectInputStream in = new ObjectInputStream( new ByteArrayInputStream( bytes ) );
+
+ try
+ {
+ ParentIdAndRdn parentIdAndRdn = new ParentIdAndRdn();
+
+ // Read the number of rdns, if any
+ byte nbRdns = in.readByte();
+
+ if ( nbRdns == 0 )
+ {
+ parentIdAndRdn.setRdns( new Rdn[0] );
+ }
+ else
+ {
+ Rdn[] rdns = new Rdn[nbRdns];
+
+ for ( int i = 0; i < nbRdns; i++ )
+ {
+ Rdn rdn = new Rdn( schemaManager );
+ rdn.readExternal( in );
+ rdns[i] = rdn;
+ }
+
+ parentIdAndRdn.setRdns( rdns );
+ }
+
+ // Read the parent ID
+ String uuid = in.readUTF();
+
+ parentIdAndRdn.setParentId( uuid );
+
+ // Read the nulber of children and descendants
+ int nbChildren = in.readInt();
+ int nbDescendants = in.readInt();
+
+ parentIdAndRdn.setNbChildren( nbChildren );
+ parentIdAndRdn.setNbDescendants( nbDescendants );
+
+ return parentIdAndRdn;
+ }
+ catch ( ClassNotFoundException cnfe )
+ {
+ LOG.error( I18n.err( I18n.ERR_134, cnfe.getLocalizedMessage() ) );
+ throw new IOException( cnfe.getLocalizedMessage() );
+ }
+ }
+}
Modified: directory/apacheds/branches/apacheds-mvbt/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java?rev=1385222&r1=1385221&r2=1385222&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java Sun Sep 16 07:48:41 2012
@@ -58,6 +58,7 @@ import org.apache.directory.server.confi
import org.apache.directory.server.config.beans.TcpTransportBean;
import org.apache.directory.server.config.beans.TransportBean;
import org.apache.directory.server.config.beans.UdpTransportBean;
+import org.apache.directory.server.constants.ApacheSchemaConstants;
import org.apache.directory.server.core.DefaultDirectoryService;
import org.apache.directory.server.core.api.DirectoryService;
import org.apache.directory.server.core.api.InstanceLayout;
@@ -76,6 +77,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.journal.DefaultJournalStore;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
+import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmRdnIndex;
import org.apache.directory.server.integration.http.HttpServer;
import org.apache.directory.server.integration.http.WebApp;
import org.apache.directory.server.kerberos.kdc.KdcServer;
@@ -1082,7 +1084,7 @@ public class ServiceBuilder
* @return An JdbmIndex instance
* @throws Exception If the instance cannot be created
*/
- public static JdbmIndex<?, Entry> createJdbmIndex( JdbmPartition partition,
+ public static JdbmIndex<?, ?> createJdbmIndex( JdbmPartition partition,
JdbmIndexBean<String, Entry> jdbmIndexBean, DirectoryService directoryService )
{
if ( ( jdbmIndexBean == null ) || jdbmIndexBean.isDisabled() )
@@ -1097,9 +1099,19 @@ public class ServiceBuilder
indexFileName = jdbmIndexBean.getIndexAttributeId();
}
+ JdbmIndex<?, ?> index = null;
+
boolean hasReverse = Boolean.parseBoolean( jdbmIndexBean.getIndexHasReverse() );
- JdbmIndex<String, Entry> index = new JdbmIndex<String, Entry>( jdbmIndexBean.getIndexAttributeId(), hasReverse );
+ if ( jdbmIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_RDN_AT ) ||
+ jdbmIndexBean.getIndexAttributeId().equalsIgnoreCase( ApacheSchemaConstants.APACHE_RDN_AT_OID ) )
+ {
+ index = new JdbmRdnIndex();
+ }
+ else
+ {
+ index = new JdbmIndex<String, Entry>( jdbmIndexBean.getIndexAttributeId(), hasReverse );
+ }
index.setCacheSize( jdbmIndexBean.getIndexCacheSize() );
index.setNumDupLimit( jdbmIndexBean.getIndexNumDupLimit() );
@@ -1134,11 +1146,11 @@ public class ServiceBuilder
/**
* Create the list of Index from the configuration
*/
- private static Set<Index<?, Entry, String>> createJdbmIndexes( JdbmPartition partition,
+ private static Set<Index<?, ?, String>> createJdbmIndexes( JdbmPartition partition,
List<IndexBean> indexesBeans,
DirectoryService directoryService ) //throws Exception
{
- Set<Index<?, Entry, String>> indexes = new HashSet<Index<?, Entry, String>>();
+ Set<Index<?, ?, String>> indexes = new HashSet<Index<?, ?, String>>();
for ( IndexBean indexBean : indexesBeans )
{
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java?rev=1385222&r1=1385221&r2=1385222&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java Sun Sep 16 07:48:41 2012
@@ -125,7 +125,7 @@ public abstract class AbstractBTreeParti
protected URI partitionPath;
/** The set of indexed attributes */
- private Set<Index<?, Entry, String>> indexedAttributes;
+ private Set<Index<?, ?, String>> indexedAttributes;
/** the master table storing entries by primary key */
protected MasterTable master;
@@ -184,7 +184,7 @@ public abstract class AbstractBTreeParti
{
this.schemaManager = schemaManager;
- indexedAttributes = new HashSet<Index<?, Entry, String>>();
+ indexedAttributes = new HashSet<Index<?, ?, String>>();
// Initialize Attribute types used all over this method
OBJECT_CLASS_AT = schemaManager.getAttributeType( SchemaConstants.OBJECT_CLASS_AT );
@@ -744,6 +744,7 @@ public abstract class AbstractBTreeParti
}
catch ( Exception e )
{
+ e.printStackTrace();
throw new LdapException( e );
}
}
@@ -2240,7 +2241,7 @@ public abstract class AbstractBTreeParti
* Set the list of indexes for this partition
* @param indexedAttributes The list of indexes
*/
- public void setIndexedAttributes( Set<Index<?, Entry, String>> indexedAttributes )
+ public void setIndexedAttributes( Set<Index<?, ?, String>> indexedAttributes )
{
this.indexedAttributes = indexedAttributes;
}
@@ -2249,7 +2250,7 @@ public abstract class AbstractBTreeParti
/**
* @return The list of indexed attributes
*/
- public Set<Index<?, Entry, String>> getIndexedAttributes()
+ public Set<Index<?, ?, String>> getIndexedAttributes()
{
return indexedAttributes;
}