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 2013/12/16 21:06:11 UTC
svn commit: r1551331 - in /directory/mavibot/trunk/mavibot/src:
main/java/org/apache/directory/mavibot/btree/
main/java/org/apache/directory/mavibot/btree/memory/
main/java/org/apache/directory/mavibot/btree/persisted/
test/java/org/apache/directory/ma...
Author: elecharny
Date: Mon Dec 16 20:06:10 2013
New Revision: 1551331
URL: http://svn.apache.org/r1551331
Log:
Made many classes package protected
Added:
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeConfiguration.java
- copied, changed from r1551319, directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/persisted/BTreeConfiguration.java
directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeBuilderTest.java
- copied, changed from r1551319, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/BTreeBuilderTest.java
directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBulkDataSorterTest.java
- copied, changed from r1551070, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/BulkDataSorterTest.java
directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeBrowseTest.java
- copied, changed from r1551319, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/PersistedBTreeBrowseTest.java
directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeBuilderTest.java
- copied, changed from r1551319, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/PersistedBTreeBuilderTest.java
directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeDuplicateKeyTest.java
- copied, changed from r1551319, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/BTreeDuplicateKeyTest.java
directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java
- copied, changed from r1551319, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/RecordManagerFreePageTest.java
directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java
- copied, changed from r1551319, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/RecordManagerTest.java
directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java
- copied, changed from r1551319, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/RecordManagerWithDuplicatesTest.java
Removed:
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/memory/BTreeTypeEnum.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/persisted/BTreeConfiguration.java
Modified:
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBTree.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBorrowedFromSiblingResult.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractDeleteResult.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractPage.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractResult.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractValueHolder.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Addition.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTreeHeader.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTreeTypeEnum.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BorrowedFromLeftResult.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BorrowedFromRightResult.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BorrowedFromSiblingResult.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/DeleteResult.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Deletion.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTree.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTreeConfiguration.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryValueHolder.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InsertResult.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/KeyHolder.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/MergedWithSiblingResult.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Modification.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ModifyResult.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/NotPresentResult.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Page.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageHolder.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ParentPos.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTree.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeFactory.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedKeyHolder.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedValueHolder.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PoisonPill.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RemoveResult.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Result.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/SplitResult.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueArrayCursor.java
directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueBTreeCursor.java
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBTree.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBTree.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBTree.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBTree.java Mon Dec 16 20:06:10 2013
@@ -38,7 +38,7 @@ import org.apache.directory.mavibot.btre
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AbstractBTree<K, V> implements BTree<K, V>
+/* No qualifier*/abstract class AbstractBTree<K, V> implements BTree<K, V>
{
/** The read transaction timeout */
protected long readTimeOut = DEFAULT_READ_TIMEOUT;
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBorrowedFromSiblingResult.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBorrowedFromSiblingResult.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBorrowedFromSiblingResult.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractBorrowedFromSiblingResult.java Mon Dec 16 20:06:10 2013
@@ -33,7 +33,7 @@ import java.util.List;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AbstractBorrowedFromSiblingResult<K, V> extends AbstractDeleteResult<K, V> implements
+/* No qualifier*/abstract class AbstractBorrowedFromSiblingResult<K, V> extends AbstractDeleteResult<K, V> implements
BorrowedFromSiblingResult<K, V>
{
/** The modified sibling reference */
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractDeleteResult.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractDeleteResult.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractDeleteResult.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractDeleteResult.java Mon Dec 16 20:06:10 2013
@@ -31,7 +31,7 @@ import java.util.List;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AbstractDeleteResult<K, V> extends AbstractResult<K, V> implements
+/* No qualifier*/abstract class AbstractDeleteResult<K, V> extends AbstractResult<K, V> implements
DeleteResult<K, V>
{
/** The modified page reference */
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractPage.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractPage.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractPage.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractPage.java Mon Dec 16 20:06:10 2013
@@ -38,7 +38,7 @@ import org.apache.directory.mavibot.btre
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AbstractPage<K, V> implements Page<K, V>
+/* No qualifier*/abstract class AbstractPage<K, V> implements Page<K, V>
{
/** Parent B+Tree. */
protected transient BTree<K, V> btree;
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractResult.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractResult.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractResult.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractResult.java Mon Dec 16 20:06:10 2013
@@ -32,7 +32,7 @@ import java.util.List;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AbstractResult<K, V> implements Result<Page<K, V>>
+/* No qualifier*/abstract class AbstractResult<K, V> implements Result<Page<K, V>>
{
/** The list of copied page reference */
private List<Page<K, V>> copiedPage;
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractValueHolder.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractValueHolder.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractValueHolder.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/AbstractValueHolder.java Mon Dec 16 20:06:10 2013
@@ -32,7 +32,7 @@ import org.apache.directory.mavibot.btre
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @param <V> The value type
*/
-public abstract class AbstractValueHolder<V> implements ValueHolder<V>
+/* No qualifier*/abstract class AbstractValueHolder<V> implements ValueHolder<V>
{
/** The BTree storing multiple value, if we have more than one value */
protected BTree<V, V> valueBtree;
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Addition.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Addition.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Addition.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Addition.java Mon Dec 16 20:06:10 2013
@@ -28,7 +28,7 @@ package org.apache.directory.mavibot.btr
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class Addition<K, V> extends Modification<K, V>
+/* No qualifier*/class Addition<K, V> extends Modification<K, V>
{
/**
* Create a new Addition instance.
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTreeHeader.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTreeHeader.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTreeHeader.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTreeHeader.java Mon Dec 16 20:06:10 2013
@@ -49,7 +49,7 @@ import java.util.concurrent.atomic.Atomi
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class BTreeHeader
+/* No qualifier*/class BTreeHeader
{
/** The current revision */
private AtomicLong revision = new AtomicLong( 0L );
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTreeTypeEnum.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTreeTypeEnum.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTreeTypeEnum.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BTreeTypeEnum.java Mon Dec 16 20:06:10 2013
@@ -36,9 +36,9 @@ public enum BTreeTypeEnum
/** Pure in-memory BTree, not persisted on disk */
IN_MEMORY,
- /** In-memory BTree but persisted on disk */
+ /** Persisted BTree */
PERSISTENT,
- /** A BTree associated with a RecordManager */
- MANAGED
+ /** In-memory BTree but saved on disk */
+ BACKED_ON_DISK
}
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BorrowedFromLeftResult.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BorrowedFromLeftResult.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BorrowedFromLeftResult.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BorrowedFromLeftResult.java Mon Dec 16 20:06:10 2013
@@ -33,7 +33,7 @@ import java.util.List;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class BorrowedFromLeftResult<K, V> extends AbstractBorrowedFromSiblingResult<K, V>
+/* No qualifier*/class BorrowedFromLeftResult<K, V> extends AbstractBorrowedFromSiblingResult<K, V>
{
/**
* The default constructor for BorrowedFromLeftResult.
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BorrowedFromRightResult.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BorrowedFromRightResult.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BorrowedFromRightResult.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BorrowedFromRightResult.java Mon Dec 16 20:06:10 2013
@@ -32,7 +32,7 @@ import java.util.List;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class BorrowedFromRightResult<K, V> extends AbstractBorrowedFromSiblingResult<K, V>
+/* No qualifier*/class BorrowedFromRightResult<K, V> extends AbstractBorrowedFromSiblingResult<K, V>
{
/**
* The default constructor for BorrowedFromRightResult.
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BorrowedFromSiblingResult.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BorrowedFromSiblingResult.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BorrowedFromSiblingResult.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/BorrowedFromSiblingResult.java Mon Dec 16 20:06:10 2013
@@ -29,7 +29,7 @@ package org.apache.directory.mavibot.btr
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface BorrowedFromSiblingResult<K, V> extends DeleteResult<K, V>
+/* No qualifier*/interface BorrowedFromSiblingResult<K, V> extends DeleteResult<K, V>
{
/**
* @return the modifiedSibling
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/DeleteResult.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/DeleteResult.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/DeleteResult.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/DeleteResult.java Mon Dec 16 20:06:10 2013
@@ -30,7 +30,7 @@ package org.apache.directory.mavibot.btr
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface DeleteResult<K, V> extends Result<Page<K, V>>
+/* No qualifier*/interface DeleteResult<K, V> extends Result<Page<K, V>>
{
/**
* @return the modifiedPage
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Deletion.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Deletion.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Deletion.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Deletion.java Mon Dec 16 20:06:10 2013
@@ -28,7 +28,7 @@ package org.apache.directory.mavibot.btr
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class Deletion<K, V> extends Modification<K, V>
+/* No qualifier*/class Deletion<K, V> extends Modification<K, V>
{
/**
* Create a new Deletion instance.
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTree.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTree.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTree.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTree.java Mon Dec 16 20:06:10 2013
@@ -35,7 +35,6 @@ import net.sf.ehcache.Cache;
import net.sf.ehcache.config.CacheConfiguration;
import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
-import org.apache.directory.mavibot.btree.memory.BTreeTypeEnum;
import org.apache.directory.mavibot.btree.serializer.BufferHandler;
import org.apache.directory.mavibot.btree.serializer.ElementSerializer;
import org.apache.directory.mavibot.btree.serializer.LongSerializer;
@@ -51,7 +50,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
- class InMemoryBTree<K, V> extends AbstractBTree<K, V> implements Closeable
+/* No qualifier */class InMemoryBTree<K, V> extends AbstractBTree<K, V> implements Closeable
{
/** The LoggerFactory used by this class */
protected static final Logger LOG = LoggerFactory.getLogger( InMemoryBTree.class );
@@ -280,7 +279,7 @@ import org.slf4j.LoggerFactory;
this.file = new File( envDir, btreeHeader.getName() + DATA_SUFFIX );
this.journal = new File( envDir, file.getName() + JOURNAL_SUFFIX );
- type = BTreeTypeEnum.PERSISTENT;
+ type = BTreeTypeEnum.BACKED_ON_DISK;
}
// Create the queue containing the pending read transactions
@@ -290,7 +289,7 @@ import org.slf4j.LoggerFactory;
// Check the files and create them if missing
// Create the queue containing the modifications, if it's not a in-memory btree
- if ( type == BTreeTypeEnum.PERSISTENT )
+ if ( type == BTreeTypeEnum.BACKED_ON_DISK )
{
if ( file.length() > 0 )
{
@@ -351,7 +350,7 @@ import org.slf4j.LoggerFactory;
// readTransactionsThread.interrupt();
// readTransactions.clear();
- if ( type == BTreeTypeEnum.PERSISTENT )
+ if ( type == BTreeTypeEnum.BACKED_ON_DISK )
{
// Flush the data
flush();
@@ -768,7 +767,7 @@ import org.slf4j.LoggerFactory;
*/
public void flush() throws IOException
{
- if ( type == BTreeTypeEnum.PERSISTENT )
+ if ( type == BTreeTypeEnum.BACKED_ON_DISK )
{
// Then flush the file
flush( file );
@@ -862,7 +861,7 @@ import org.slf4j.LoggerFactory;
sb.append( "In-memory " );
break;
- case PERSISTENT:
+ case BACKED_ON_DISK:
sb.append( "Persistent " );
break;
@@ -894,7 +893,7 @@ import org.slf4j.LoggerFactory;
sb.append( ", DuplicatesAllowed: " ).append( btreeHeader.isAllowDuplicates() );
- if ( type == BTreeTypeEnum.PERSISTENT )
+ if ( type == BTreeTypeEnum.BACKED_ON_DISK )
{
try
{
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTreeConfiguration.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTreeConfiguration.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTreeConfiguration.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryBTreeConfiguration.java Mon Dec 16 20:06:10 2013
@@ -20,7 +20,6 @@
package org.apache.directory.mavibot.btree;
-import org.apache.directory.mavibot.btree.memory.BTreeTypeEnum;
import org.apache.directory.mavibot.btree.serializer.ElementSerializer;
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryValueHolder.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryValueHolder.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryValueHolder.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InMemoryValueHolder.java Mon Dec 16 20:06:10 2013
@@ -34,7 +34,7 @@ import org.apache.directory.mavibot.btre
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @param <V> The value type
*/
-public class InMemoryValueHolder<V> extends AbstractValueHolder<V>
+/* No qualifier */class InMemoryValueHolder<V> extends AbstractValueHolder<V>
{
/**
* Creates a new instance of a ValueHolder, containing the serialized values.
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InsertResult.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InsertResult.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InsertResult.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/InsertResult.java Mon Dec 16 20:06:10 2013
@@ -32,6 +32,6 @@ package org.apache.directory.mavibot.btr
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface InsertResult<K, V> extends Result<Page<K, V>>
+/* No qualifier*/interface InsertResult<K, V> extends Result<Page<K, V>>
{
}
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/KeyHolder.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/KeyHolder.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/KeyHolder.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/KeyHolder.java Mon Dec 16 20:06:10 2013
@@ -26,7 +26,7 @@ package org.apache.directory.mavibot.btr
*
* <K> The key type
*/
-public class KeyHolder<K>
+/* No qualifier*/class KeyHolder<K>
{
/** The deserialized key */
protected K key;
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/MergedWithSiblingResult.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/MergedWithSiblingResult.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/MergedWithSiblingResult.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/MergedWithSiblingResult.java Mon Dec 16 20:06:10 2013
@@ -32,7 +32,7 @@ import java.util.List;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class MergedWithSiblingResult<K, V> extends AbstractDeleteResult<K, V>
+/* No qualifier*/class MergedWithSiblingResult<K, V> extends AbstractDeleteResult<K, V>
{
/**
* The default constructor for RemoveResult.
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Modification.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Modification.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Modification.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Modification.java Mon Dec 16 20:06:10 2013
@@ -28,7 +28,7 @@ package org.apache.directory.mavibot.btr
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class Modification<K, V> extends Tuple<K, V>
+/* No qualifier*/abstract class Modification<K, V> extends Tuple<K, V>
{
/** The byte used to define an Addition in the serialized journal */
public static final byte ADDITION = 0;
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ModifyResult.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ModifyResult.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ModifyResult.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ModifyResult.java Mon Dec 16 20:06:10 2013
@@ -32,7 +32,7 @@ import java.util.List;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ModifyResult<K, V> extends AbstractResult<K, V> implements InsertResult<K, V>
+/* No qualifier*/class ModifyResult<K, V> extends AbstractResult<K, V> implements InsertResult<K, V>
{
/** The modified page reference */
protected Page<K, V> modifiedPage;
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/NotPresentResult.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/NotPresentResult.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/NotPresentResult.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/NotPresentResult.java Mon Dec 16 20:06:10 2013
@@ -30,7 +30,7 @@ package org.apache.directory.mavibot.btr
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class NotPresentResult<K, V> extends AbstractResult<K, V> implements DeleteResult<K, V>
+/* No qualifier*/class NotPresentResult<K, V> extends AbstractResult<K, V> implements DeleteResult<K, V>
{
/** The unique instance for this class */
@SuppressWarnings("rawtypes")
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Page.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Page.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Page.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Page.java Mon Dec 16 20:06:10 2013
@@ -37,7 +37,7 @@ import org.apache.directory.mavibot.btre
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface Page<K, V>
+/* No qualifier*/interface Page<K, V>
{
/**
* @return The number of keys present in this page
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageHolder.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageHolder.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageHolder.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PageHolder.java Mon Dec 16 20:06:10 2013
@@ -27,7 +27,7 @@ package org.apache.directory.mavibot.btr
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class PageHolder<K, V>
+/* No qualifier*/class PageHolder<K, V>
{
/** The BTree */
protected BTree<K, V> btree;
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ParentPos.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ParentPos.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ParentPos.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ParentPos.java Mon Dec 16 20:06:10 2013
@@ -30,7 +30,7 @@ package org.apache.directory.mavibot.btr
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ParentPos<K, V>
+/* No qualifier*/class ParentPos<K, V>
{
/** The page we are browsing */
public Page<K, V> page;
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTree.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTree.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTree.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTree.java Mon Dec 16 20:06:10 2013
@@ -31,7 +31,6 @@ import net.sf.ehcache.Cache;
import net.sf.ehcache.config.CacheConfiguration;
import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
-import org.apache.directory.mavibot.btree.persisted.BTreeConfiguration;
import org.apache.directory.mavibot.btree.serializer.ElementSerializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -82,7 +81,7 @@ public class PersistedBTree<K, V> extend
*
* @param comparator The comparator to use
*/
- public PersistedBTree( BTreeConfiguration<K, V> configuration )
+ public PersistedBTree( PersistedBTreeConfiguration<K, V> configuration )
{
super();
String name = configuration.getName();
Copied: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeConfiguration.java (from r1551319, directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/persisted/BTreeConfiguration.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeConfiguration.java?p2=directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeConfiguration.java&p1=directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/persisted/BTreeConfiguration.java&r1=1551319&r2=1551331&rev=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/persisted/BTreeConfiguration.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeConfiguration.java Mon Dec 16 20:06:10 2013
@@ -17,11 +17,9 @@
* under the License.
*
*/
-package org.apache.directory.mavibot.btree.persisted;
+package org.apache.directory.mavibot.btree;
-import org.apache.directory.mavibot.btree.BTree;
-import org.apache.directory.mavibot.btree.PersistedBTree;
import org.apache.directory.mavibot.btree.serializer.ElementSerializer;
@@ -34,7 +32,7 @@ import org.apache.directory.mavibot.btre
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class BTreeConfiguration<K, V>
+public class PersistedBTreeConfiguration<K, V>
{
/** Number of entries in each Page. */
private int pageSize = BTree.DEFAULT_PAGE_SIZE;
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeFactory.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeFactory.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeFactory.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedBTreeFactory.java Mon Dec 16 20:06:10 2013
@@ -23,7 +23,6 @@ package org.apache.directory.mavibot.btr
import java.io.IOException;
import java.util.LinkedList;
-import org.apache.directory.mavibot.btree.persisted.BTreeConfiguration;
import org.apache.directory.mavibot.btree.serializer.ElementSerializer;
@@ -55,7 +54,7 @@ public class PersistedBTreeFactory
*
* @return The created BTree
*/
- public static <K, V> BTree<K, V> createBTree( BTreeConfiguration<K, V> configuration)
+ public static <K, V> BTree<K, V> createBTree( PersistedBTreeConfiguration<K, V> configuration)
{
BTree<K, V> btree = new PersistedBTree<K, V>( configuration );
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedKeyHolder.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedKeyHolder.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedKeyHolder.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedKeyHolder.java Mon Dec 16 20:06:10 2013
@@ -32,7 +32,7 @@ import org.apache.directory.mavibot.btre
*
* <K> The key type
*/
-public class PersistedKeyHolder<K> extends KeyHolder<K>
+/* No qualifier */class PersistedKeyHolder<K> extends KeyHolder<K>
{
/** The ByteBuffer storing the key */
private byte[] raw;
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedPageHolder.java Mon Dec 16 20:06:10 2013
@@ -39,7 +39,7 @@ import org.apache.directory.mavibot.btre
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class PersistedPageHolder<K, V> extends PageHolder<K, V>
+/* No qualifier */class PersistedPageHolder<K, V> extends PageHolder<K, V>
{
/** The RecordManager */
private RecordManager recordManager;
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedValueHolder.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedValueHolder.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedValueHolder.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PersistedValueHolder.java Mon Dec 16 20:06:10 2013
@@ -26,7 +26,6 @@ import java.util.Comparator;
import java.util.UUID;
import org.apache.directory.mavibot.btree.exception.BTreeAlreadyManagedException;
-import org.apache.directory.mavibot.btree.persisted.BTreeConfiguration;
import org.apache.directory.mavibot.btree.serializer.IntSerializer;
import org.apache.directory.mavibot.btree.serializer.LongSerializer;
@@ -37,7 +36,7 @@ import org.apache.directory.mavibot.btre
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @param <V> The value type
*/
-public class PersistedValueHolder<V> extends AbstractValueHolder<V>
+/* No qualifier */class PersistedValueHolder<V> extends AbstractValueHolder<V>
{
/** The parent BTree */
protected PersistedBTree<V, V> parentBtree;
@@ -241,7 +240,7 @@ public class PersistedValueHolder<V> ext
{
try
{
- BTreeConfiguration<V, V> configuration = new BTreeConfiguration<V, V>();
+ PersistedBTreeConfiguration<V, V> configuration = new PersistedBTreeConfiguration<V, V>();
configuration.setAllowDuplicates( false );
configuration.setKeySerializer( valueSerializer );
configuration.setName( UUID.randomUUID().toString() );
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PoisonPill.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PoisonPill.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PoisonPill.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/PoisonPill.java Mon Dec 16 20:06:10 2013
@@ -29,7 +29,7 @@ package org.apache.directory.mavibot.btr
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class PoisonPill<K, V> extends Modification<K, V>
+/* No qualifier*/class PoisonPill<K, V> extends Modification<K, V>
{
/**
* Create a new PoisonPill instance.
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java Mon Dec 16 20:06:10 2013
@@ -36,7 +36,6 @@ import java.util.concurrent.atomic.Atomi
import org.apache.directory.mavibot.btree.exception.BTreeAlreadyManagedException;
import org.apache.directory.mavibot.btree.exception.EndOfFileExceededException;
import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
-import org.apache.directory.mavibot.btree.persisted.BTreeConfiguration;
import org.apache.directory.mavibot.btree.persisted.RevisionName;
import org.apache.directory.mavibot.btree.persisted.RevisionNameSerializer;
import org.apache.directory.mavibot.btree.serializer.ElementSerializer;
@@ -2531,7 +2530,7 @@ public class RecordManager
ElementSerializer<V> valueSerializer,
boolean allowDuplicates ) throws IOException, BTreeAlreadyManagedException
{
- BTreeConfiguration config = new BTreeConfiguration();
+ PersistedBTreeConfiguration config = new PersistedBTreeConfiguration();
config.setName( name );
config.setKeySerializer( keySerializer );
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RemoveResult.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RemoveResult.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RemoveResult.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/RemoveResult.java Mon Dec 16 20:06:10 2013
@@ -32,7 +32,7 @@ import java.util.List;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class RemoveResult<K, V> extends AbstractDeleteResult<K, V>
+/* No qualifier*/class RemoveResult<K, V> extends AbstractDeleteResult<K, V>
{
/**
* The default constructor for RemoveResult.
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Result.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Result.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Result.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/Result.java Mon Dec 16 20:06:10 2013
@@ -31,7 +31,7 @@ import java.util.List;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface Result<P>
+/* No qualifier*/interface Result<P>
{
/**
* @return the copiedPage
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/SplitResult.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/SplitResult.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/SplitResult.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/SplitResult.java Mon Dec 16 20:06:10 2013
@@ -32,7 +32,7 @@ import java.util.List;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class SplitResult<K, V> extends AbstractResult<K, V> implements InsertResult<K, V>
+/* No qualifier*/class SplitResult<K, V> extends AbstractResult<K, V> implements InsertResult<K, V>
{
/** The left child */
protected Page<K, V> leftPage;
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueArrayCursor.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueArrayCursor.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueArrayCursor.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueArrayCursor.java Mon Dec 16 20:06:10 2013
@@ -7,7 +7,7 @@ import org.apache.directory.mavibot.btre
/**
* A class that encapsulate the values into an array
*/
-public class ValueArrayCursor<V> implements ValueCursor<V>
+/* No qualifier */class ValueArrayCursor<V> implements ValueCursor<V>
{
/** Store the current position in the array or in the BTree */
private int currentPos;
Modified: directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueBTreeCursor.java
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueBTreeCursor.java?rev=1551331&r1=1551330&r2=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueBTreeCursor.java (original)
+++ directory/mavibot/trunk/mavibot/src/main/java/org/apache/directory/mavibot/btree/ValueBTreeCursor.java Mon Dec 16 20:06:10 2013
@@ -8,7 +8,7 @@ import org.apache.directory.mavibot.btre
/**
* A class that encapsulate the values into an sub-btree
*/
-public class ValueBTreeCursor<V> implements ValueCursor<V>
+/* No qualifier */class ValueBTreeCursor<V> implements ValueCursor<V>
{
/** Store the current position in the array or in the BTree */
private TupleCursor<V, V> cursor;
Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeBuilderTest.java (from r1551319, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/BTreeBuilderTest.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeBuilderTest.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeBuilderTest.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/BTreeBuilderTest.java&r1=1551319&r2=1551331&rev=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/BTreeBuilderTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeBuilderTest.java Mon Dec 16 20:06:10 2013
@@ -18,7 +18,7 @@
*
*/
-package org.apache.directory.mavibot.btree.memory;
+package org.apache.directory.mavibot.btree;
import static org.junit.Assert.assertEquals;
@@ -40,7 +40,7 @@ import org.junit.Test;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class BTreeBuilderTest
+public class InMemoryBTreeBuilderTest
{
@Test
public void testIntegerTree() throws IOException
Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBulkDataSorterTest.java (from r1551070, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/BulkDataSorterTest.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBulkDataSorterTest.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBulkDataSorterTest.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/BulkDataSorterTest.java&r1=1551070&r2=1551331&rev=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/BulkDataSorterTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBulkDataSorterTest.java Mon Dec 16 20:06:10 2013
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.mavibot.btree.memory;
+package org.apache.directory.mavibot.btree;
import static org.junit.Assert.assertEquals;
@@ -33,6 +33,7 @@ import java.util.Iterator;
import java.util.Random;
import org.apache.directory.mavibot.btree.Tuple;
+import org.apache.directory.mavibot.btree.memory.BulkDataSorter;
import org.apache.directory.mavibot.btree.util.IntTupleReaderWriter;
import org.junit.Rule;
import org.junit.Test;
@@ -44,7 +45,7 @@ import org.junit.rules.TemporaryFolder;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class BulkDataSorterTest
+public class InMemoryBulkDataSorterTest
{
@Rule
public TemporaryFolder tempFolder = new TemporaryFolder();
Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeBrowseTest.java (from r1551319, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/PersistedBTreeBrowseTest.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeBrowseTest.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeBrowseTest.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/PersistedBTreeBrowseTest.java&r1=1551319&r2=1551331&rev=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/PersistedBTreeBrowseTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeBrowseTest.java Mon Dec 16 20:06:10 2013
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.mavibot.btree.persisted;
+package org.apache.directory.mavibot.btree;
import static org.junit.Assert.assertEquals;
Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeBuilderTest.java (from r1551319, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/PersistedBTreeBuilderTest.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeBuilderTest.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeBuilderTest.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/PersistedBTreeBuilderTest.java&r1=1551319&r2=1551331&rev=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/PersistedBTreeBuilderTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeBuilderTest.java Mon Dec 16 20:06:10 2013
@@ -18,7 +18,7 @@
*
*/
-package org.apache.directory.mavibot.btree.persisted;
+package org.apache.directory.mavibot.btree;
import static org.junit.Assert.assertEquals;
Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeDuplicateKeyTest.java (from r1551319, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/BTreeDuplicateKeyTest.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeDuplicateKeyTest.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeDuplicateKeyTest.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/BTreeDuplicateKeyTest.java&r1=1551319&r2=1551331&rev=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/BTreeDuplicateKeyTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedBTreeDuplicateKeyTest.java Mon Dec 16 20:06:10 2013
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.mavibot.btree.persisted;
+package org.apache.directory.mavibot.btree;
import static org.junit.Assert.assertEquals;
@@ -51,7 +51,7 @@ import org.junit.rules.TemporaryFolder;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class BTreeDuplicateKeyTest
+public class PersistedBTreeDuplicateKeyTest
{
private BTree<Long, String> btree = null;
Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java (from r1551319, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/RecordManagerFreePageTest.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/RecordManagerFreePageTest.java&r1=1551319&r2=1551331&rev=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/RecordManagerFreePageTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java Mon Dec 16 20:06:10 2013
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.mavibot.btree.persisted;
+package org.apache.directory.mavibot.btree;
import static org.junit.Assert.assertEquals;
Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java (from r1551319, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/RecordManagerTest.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/RecordManagerTest.java&r1=1551319&r2=1551331&rev=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/RecordManagerTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java Mon Dec 16 20:06:10 2013
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.mavibot.btree.persisted;
+package org.apache.directory.mavibot.btree;
import static org.junit.Assert.assertEquals;
Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java (from r1551319, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/RecordManagerWithDuplicatesTest.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/RecordManagerWithDuplicatesTest.java&r1=1551319&r2=1551331&rev=1551331&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/RecordManagerWithDuplicatesTest.java (original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerWithDuplicatesTest.java Mon Dec 16 20:06:10 2013
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.directory.mavibot.btree.persisted;
+package org.apache.directory.mavibot.btree;
import static org.junit.Assert.assertEquals;