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/01/05 18:53:28 UTC
svn commit: r1227722 - in
/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api:
log/ partition/ partition/index/
Author: elecharny
Date: Thu Jan 5 17:53:27 2012
New Revision: 1227722
URL: http://svn.apache.org/viewvc?rev=1227722&view=rev
Log:
Formatted the code
Modified:
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/InvalidLogException.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/Log.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchor.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchorComparator.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogScanner.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/UserLogRecord.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/OperationExecutionManager.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractIndex.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractIndexCursor.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractIndexEntry.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractTable.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/EmptyIndexCursor.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ForwardIndexComparator.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ForwardIndexEntry.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/GenericIndex.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/Index.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/IndexComparator.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/IndexEntry.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/MasterTable.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ParentIdAndRdn.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ParentIdAndRdnComparator.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ReverseIndexComparator.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ReverseIndexEntry.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/Serializer.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/SingletonIndexCursor.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/Table.java
directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/UUIDComparator.java
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/InvalidLogException.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/InvalidLogException.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/InvalidLogException.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/InvalidLogException.java Thu Jan 5 17:53:27 2012
@@ -30,36 +30,36 @@ public class InvalidLogException extends
/** The serial version UID */
private static final long serialVersionUID = 1L;
-
+
/**
* Creates a new instance of InvalidLogException
*/
- public InvalidLogException()
+ public InvalidLogException()
{
}
-
+
/**
* Creates a new instance of InvalidLogException with a message
*
* @param message The associated error message
*/
- public InvalidLogException( String message )
+ public InvalidLogException( String message )
{
super( message );
}
-
+
/**
* Creates a new instance of InvalidLogException with an original cause
*
* @param cause The associated error cause
*/
- public InvalidLogException( Throwable cause )
+ public InvalidLogException( Throwable cause )
{
super( cause );
}
-
+
/**
* Creates a new instance of InvalidLogException with a message
@@ -68,7 +68,7 @@ public class InvalidLogException extends
* @param message The associated error message
* @param cause The associated error cause
*/
- public InvalidLogException( String message, Throwable cause )
+ public InvalidLogException( String message, Throwable cause )
{
super( message, cause );
}
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/Log.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/Log.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/Log.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/Log.java Thu Jan 5 17:53:27 2012
@@ -41,8 +41,10 @@ public interface Log
* @throws IOException If we can't initialize the Log
* @throws InvalidLogException If the log contains some bad records
*/
- void init( String logFilepath, String suffix, int logBufferSize, long logFileSize ) throws IOException, InvalidLogException;
-
+ void init( String logFilepath, String suffix, int logBufferSize, long logFileSize ) throws IOException,
+ InvalidLogException;
+
+
/**
* Logs the given user record to the log. Position in the log files where the record is logged is returned as part of
* userRecord.
@@ -53,8 +55,8 @@ public interface Log
* @throws InvalidLogException If the record is not valid
*/
void log( UserLogRecord userRecord, boolean sync ) throws IOException, InvalidLogException;
-
-
+
+
/**
* Starts a scan in the logs starting from the given log position
*
@@ -62,16 +64,16 @@ public interface Log
* @return A scanner to read the logs one by one
*/
LogScanner beginScan( LogAnchor startPoint );
-
-
+
+
/**
* Starts a scan in the logs starting from the last checkpoint.
*
* @return A scanner to read the logs one by one
*/
LogScanner beginScan();
-
-
+
+
/**
* Advances the min needed position in the logs. Logging subsystem uses this
* information to get rid of unneeded
@@ -79,8 +81,8 @@ public interface Log
* @param newAnchor The new position
*/
void advanceMinNeededLogPosition( LogAnchor newAnchor );
-
-
+
+
/**
* Synchronizes the log up to the given LSN. If LSN is equal to unknown
* LSN, then the log is flushed up to the latest logged LSN.
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchor.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchor.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchor.java Thu Jan 5 17:53:27 2012
@@ -33,76 +33,76 @@ public class LogAnchor
// TODO move this to logger
/** Invalid/unknown lsn. Log LSN starts at UNKNOWN_LSN + 1 and is ever increasing */
public final static long UNKNOWN_LSN = Long.MIN_VALUE;
-
+
/** Min log file number */
public final static long MIN_LOG_NUMBER = 0;
-
+
/** Min log file offset */
public final static long MIN_LOG_OFFSET = 0;
-
+
/** log file identifier of the anchor */
- private long logFileNumber = 0 ;
-
+ private long logFileNumber = 0;
+
/** Offset into the log file identified by logfilenumber */
private long logFileOffset = 0;
-
+
/** LSN corresponding to the logFileNumber and fileOffset */
- private long logLSN = UNKNOWN_LSN;
-
+ private long logLSN = UNKNOWN_LSN;
+
+
public LogAnchor()
{
}
-
-
+
+
public LogAnchor( long logFileNumber, long logFileOffset, long logLSN )
{
this.resetLogAnchor( logFileNumber, logFileOffset, logLSN );
}
-
-
+
+
public void resetLogAnchor( long logFileNumber, long logFileOffset, long logLSN )
{
if ( logFileNumber < 0 )
{
throw new IllegalArgumentException( I18n.err( I18n.ERR_746, logFileNumber ) );
}
-
+
if ( logFileOffset < 0 )
{
throw new IllegalArgumentException( I18n.err( I18n.ERR_747, logFileOffset ) );
}
-
-
+
this.logFileNumber = logFileNumber;
this.logFileOffset = logFileOffset;
this.logLSN = logLSN;
}
-
-
+
+
public void resetLogAnchor( LogAnchor logAnchor )
{
resetLogAnchor( logAnchor.getLogFileNumber(), logAnchor.getLogFileOffset(), logAnchor.getLogLSN() );
}
-
-
+
+
public long getLogFileNumber()
{
return logFileNumber;
}
-
-
+
+
public long getLogFileOffset()
{
return logFileOffset;
}
-
-
+
+
public long getLogLSN()
{
return logLSN;
- }
-
-
+ }
+
+
/**
* @see Object#toString()
*/
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchorComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchorComparator.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchorComparator.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogAnchorComparator.java Thu Jan 5 17:53:27 2012
@@ -40,14 +40,14 @@ public class LogAnchorComparator impleme
* @return a positive integer if obj1 > obj2, 0 if obj1 == obj2,
* and a negative integer if obj1 < obj2
*/
- public int compare( LogAnchor obj1, LogAnchor obj2 )
- {
- if ( obj1 == null )
+ public int compare( LogAnchor obj1, LogAnchor obj2 )
+ {
+ if ( obj1 == null )
{
throw new IllegalArgumentException( I18n.err( I18n.ERR_525 ) );
}
- if ( obj2 == null )
+ if ( obj2 == null )
{
throw new IllegalArgumentException( I18n.err( I18n.ERR_526 ) );
}
@@ -56,7 +56,7 @@ public class LogAnchorComparator impleme
long logFileOffset1 = obj1.getLogFileOffset();
long logFileNumber2 = obj2.getLogFileNumber();
long logFileOffset2 = obj2.getLogFileOffset();
-
+
if ( logFileNumber1 > logFileNumber2 )
{
return 1;
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogScanner.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogScanner.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogScanner.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/LogScanner.java Thu Jan 5 17:53:27 2012
@@ -44,24 +44,24 @@ public interface LogScanner
* @throws InvalidLogException thrown if the log content is invalid
*/
boolean getNextRecord( UserLogRecord logRecord ) throws IOException, InvalidLogException;
-
-
+
+
/**
* Returns the last successfully read log file number
*
* @return last successfully read log file number
*/
long getLastGoodFileNumber();
-
-
+
+
/**
* Returns the last successfully read log file number
*
* @return last successfully read log file number
*/
long getLastGoodOffset();
-
-
+
+
/**
* Closes the scanner and releases any
* resources.
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/UserLogRecord.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/UserLogRecord.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/UserLogRecord.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/log/UserLogRecord.java Thu Jan 5 17:53:27 2012
@@ -29,14 +29,14 @@ public class UserLogRecord
{
/** array used to hold user log records */
private byte[] recordHolder;
-
+
/** length of the user record in the byte array */
private int length;
-
+
/** Position of the log record in the log */
private LogAnchor logAnchor = new LogAnchor();
-
-
+
+
/**
* Store some data into the record. The buffer may be bigger than the
* data it contains, the length gives the real size of the stored data.
@@ -49,8 +49,8 @@ public class UserLogRecord
this.recordHolder = data;
this.length = length;
}
-
-
+
+
/**
* @return The stored buffer, containing the data
*/
@@ -58,8 +58,8 @@ public class UserLogRecord
{
return recordHolder;
}
-
-
+
+
/**
* @return The data length
*/
@@ -67,8 +67,8 @@ public class UserLogRecord
{
return length;
}
-
-
+
+
/**
* @return The position in the buffer
*/
@@ -76,8 +76,8 @@ public class UserLogRecord
{
return logAnchor;
}
-
-
+
+
/**
* @see Object#toString()
*/
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/OperationExecutionManager.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/OperationExecutionManager.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/OperationExecutionManager.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/OperationExecutionManager.java Thu Jan 5 17:53:27 2012
@@ -223,19 +223,18 @@ public interface OperationExecutionManag
* @throws Exception If the lookup failed for any reason (except a not found entry)
*/
Entry lookup( Partition partition, UUID id ) throws LdapException;
-
-
- /**
- * Looksups the entry identified in entryContext.
- *
- * @param partition partition lookup will be done
- * @param entryContext operation parameters
- * @return true if the entry can be found
- * @throws LdapException
- */
+
+
+ /**
+ * Looksups the entry identified in entryContext.
+ *
+ * @param partition partition lookup will be done
+ * @param entryContext operation parameters
+ * @return true if the entry can be found
+ * @throws LdapException
+ */
boolean hasEntry( Partition partition, HasEntryOperationContext entryContext ) throws LdapException;
-
-
+
/**
* A specialized form of one level search used to return a minimal set of
@@ -249,11 +248,11 @@ public interface OperationExecutionManag
* @throws Exception if there are any problems
*/
EntryFilteringCursor list( Partition partition, ListOperationContext listContext ) throws LdapException;
-
-
+
+
IndexCursor<UUID> list( Partition partition, UUID id ) throws LdapException;
-
-
+
+
/**
* Returns the entry id for the given dn
*
@@ -263,8 +262,8 @@ public interface OperationExecutionManag
* @throws LdapException
*/
UUID getEntryId( Partition partition, Dn dn ) throws LdapException;
-
-
+
+
/**
* builds the Dn of the entry identified by the given id
*
@@ -274,8 +273,8 @@ public interface OperationExecutionManag
* @throws Exception
*/
Dn buildEntryDn( Partition partition, UUID id ) throws Exception;
-
-
+
+
/**
* Gets the parent id of the given child id.
*
@@ -285,8 +284,8 @@ public interface OperationExecutionManag
* @throws Exception
*/
public UUID getParentId( Partition partition, UUID childId ) throws Exception;
-
-
+
+
/**
* Returns the child count of the corresponding to the id
*
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractIndex.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractIndex.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractIndex.java Thu Jan 5 17:53:27 2012
@@ -32,9 +32,9 @@ import org.apache.directory.shared.ldap.
*/
public abstract class AbstractIndex<K> implements Index<K>
{
- /** The attribute identifier for this index */
+ /** The attribute identifier for this index */
protected String attributeId;
-
+
/** the attribute type resolved for this JdbmIndex */
protected AttributeType attributeType;
@@ -44,6 +44,7 @@ public abstract class AbstractIndex<K> i
/** whether or not this index has been initialized */
protected boolean initialized;
+
/**
* Creates a new instance of AbstractIndex.
*
@@ -53,7 +54,7 @@ public abstract class AbstractIndex<K> i
{
}
-
+
/**
* Creates a new instance of AbstractIndex.
*
@@ -94,8 +95,8 @@ public abstract class AbstractIndex<K> i
{
return !attributeType.isSingleValued();
}
-
-
+
+
/**
* Gets the size of the index cache in terms of the number of index entries to be cached.
*
@@ -117,8 +118,8 @@ public abstract class AbstractIndex<K> i
protect( "cacheSize" );
this.cacheSize = cacheSize;
}
-
-
+
+
/**
* Protects configuration properties from being set after initialization.
*
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractIndexCursor.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractIndexCursor.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractIndexCursor.java Thu Jan 5 17:53:27 2012
@@ -41,6 +41,7 @@ public abstract class AbstractIndexCurso
/** The message used for unsupported operations */
protected static final String UNSUPPORTED_MSG = "Unsupported operation";
+
/**
* {@inheritDoc}
*/
@@ -48,8 +49,8 @@ public abstract class AbstractIndexCurso
{
return available;
}
-
-
+
+
/**
* Gets the message to return for operations that are not supported
*
@@ -75,7 +76,7 @@ public abstract class AbstractIndexCurso
throw new UnsupportedOperationException( getUnsupportedMessage() );
}
-
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractIndexEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractIndexEntry.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractIndexEntry.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractIndexEntry.java Thu Jan 5 17:53:27 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.server.core.api.partition.index;
+
import java.util.UUID;
import org.apache.directory.shared.ldap.model.cursor.Tuple;
@@ -37,6 +38,7 @@ public abstract class AbstractIndexEntry
/** The referenced Entry if loaded from the store */
private Entry entry;
+
/**
* Creates an instance of AbstractIndexEntry
*
@@ -46,32 +48,32 @@ public abstract class AbstractIndexEntry
{
this.entry = entry;
}
-
-
+
+
/**
* {@inheritDoc}
*/
public abstract V getValue();
-
+
/**
* {@inheritDoc}
*/
public abstract void setValue( V value );
-
+
/**
* {@inheritDoc}
*/
public abstract UUID getId();
-
+
/**
* {@inheritDoc}
*/
public abstract void setId( UUID id );
-
+
/**
* {@inheritDoc}
*/
@@ -80,13 +82,13 @@ public abstract class AbstractIndexEntry
return entry;
}
-
+
/**
* {@inheritDoc}
*/
public abstract Tuple<?, ?> getTuple();
-
+
/**
* {@inheritDoc}
*/
@@ -95,7 +97,7 @@ public abstract class AbstractIndexEntry
this.entry = entry;
}
-
+
/**
* {@inheritDoc}
*/
@@ -104,7 +106,7 @@ public abstract class AbstractIndexEntry
entry = null;
}
-
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractTable.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractTable.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/AbstractTable.java Thu Jan 5 17:53:27 2012
@@ -19,12 +19,14 @@
*/
package org.apache.directory.server.core.api.partition.index;
+
import java.io.IOException;
import java.util.Comparator;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
+
/**
* A Abstract Table implementation aggregating the methods comon with all the
* different Table implementation.
@@ -33,14 +35,14 @@ import org.apache.directory.shared.ldap.
* @param <V> The stored value
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AbstractTable<K,V> implements Table<K,V>
+public abstract class AbstractTable<K, V> implements Table<K, V>
{
/** the name of this table */
protected final String name;
/** The global SchemaManager */
protected SchemaManager schemaManager;
-
+
/** a key comparator for the keys in this Table */
protected final Comparator<K> keyComparator;
@@ -50,6 +52,7 @@ public abstract class AbstractTable<K,V>
/** the current count of entries in this Table */
protected int count;
+
/**
* Create an instance of Table
*
@@ -75,8 +78,8 @@ public abstract class AbstractTable<K,V>
this.valueComparator = valueComparator;
}
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -85,7 +88,7 @@ public abstract class AbstractTable<K,V>
return keyComparator;
}
-
+
/**
* {@inheritDoc}
*/
@@ -94,7 +97,7 @@ public abstract class AbstractTable<K,V>
return valueComparator;
}
-
+
/**
* {@inheritDoc}
*/
@@ -102,7 +105,7 @@ public abstract class AbstractTable<K,V>
{
return name;
}
-
+
/**
* {@inheritDoc}
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/EmptyIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/EmptyIndexCursor.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/EmptyIndexCursor.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/EmptyIndexCursor.java Thu Jan 5 17:53:27 2012
@@ -49,7 +49,7 @@ public class EmptyIndexCursor<K> extends
return UNSUPPORTED_MSG;
}
-
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ForwardIndexComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ForwardIndexComparator.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ForwardIndexComparator.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ForwardIndexComparator.java Thu Jan 5 17:53:27 2012
@@ -19,9 +19,11 @@
*/
package org.apache.directory.server.core.api.partition.index;
+
import java.util.Comparator;
import java.util.UUID;
+
public class ForwardIndexComparator<V> implements IndexComparator<V>
{
/** Key comparator */
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ForwardIndexEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ForwardIndexEntry.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ForwardIndexEntry.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ForwardIndexEntry.java Thu Jan 5 17:53:27 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.server.core.api.partition.index;
+
import java.util.UUID;
import org.apache.directory.shared.ldap.model.cursor.Tuple;
@@ -37,7 +38,7 @@ public class ForwardIndexEntry<V> extend
/** The underlying Tuple */
private final Tuple<V, UUID> tuple = new Tuple<V, UUID>();
-
+
/**
* Creates a ForwardIndexEntry instance
*/
@@ -45,8 +46,8 @@ public class ForwardIndexEntry<V> extend
{
super( null );
}
-
-
+
+
/**
* Sets the key value tuple represented by this ForwardIndexEntry optionally
* setting the Entry associated with the id if one was loaded from the
@@ -141,7 +142,7 @@ public class ForwardIndexEntry<V> extend
buf.append( ", " );
buf.append( tuple.getValue() );
buf.append( " ]" );
-
+
return buf.toString();
}
}
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/GenericIndex.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/GenericIndex.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/GenericIndex.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/GenericIndex.java Thu Jan 5 17:53:27 2012
@@ -268,12 +268,13 @@ public class GenericIndex<K> extends Abs
throw new UnsupportedOperationException();
}
+
public ReverseIndexComparator<K> getReverseIndexEntryComparator()
{
throw new UnsupportedOperationException();
}
-
+
public void setWkDirPath( URI wkDirPath )
{
this.wkDirPath = wkDirPath;
@@ -285,7 +286,7 @@ public class GenericIndex<K> extends Abs
throw new UnsupportedOperationException();
}
-
+
/**
* {@inheritDoc}
*/
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/Index.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/Index.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/Index.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/Index.java Thu Jan 5 17:53:27 2012
@@ -257,18 +257,19 @@ public interface Index<K>
boolean reverseLessOrEq( UUID id, K attrVal ) throws Exception;
-
+
ForwardIndexComparator<K> getForwardIndexEntryComparator();
-
+
ReverseIndexComparator<K> getReverseIndexEntryComparator();
+
void close() throws Exception;
void sync() throws Exception;
-
+
/**
* tells whether the Index implementation supports storing duplicate keys
*
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/IndexComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/IndexComparator.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/IndexComparator.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/IndexComparator.java Thu Jan 5 17:53:27 2012
@@ -19,8 +19,10 @@
*/
package org.apache.directory.server.core.api.partition.index;
+
import java.util.Comparator;
+
public interface IndexComparator<V> extends Comparator<IndexEntry<V>>
{
Comparator<V> getValueComparator();
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/IndexEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/IndexEntry.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/IndexEntry.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/IndexEntry.java Thu Jan 5 17:53:27 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.server.core.api.partition.index;
+
import java.util.UUID;
import org.apache.directory.shared.ldap.model.cursor.Tuple;
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/MasterTable.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/MasterTable.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/MasterTable.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/MasterTable.java Thu Jan 5 17:53:27 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.server.core.api.partition.index;
+
import java.util.UUID;
import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -47,8 +48,8 @@ public interface MasterTable extends Tab
* @throws Exception on any failure
*/
UUID getNextId( Entry entry ) throws Exception;
-
-
+
+
/**
* Resets the root ID to 0, this method should be called after deleting the
* context entry of the partition
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ParentIdAndRdn.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ParentIdAndRdn.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ParentIdAndRdn.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ParentIdAndRdn.java Thu Jan 5 17:53:27 2012
@@ -42,7 +42,7 @@ public class ParentIdAndRdn implements E
{
/** The entry ID */
protected UUID parentId;
-
+
/** The list of Rdn for this instance */
protected Rdn[] rdns;
@@ -129,9 +129,9 @@ public class ParentIdAndRdn implements E
public int hashCode()
{
int h = 37;
- h = h*17 + ( ( parentId == null ) ? 0 : parentId.hashCode() );
- h = h*17 + Arrays.hashCode( rdns );
-
+ h = h * 17 + ( ( parentId == null ) ? 0 : parentId.hashCode() );
+ h = h * 17 + Arrays.hashCode( rdns );
+
return h;
}
@@ -145,14 +145,14 @@ public class ParentIdAndRdn implements E
{
return true;
}
-
+
if ( !( obj instanceof ParentIdAndRdn ) )
{
return false;
}
- ParentIdAndRdn that = (ParentIdAndRdn) obj;
-
+ ParentIdAndRdn that = ( ParentIdAndRdn ) obj;
+
if ( rdns == null )
{
return that.rdns == null;
@@ -161,12 +161,12 @@ public class ParentIdAndRdn implements E
{
return false;
}
-
+
if ( rdns.length != that.rdns.length )
{
return false;
}
-
+
for ( int i = 0; i < rdns.length; i++ )
{
if ( !rdns[i].equals( that.rdns[i] ) )
@@ -174,18 +174,18 @@ public class ParentIdAndRdn implements E
return false;
}
}
-
+
return true;
}
-
+
/**
* {@inheritDoc}
*/
public int compareTo( ParentIdAndRdn that )
{
int val = this.rdns.length - that.rdns.length;
-
+
if ( val != 0 )
{
return val;
@@ -194,7 +194,7 @@ public class ParentIdAndRdn implements E
for ( int i = 0; i < this.rdns.length; i++ )
{
val = this.rdns[i].getNormName().compareTo( that.rdns[i].getNormName() );
-
+
if ( val != 0 )
{
return val;
@@ -202,7 +202,7 @@ public class ParentIdAndRdn implements E
}
val = this.getParentId().compareTo( that.getParentId() );
-
+
return val;
}
@@ -225,7 +225,7 @@ public class ParentIdAndRdn implements E
parentId = ( UUID ) in.readObject();
int size = in.readInt();
rdns = new Rdn[size];
-
+
for ( int i = 0; i < size; i++ )
{
Rdn rdn = new Rdn();
@@ -233,20 +233,20 @@ public class ParentIdAndRdn implements E
rdns[i] = rdn;
}
}
-
-
+
+
/**
* {@inheritDoc}
*/
public String toString()
{
StringBuilder sb = new StringBuilder();
-
+
sb.append( "ParentIdAndRdn<" );
sb.append( parentId ).append( ", '" );
-
+
boolean isFirst = true;
-
+
for ( Rdn rdn : rdns )
{
if ( isFirst )
@@ -257,12 +257,12 @@ public class ParentIdAndRdn implements E
{
sb.append( "," );
}
-
+
sb.append( rdn );
}
-
+
sb.append( "'>" );
-
+
return sb.toString();
}
}
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ParentIdAndRdnComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ParentIdAndRdnComparator.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ParentIdAndRdnComparator.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ParentIdAndRdnComparator.java Thu Jan 5 17:53:27 2012
@@ -33,6 +33,7 @@ public class ParentIdAndRdnComparator ex
/** The serial version UID */
private static final long serialVersionUID = 2L;
+
/**
* Creates a new instance of ParentIdAndRdnComparator.
*
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ReverseIndexComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ReverseIndexComparator.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ReverseIndexComparator.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ReverseIndexComparator.java Thu Jan 5 17:53:27 2012
@@ -19,9 +19,11 @@
*/
package org.apache.directory.server.core.api.partition.index;
+
import java.util.Comparator;
import java.util.UUID;
+
public class ReverseIndexComparator<V> implements IndexComparator<V>
{
/** Key comparator */
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ReverseIndexEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ReverseIndexEntry.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ReverseIndexEntry.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/ReverseIndexEntry.java Thu Jan 5 17:53:27 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.server.core.api.partition.index;
+
import java.util.UUID;
import org.apache.directory.shared.ldap.model.cursor.Tuple;
@@ -46,8 +47,7 @@ public class ReverseIndexEntry<V> extend
{
super( null );
}
-
-
+
/**
* Sets the Tuple value represented by this ReverseIndexEntry optionally
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/Serializer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/Serializer.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/Serializer.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/Serializer.java Thu Jan 5 17:53:27 2012
@@ -19,8 +19,10 @@
*/
package org.apache.directory.server.core.api.partition.index;
+
import java.io.IOException;
+
public interface Serializer
{
/**
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/SingletonIndexCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/SingletonIndexCursor.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/SingletonIndexCursor.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/SingletonIndexCursor.java Thu Jan 5 17:53:27 2012
@@ -50,7 +50,7 @@ public class SingletonIndexCursor<V> ext
return UNSUPPORTED_MSG;
}
-
+
public boolean available()
{
return onSingleton;
@@ -174,7 +174,7 @@ public class SingletonIndexCursor<V> ext
public IndexEntry<V> get() throws Exception
{
checkNotClosed( "()" );
-
+
if ( onSingleton )
{
return singleton;
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/Table.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/Table.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/Table.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/Table.java Thu Jan 5 17:53:27 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.server.core.api.partition.index;
+
import java.util.Comparator;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
Modified: directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/UUIDComparator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/UUIDComparator.java?rev=1227722&r1=1227721&r2=1227722&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/UUIDComparator.java (original)
+++ directory/apacheds/branches/apacheds-txns/core-api/src/main/java/org/apache/directory/server/core/api/partition/index/UUIDComparator.java Thu Jan 5 17:53:27 2012
@@ -19,11 +19,13 @@
*/
package org.apache.directory.server.core.api.partition.index;
+
import java.util.UUID;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.schema.comparators.SerializableComparator;
+
public class UUIDComparator extends SerializableComparator<UUID>
{
/** Cached instance */
@@ -32,24 +34,25 @@ public class UUIDComparator extends Seri
/** The serial version UID */
private static final long serialVersionUID = 2L;
+
public UUIDComparator()
{
super( SchemaConstants.UUID_ORDERING_MATCH_MR_OID );
}
+
public int compare( UUID uuid1, UUID uuid2 )
{
if ( uuid1 == null )
{
return ( uuid2 == null ) ? 0 : -1;
}
-
+
if ( uuid2 == null )
{
return 1;
}
-
+
return uuid1.compareTo( uuid2 );
}
}
-