directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1485982 - in /directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot: MavibotIndex.java MavibotRdnIndex.java
Date Fri, 24 May 2013 09:22:40 GMT
Author: elecharny
Date: Fri May 24 09:22:40 2013
New Revision: 1485982

URL: http://svn.apache.org/r1485982
Log:
Basic formatting

Modified:
    directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndex.java
    directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotRdnIndex.java

Modified: directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndex.java?rev=1485982&r1=1485981&r2=1485982&view=diff
==============================================================================
--- directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndex.java
(original)
+++ directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotIndex.java
Fri May 24 09:22:40 2013
@@ -38,7 +38,6 @@ import org.apache.directory.server.xdbm.
 import org.apache.directory.server.xdbm.EmptyIndexCursor;
 import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.server.xdbm.IndexEntry;
-import org.apache.mavibot.btree.BTreeConfiguration;
 import org.apache.mavibot.btree.RecordManager;
 import org.apache.mavibot.btree.serializer.ByteArraySerializer;
 import org.apache.mavibot.btree.serializer.ElementSerializer;
@@ -77,12 +76,12 @@ public class MavibotIndex<K, V> extends 
      */
     protected MavibotTable<String, K> reverse;
 
-
     /** a custom working directory path when specified in configuration */
     protected File wkDirPath;
 
     protected RecordManager recordMan;
-    
+
+
     // ------------------------------------------------------------------------
     // C O N S T R U C T O R S
     // ----------------------------------------------------------------------
@@ -94,7 +93,7 @@ public class MavibotIndex<K, V> extends 
         super( attributeId, withReverse );
 
         this.recordMan = recordMan;
-        
+
         initialized = false;
     }
 
@@ -163,8 +162,8 @@ public class MavibotIndex<K, V> extends 
          */
 
         ElementSerializer<K> forwardKeySerializer = null;
-        
-        if( !attributeType.getSyntax().isHumanReadable() )
+
+        if ( !attributeType.getSyntax().isHumanReadable() )
         {
             forwardKeySerializer = ( ElementSerializer<K> ) new ByteArraySerializer();
         }
@@ -172,9 +171,10 @@ public class MavibotIndex<K, V> extends 
         {
             forwardKeySerializer = ( ElementSerializer<K> ) new StringSerializer();
         }
-        
+
         String forwardTableName = attributeType.getOid() + FORWARD_BTREE;
-        forward = new MavibotTable<K, String>( recordMan, schemaManager, forwardTableName,
forwardKeySerializer, new StringSerializer(), true );
+        forward = new MavibotTable<K, String>( recordMan, schemaManager, forwardTableName,
forwardKeySerializer,
+            new StringSerializer(), true );
 
         /*
          * Now the reverse map stores the primary key into the master table as
@@ -185,7 +185,8 @@ public class MavibotIndex<K, V> extends 
         if ( withReverse )
         {
             String reverseTableName = attributeType.getOid() + REVERSE_BTREE;
-            reverse = new MavibotTable<String, K>( recordMan, schemaManager, reverseTableName,
new StringSerializer(), forwardKeySerializer, !attributeType.isSingleValued() );
+            reverse = new MavibotTable<String, K>( recordMan, schemaManager, reverseTableName,
new StringSerializer(),
+                forwardKeySerializer, !attributeType.isSingleValued() );
         }
 
         String path = new File( this.wkDirPath, attributeType.getOid() ).getAbsolutePath();

Modified: directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotRdnIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotRdnIndex.java?rev=1485982&r1=1485981&r2=1485982&view=diff
==============================================================================
--- directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotRdnIndex.java
(original)
+++ directory/apacheds/trunk/mavibot-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/mavibot/MavibotRdnIndex.java
Fri May 24 09:22:40 2013
@@ -33,7 +33,6 @@ import org.apache.directory.api.ldap.mod
 import org.apache.directory.server.constants.ApacheSchemaConstants;
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.server.xdbm.ParentIdAndRdn;
-import org.apache.mavibot.btree.BTreeConfiguration;
 import org.apache.mavibot.btree.RecordManager;
 import org.apache.mavibot.btree.serializer.StringSerializer;
 import org.slf4j.Logger;
@@ -123,9 +122,11 @@ public class MavibotRdnIndex extends Mav
         MavibotParentIdAndRdnSerializer parentIdAndSerializer = new MavibotParentIdAndRdnSerializer();
 
         String forwardTableName = attributeType.getOid() + FORWARD_BTREE;
-        forward = new MavibotTable<ParentIdAndRdn, String>( recordMan, schemaManager,
forwardTableName, parentIdAndSerializer, new StringSerializer(), false );
+        forward = new MavibotTable<ParentIdAndRdn, String>( recordMan, schemaManager,
forwardTableName,
+            parentIdAndSerializer, new StringSerializer(), false );
 
         String reverseTableName = attributeType.getOid() + REVERSE_BTREE;
-        reverse = new MavibotTable<String, ParentIdAndRdn>( recordMan, schemaManager,
reverseTableName, new StringSerializer(), parentIdAndSerializer, false );
+        reverse = new MavibotTable<String, ParentIdAndRdn>( recordMan, schemaManager,
reverseTableName,
+            new StringSerializer(), parentIdAndSerializer, false );
     }
 }



Mime
View raw message