directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1551319 [2/2] - 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/direct...
Date Mon, 16 Dec 2013 19:18:37 GMT
Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeDuplicateKeyTest.java
(from r1551070, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/BTreeDuplicateKeyTest.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeDuplicateKeyTest.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeDuplicateKeyTest.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/BTreeDuplicateKeyTest.java&r1=1551070&r2=1551319&rev=1551319&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/BTreeDuplicateKeyTest.java
(original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeDuplicateKeyTest.java
Mon Dec 16 19:18:36 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;
@@ -32,6 +32,7 @@ import java.util.NoSuchElementException;
 import java.util.UUID;
 
 import org.apache.directory.mavibot.btree.BTree;
+import org.apache.directory.mavibot.btree.InMemoryBTree;
 import org.apache.directory.mavibot.btree.Tuple;
 import org.apache.directory.mavibot.btree.TupleCursor;
 import org.apache.directory.mavibot.btree.serializer.IntSerializer;
@@ -44,7 +45,7 @@ import org.junit.Test;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class BTreeDuplicateKeyTest
+public class InMemoryBTreeDuplicateKeyTest
 {
     @Test
     public void testInsertNullValue() throws IOException
@@ -112,7 +113,7 @@ public class BTreeDuplicateKeyTest
     {
         IntSerializer serializer = new IntSerializer();
 
-        BTreeConfiguration<Integer, Integer> config = new BTreeConfiguration<Integer,
Integer>();
+        InMemoryBTreeConfiguration<Integer, Integer> config = new InMemoryBTreeConfiguration<Integer,
Integer>();
         config.setAllowDuplicates( true );
         config.setName( "master" );
         config.setSerializers( serializer, serializer );
@@ -168,7 +169,7 @@ public class BTreeDuplicateKeyTest
     {
         IntSerializer serializer = new IntSerializer();
 
-        BTreeConfiguration<Integer, Integer> config = new BTreeConfiguration<Integer,
Integer>();
+        InMemoryBTreeConfiguration<Integer, Integer> config = new InMemoryBTreeConfiguration<Integer,
Integer>();
         config.setAllowDuplicates( true );
         config.setName( "master" );
         config.setSerializers( serializer, serializer );
@@ -203,7 +204,7 @@ public class BTreeDuplicateKeyTest
     {
         IntSerializer serializer = new IntSerializer();
 
-        BTreeConfiguration<Integer, Integer> config = new BTreeConfiguration<Integer,
Integer>();
+        InMemoryBTreeConfiguration<Integer, Integer> config = new InMemoryBTreeConfiguration<Integer,
Integer>();
         config.setAllowDuplicates( true );
         config.setName( "master" );
         config.setSerializers( serializer, serializer );
@@ -238,7 +239,7 @@ public class BTreeDuplicateKeyTest
     {
         StringSerializer serializer = new StringSerializer();
 
-        BTreeConfiguration<String, String> config = new BTreeConfiguration<String,
String>();
+        InMemoryBTreeConfiguration<String, String> config = new InMemoryBTreeConfiguration<String,
String>();
         config.setAllowDuplicates( true );
         config.setName( "master" );
         config.setSerializers( serializer, serializer );
@@ -299,7 +300,7 @@ public class BTreeDuplicateKeyTest
     {
         StringSerializer serializer = new StringSerializer();
 
-        BTreeConfiguration<String, String> config = new BTreeConfiguration<String,
String>();
+        InMemoryBTreeConfiguration<String, String> config = new InMemoryBTreeConfiguration<String,
String>();
         config.setAllowDuplicates( true );
         config.setName( "master" );
         config.setSerializers( serializer, serializer );
@@ -387,7 +388,7 @@ public class BTreeDuplicateKeyTest
     {
         StringSerializer serializer = new StringSerializer();
 
-        BTreeConfiguration<String, String> config = new BTreeConfiguration<String,
String>();
+        InMemoryBTreeConfiguration<String, String> config = new InMemoryBTreeConfiguration<String,
String>();
         config.setAllowDuplicates( true );
         config.setName( "master" );
         config.setSerializers( serializer, serializer );
@@ -427,7 +428,7 @@ public class BTreeDuplicateKeyTest
     {
         StringSerializer serializer = new StringSerializer();
 
-        BTreeConfiguration<String, String> config = new BTreeConfiguration<String,
String>();
+        InMemoryBTreeConfiguration<String, String> config = new InMemoryBTreeConfiguration<String,
String>();
         config.setAllowDuplicates( true );
         config.setName( "master" );
         config.setSerializers( serializer, serializer );
@@ -533,7 +534,7 @@ public class BTreeDuplicateKeyTest
     {
         IntSerializer serializer = new IntSerializer();
 
-        BTreeConfiguration<Integer, Integer> config = new BTreeConfiguration<Integer,
Integer>();
+        InMemoryBTreeConfiguration<Integer, Integer> config = new InMemoryBTreeConfiguration<Integer,
Integer>();
         config.setAllowDuplicates( true );
         config.setName( "master" );
         config.setPageSize( 4 );
@@ -607,7 +608,7 @@ public class BTreeDuplicateKeyTest
     {
         IntSerializer serializer = new IntSerializer();
 
-        BTreeConfiguration<Integer, Integer> config = new BTreeConfiguration<Integer,
Integer>();
+        InMemoryBTreeConfiguration<Integer, Integer> config = new InMemoryBTreeConfiguration<Integer,
Integer>();
         config.setAllowDuplicates( true );
         config.setName( "master" );
         config.setPageSize( 4 );
@@ -653,7 +654,7 @@ public class BTreeDuplicateKeyTest
     {
         IntSerializer serializer = new IntSerializer();
 
-        BTreeConfiguration<Integer, Integer> config = new BTreeConfiguration<Integer,
Integer>();
+        InMemoryBTreeConfiguration<Integer, Integer> config = new InMemoryBTreeConfiguration<Integer,
Integer>();
         config.setAllowDuplicates( true );
         config.setName( "master" );
         config.setPageSize( 8 );
@@ -692,7 +693,7 @@ public class BTreeDuplicateKeyTest
     {
         IntSerializer serializer = new IntSerializer();
 
-        BTreeConfiguration<Integer, Integer> config = new BTreeConfiguration<Integer,
Integer>();
+        InMemoryBTreeConfiguration<Integer, Integer> config = new InMemoryBTreeConfiguration<Integer,
Integer>();
         config.setAllowDuplicates( true );
         config.setName( "master" );
         config.setPageSize( 8 );

Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeFlushTest.java
(from r1551070, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/BTreeFlushTest.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeFlushTest.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeFlushTest.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/BTreeFlushTest.java&r1=1551070&r2=1551319&rev=1551319&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/BTreeFlushTest.java
(original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeFlushTest.java
Mon Dec 16 19:18:36 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;
@@ -30,6 +30,7 @@ import java.util.Random;
 import java.util.Set;
 
 import org.apache.directory.mavibot.btree.BTree;
+import org.apache.directory.mavibot.btree.InMemoryBTree;
 import org.apache.directory.mavibot.btree.Tuple;
 import org.apache.directory.mavibot.btree.TupleCursor;
 import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
@@ -46,7 +47,7 @@ import org.junit.rules.TemporaryFolder;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class BTreeFlushTest
+public class InMemoryBTreeFlushTest
 {
     @Rule
     public TemporaryFolder tempFolder = new TemporaryFolder();

Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTest.java
(from r1551280, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/InMemoryBTreeTest.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTest.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTest.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/InMemoryBTreeTest.java&r1=1551280&r2=1551319&rev=1551319&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/InMemoryBTreeTest.java
(original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTest.java
Mon Dec 16 19:18:36 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;
@@ -36,6 +36,8 @@ import java.util.Random;
 import java.util.Set;
 
 import org.apache.directory.mavibot.btree.BTree;
+import org.apache.directory.mavibot.btree.InMemoryBTree;
+import org.apache.directory.mavibot.btree.InMemoryValueHolder;
 import org.apache.directory.mavibot.btree.KeyHolder;
 import org.apache.directory.mavibot.btree.Page;
 import org.apache.directory.mavibot.btree.PageHolder;
@@ -1050,7 +1052,7 @@ public class InMemoryBTreeTest
         leaf.setRevision( revision );
         leaf.setNbElems( tuples.length );
         leaf.setKeys( new KeyHolder[leaf.getNbElems()] );
-        leaf.values = ( InMemoryValueHolder<String>[] ) Array
+        leaf.values = (InMemoryValueHolder<String>[] ) Array
             .newInstance( InMemoryValueHolder.class, leaf.getNbElems() );
 
         for ( Tuple<Integer, String> tuple : tuples )
@@ -1912,7 +1914,7 @@ public class InMemoryBTreeTest
     {
         IntSerializer serializer = new IntSerializer();
 
-        BTreeConfiguration<Integer, Integer> config = new BTreeConfiguration<Integer,
Integer>();
+        InMemoryBTreeConfiguration<Integer, Integer> config = new InMemoryBTreeConfiguration<Integer,
Integer>();
         config.setName( "master" );
         config.setPageSize( 4 );
         config.setSerializers( serializer, serializer );

Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTestOps.java
(from r1551070, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/InMemoryBTreeTestOps.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTestOps.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTestOps.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/InMemoryBTreeTestOps.java&r1=1551070&r2=1551319&rev=1551319&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/InMemoryBTreeTestOps.java
(original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryBTreeTestOps.java
Mon Dec 16 19:18:36 2013
@@ -1,4 +1,4 @@
-package org.apache.directory.mavibot.btree.memory;
+package org.apache.directory.mavibot.btree;
 
 
 /*
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.util.Random;
 
 import org.apache.directory.mavibot.btree.BTree;
+import org.apache.directory.mavibot.btree.InMemoryBTree;
 import org.apache.directory.mavibot.btree.serializer.LongSerializer;
 import org.apache.directory.mavibot.btree.serializer.StringSerializer;
 import org.junit.AfterClass;

Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryLeafTest.java
(from r1551294, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/LeafTest.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryLeafTest.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryLeafTest.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/LeafTest.java&r1=1551294&r2=1551319&rev=1551319&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/LeafTest.java
(original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/InMemoryLeafTest.java
Mon Dec 16 19:18:36 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;
@@ -30,6 +30,7 @@ import org.apache.directory.mavibot.btre
 import org.apache.directory.mavibot.btree.BorrowedFromLeftResult;
 import org.apache.directory.mavibot.btree.BorrowedFromRightResult;
 import org.apache.directory.mavibot.btree.DeleteResult;
+import org.apache.directory.mavibot.btree.InMemoryBTree;
 import org.apache.directory.mavibot.btree.InsertResult;
 import org.apache.directory.mavibot.btree.KeyHolder;
 import org.apache.directory.mavibot.btree.MergedWithSiblingResult;
@@ -51,7 +52,7 @@ import org.junit.Test;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class LeafTest
+public class InMemoryLeafTest
 {
     private BTree<Long, String> btree = null;
 
@@ -82,7 +83,7 @@ public class LeafTest
     {
         InsertResult<Long, String> result = leaf.insert( 1L, key, value );
 
-        return ( InMemoryLeaf<Long, String> ) ( (org.apache.directory.mavibot.btree.ModifyResult<Long,
String> ) result ).getModifiedPage();
+        return (InMemoryLeaf<Long, String> ) ( (ModifyResult<Long, String> )
result ).getModifiedPage();
     }
 
 
@@ -137,8 +138,8 @@ public class LeafTest
 
         assertTrue( result instanceof RemoveResult );
 
-        Tuple<Long, String> removedElement = ( (org.apache.directory.mavibot.btree.RemoveResult<Long,
String> ) result ).getRemovedElement();
-        Page<Long, String> newLeaf = ( (org.apache.directory.mavibot.btree.RemoveResult<Long,
String> ) result ).getModifiedPage();
+        Tuple<Long, String> removedElement = ( (RemoveResult<Long, String> )
result ).getRemovedElement();
+        Page<Long, String> newLeaf = ( (RemoveResult<Long, String> ) result ).getModifiedPage();
 
         assertEquals( Long.valueOf( 3L ), removedElement.getKey() );
         assertEquals( "v3", removedElement.getValue() );
@@ -184,7 +185,7 @@ public class LeafTest
 
         assertTrue( result instanceof RemoveResult );
 
-        RemoveResult<Long, String> removeResult = (org.apache.directory.mavibot.btree.RemoveResult<Long,
String> ) result;
+        RemoveResult<Long, String> removeResult = (RemoveResult<Long, String>
) result;
 
         Tuple<Long, String> removedElement = removeResult.getRemovedElement();
         Page<Long, String> newLeaf = removeResult.getModifiedPage();
@@ -265,13 +266,13 @@ public class LeafTest
 
         assertTrue( result instanceof BorrowedFromLeftResult );
 
-        BorrowedFromLeftResult<Long, String> borrowed = (org.apache.directory.mavibot.btree.BorrowedFromLeftResult<Long,
String> ) result;
+        BorrowedFromLeftResult<Long, String> borrowed = (BorrowedFromLeftResult<Long,
String> ) result;
         Tuple<Long, String> removedKey = borrowed.getRemovedElement();
 
         assertEquals( Long.valueOf( 7L ), removedKey.getKey() );
 
         // Check the modified leaf
-        InMemoryLeaf<Long, String> newLeaf = ( InMemoryLeaf<Long, String> ) borrowed.getModifiedPage();
+        InMemoryLeaf<Long, String> newLeaf = (InMemoryLeaf<Long, String> ) borrowed.getModifiedPage();
 
         assertEquals( 4, newLeaf.getNbElems() );
         assertEquals( Long.valueOf( 5L ), newLeaf.getKey( 0 ) );
@@ -280,7 +281,7 @@ public class LeafTest
         assertEquals( Long.valueOf( 9L ), newLeaf.getKey( 3 ) );
 
         // Check the sibling
-        InMemoryLeaf<Long, String> leftSibling = ( InMemoryLeaf<Long, String>
) borrowed.getModifiedSibling();
+        InMemoryLeaf<Long, String> leftSibling = (InMemoryLeaf<Long, String>
) borrowed.getModifiedSibling();
 
         assertEquals( 4, leftSibling.getNbElems() );
         assertEquals( Long.valueOf( 1L ), leftSibling.getKey( 0 ) );
@@ -335,14 +336,14 @@ public class LeafTest
 
         assertTrue( result instanceof BorrowedFromRightResult );
 
-        BorrowedFromRightResult<Long, String> borrowed = (org.apache.directory.mavibot.btree.BorrowedFromRightResult<Long,
String> ) result;
+        BorrowedFromRightResult<Long, String> borrowed = (BorrowedFromRightResult<Long,
String> ) result;
         assertEquals( Long.valueOf( 11L ), borrowed.getModifiedSibling().getKey( 0 ) );
         Tuple<Long, String> removedKey = borrowed.getRemovedElement();
 
         assertEquals( Long.valueOf( 7L ), removedKey.getKey() );
 
         // Check the modified leaf
-        InMemoryLeaf<Long, String> newLeaf = ( InMemoryLeaf<Long, String> ) borrowed.getModifiedPage();
+        InMemoryLeaf<Long, String> newLeaf = (InMemoryLeaf<Long, String> ) borrowed.getModifiedPage();
 
         assertEquals( 4, newLeaf.getNbElems() );
         assertEquals( Long.valueOf( 6L ), newLeaf.getKey( 0 ) );
@@ -351,7 +352,7 @@ public class LeafTest
         assertEquals( Long.valueOf( 10L ), newLeaf.getKey( 3 ) );
 
         // Check the sibling
-        InMemoryLeaf<Long, String> rightSibling = ( InMemoryLeaf<Long, String>
) borrowed.getModifiedSibling();
+        InMemoryLeaf<Long, String> rightSibling = (InMemoryLeaf<Long, String>
) borrowed.getModifiedSibling();
 
         assertEquals( 4, rightSibling.getNbElems() );
         assertEquals( Long.valueOf( 11L ), rightSibling.getKey( 0 ) );
@@ -405,13 +406,13 @@ public class LeafTest
 
         assertTrue( result instanceof MergedWithSiblingResult );
 
-        MergedWithSiblingResult<Long, String> merged = (org.apache.directory.mavibot.btree.MergedWithSiblingResult<Long,
String> ) result;
+        MergedWithSiblingResult<Long, String> merged = (MergedWithSiblingResult<Long,
String> ) result;
         Tuple<Long, String> removedKey = merged.getRemovedElement();
 
         assertEquals( Long.valueOf( 7L ), removedKey.getKey() );
 
         // Check the modified leaf
-        InMemoryLeaf<Long, String> newLeaf = ( InMemoryLeaf<Long, String> ) merged.getModifiedPage();
+        InMemoryLeaf<Long, String> newLeaf = (InMemoryLeaf<Long, String> ) merged.getModifiedPage();
 
         assertEquals( 7, newLeaf.getNbElems() );
         assertEquals( Long.valueOf( 1L ), newLeaf.getKey( 0 ) );
@@ -437,7 +438,7 @@ public class LeafTest
         for ( long i = 0; i < 8; i++ )
         {
             long value = i + i + 1;
-            leaf = ( InMemoryLeaf<Long, String> ) ( (org.apache.directory.mavibot.btree.ModifyResult<Long,
String> ) leaf.insert( 0L, value, "V" + value ) )
+            leaf = (InMemoryLeaf<Long, String> ) ( (ModifyResult<Long, String>
) leaf.insert( 0L, value, "V" + value ) )
                 .getModifiedPage();
         }
 

Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/MultiThreadedInMemoryBtreeTest.java
(from r1551070, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/MultiThreadedBtreeTest.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/MultiThreadedInMemoryBtreeTest.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/MultiThreadedInMemoryBtreeTest.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/MultiThreadedBtreeTest.java&r1=1551070&r2=1551319&rev=1551319&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/memory/MultiThreadedBtreeTest.java
(original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/MultiThreadedInMemoryBtreeTest.java
Mon Dec 16 19:18:36 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;
@@ -28,6 +28,7 @@ import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 
 import org.apache.directory.mavibot.btree.BTree;
+import org.apache.directory.mavibot.btree.InMemoryBTree;
 import org.apache.directory.mavibot.btree.Tuple;
 import org.apache.directory.mavibot.btree.TupleCursor;
 import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
@@ -43,7 +44,7 @@ import org.junit.Test;
  *  
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class MultiThreadedBtreeTest
+public class MultiThreadedInMemoryBtreeTest
 {
     /** The btree we use */
     private static BTree<Long, String> btree;

Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedReadTest.java
(from r1551070, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/ReadTest.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedReadTest.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedReadTest.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/ReadTest.java&r1=1551070&r2=1551319&rev=1551319&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/ReadTest.java
(original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedReadTest.java
Mon Dec 16 19:18:36 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;
@@ -27,8 +27,8 @@ import java.io.File;
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 
-import org.apache.directory.mavibot.btree.persisted.PageIO;
-import org.apache.directory.mavibot.btree.persisted.RecordManager;
+import org.apache.directory.mavibot.btree.PageIO;
+import org.apache.directory.mavibot.btree.RecordManager;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -39,7 +39,7 @@ import org.junit.rules.TemporaryFolder;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class ReadTest
+public class PersistedReadTest
 {
     @Rule
     public TemporaryFolder tempFolder = new TemporaryFolder();

Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedStoreTest.java
(from r1551070, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/StoreTest.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedStoreTest.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedStoreTest.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/StoreTest.java&r1=1551070&r2=1551319&rev=1551319&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/StoreTest.java
(original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/PersistedStoreTest.java
Mon Dec 16 19:18:36 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;
@@ -26,8 +26,8 @@ import java.io.File;
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 
-import org.apache.directory.mavibot.btree.persisted.PageIO;
-import org.apache.directory.mavibot.btree.persisted.RecordManager;
+import org.apache.directory.mavibot.btree.PageIO;
+import org.apache.directory.mavibot.btree.RecordManager;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -38,7 +38,7 @@ import org.junit.rules.TemporaryFolder;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class StoreTest
+public class PersistedStoreTest
 {
     @Rule
     public TemporaryFolder tempFolder = new TemporaryFolder();

Copied: directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerPrivateMethodTest.java
(from r1551070, directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/RecordManagerPrivateMethodTest.java)
URL: http://svn.apache.org/viewvc/directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerPrivateMethodTest.java?p2=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerPrivateMethodTest.java&p1=directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/RecordManagerPrivateMethodTest.java&r1=1551070&r2=1551319&rev=1551319&view=diff
==============================================================================
--- directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/persisted/RecordManagerPrivateMethodTest.java
(original)
+++ directory/mavibot/trunk/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerPrivateMethodTest.java
Mon Dec 16 19:18:36 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;
@@ -29,8 +29,8 @@ import java.lang.reflect.Method;
 import java.util.UUID;
 
 import org.apache.directory.mavibot.btree.BTree;
-import org.apache.directory.mavibot.btree.persisted.PageIO;
-import org.apache.directory.mavibot.btree.persisted.RecordManager;
+import org.apache.directory.mavibot.btree.PageIO;
+import org.apache.directory.mavibot.btree.RecordManager;
 import org.apache.directory.mavibot.btree.serializer.LongSerializer;
 import org.apache.directory.mavibot.btree.serializer.StringSerializer;
 import org.junit.After;
@@ -87,25 +87,25 @@ public class RecordManagerPrivateMethodT
         Method getFreePageIOsMethod = RecordManager.class.getDeclaredMethod( "getFreePageIOs",
int.class );
         getFreePageIOsMethod.setAccessible( true );
 
-        PageIO[] pages = ( PageIO[] ) getFreePageIOsMethod.invoke( recordManager, 0 );
+        PageIO[] pages = (org.apache.directory.mavibot.btree.PageIO[] ) getFreePageIOsMethod.invoke(
recordManager, 0 );
 
         assertEquals( 0, pages.length );
 
         for ( int i = 1; i < 20; i++ )
         {
-            pages = ( PageIO[] ) getFreePageIOsMethod.invoke( recordManager, i );
+            pages = (org.apache.directory.mavibot.btree.PageIO[] ) getFreePageIOsMethod.invoke(
recordManager, i );
             assertEquals( 1, pages.length );
         }
 
         for ( int i = 21; i < 44; i++ )
         {
-            pages = ( PageIO[] ) getFreePageIOsMethod.invoke( recordManager, i );
+            pages = (org.apache.directory.mavibot.btree.PageIO[] ) getFreePageIOsMethod.invoke(
recordManager, i );
             assertEquals( 2, pages.length );
         }
 
         for ( int i = 45; i < 68; i++ )
         {
-            pages = ( PageIO[] ) getFreePageIOsMethod.invoke( recordManager, i );
+            pages = (org.apache.directory.mavibot.btree.PageIO[] ) getFreePageIOsMethod.invoke(
recordManager, i );
             assertEquals( 3, pages.length );
         }
 

Modified: 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/memory/BTreeBuilderTest.java?rev=1551319&r1=1551318&r2=1551319&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/memory/BTreeBuilderTest.java
Mon Dec 16 19:18:36 2013
@@ -28,6 +28,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.directory.mavibot.btree.BTree;
+import org.apache.directory.mavibot.btree.InMemoryBTreeBuilder;
 import org.apache.directory.mavibot.btree.Tuple;
 import org.apache.directory.mavibot.btree.TupleCursor;
 import org.apache.directory.mavibot.btree.serializer.IntSerializer;

Modified: 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/persisted/BTreeDuplicateKeyTest.java?rev=1551319&r1=1551318&r2=1551319&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/persisted/BTreeDuplicateKeyTest.java
Mon Dec 16 19:18:36 2013
@@ -33,10 +33,10 @@ import java.util.NoSuchElementException;
 import java.util.UUID;
 
 import org.apache.directory.mavibot.btree.BTree;
+import org.apache.directory.mavibot.btree.PersistedBTree;
+import org.apache.directory.mavibot.btree.RecordManager;
 import org.apache.directory.mavibot.btree.Tuple;
 import org.apache.directory.mavibot.btree.TupleCursor;
-import org.apache.directory.mavibot.btree.persisted.PersistedBTree;
-import org.apache.directory.mavibot.btree.persisted.RecordManager;
 import org.apache.directory.mavibot.btree.serializer.IntSerializer;
 import org.apache.directory.mavibot.btree.serializer.LongSerializer;
 import org.apache.directory.mavibot.btree.serializer.StringSerializer;

Modified: 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/persisted/PersistedBTreeBrowseTest.java?rev=1551319&r1=1551318&r2=1551319&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/persisted/PersistedBTreeBrowseTest.java
Mon Dec 16 19:18:36 2013
@@ -32,11 +32,11 @@ import java.util.NoSuchElementException;
 import java.util.UUID;
 
 import org.apache.directory.mavibot.btree.BTree;
+import org.apache.directory.mavibot.btree.RecordManager;
 import org.apache.directory.mavibot.btree.Tuple;
 import org.apache.directory.mavibot.btree.TupleCursor;
 import org.apache.directory.mavibot.btree.exception.BTreeAlreadyManagedException;
 import org.apache.directory.mavibot.btree.exception.EndOfFileExceededException;
-import org.apache.directory.mavibot.btree.persisted.RecordManager;
 import org.apache.directory.mavibot.btree.serializer.LongSerializer;
 import org.apache.directory.mavibot.btree.serializer.StringSerializer;
 import org.junit.Before;

Modified: 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/persisted/PersistedBTreeBuilderTest.java?rev=1551319&r1=1551318&r2=1551319&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/persisted/PersistedBTreeBuilderTest.java
Mon Dec 16 19:18:36 2013
@@ -28,10 +28,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.directory.mavibot.btree.BTree;
+import org.apache.directory.mavibot.btree.PersistedBTreeBuilder;
+import org.apache.directory.mavibot.btree.RecordManager;
 import org.apache.directory.mavibot.btree.Tuple;
 import org.apache.directory.mavibot.btree.TupleCursor;
-import org.apache.directory.mavibot.btree.persisted.PersistedBTreeBuilder;
-import org.apache.directory.mavibot.btree.persisted.RecordManager;
 import org.apache.directory.mavibot.btree.serializer.IntSerializer;
 import org.junit.Test;
 

Modified: 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/persisted/RecordManagerFreePageTest.java?rev=1551319&r1=1551318&r2=1551319&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/persisted/RecordManagerFreePageTest.java
Mon Dec 16 19:18:36 2013
@@ -29,10 +29,10 @@ import java.util.Set;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.directory.mavibot.btree.BTree;
+import org.apache.directory.mavibot.btree.RecordManager;
 import org.apache.directory.mavibot.btree.Tuple;
 import org.apache.directory.mavibot.btree.TupleCursor;
 import org.apache.directory.mavibot.btree.exception.BTreeAlreadyManagedException;
-import org.apache.directory.mavibot.btree.persisted.RecordManager;
 import org.apache.directory.mavibot.btree.serializer.LongSerializer;
 import org.apache.directory.mavibot.btree.serializer.StringSerializer;
 import org.junit.Before;

Modified: 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/persisted/RecordManagerTest.java?rev=1551319&r1=1551318&r2=1551319&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/persisted/RecordManagerTest.java
Mon Dec 16 19:18:36 2013
@@ -35,13 +35,13 @@ import java.util.Set;
 import java.util.UUID;
 
 import org.apache.directory.mavibot.btree.BTree;
+import org.apache.directory.mavibot.btree.PersistedBTree;
+import org.apache.directory.mavibot.btree.RecordManager;
 import org.apache.directory.mavibot.btree.Tuple;
 import org.apache.directory.mavibot.btree.TupleCursor;
 import org.apache.directory.mavibot.btree.ValueCursor;
 import org.apache.directory.mavibot.btree.exception.BTreeAlreadyManagedException;
 import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
-import org.apache.directory.mavibot.btree.persisted.PersistedBTree;
-import org.apache.directory.mavibot.btree.persisted.RecordManager;
 import org.apache.directory.mavibot.btree.serializer.LongSerializer;
 import org.apache.directory.mavibot.btree.serializer.StringSerializer;
 import org.junit.Before;

Modified: 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/persisted/RecordManagerWithDuplicatesTest.java?rev=1551319&r1=1551318&r2=1551319&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/persisted/RecordManagerWithDuplicatesTest.java
Mon Dec 16 19:18:36 2013
@@ -30,9 +30,9 @@ import java.util.Set;
 import java.util.UUID;
 
 import org.apache.directory.mavibot.btree.BTree;
+import org.apache.directory.mavibot.btree.RecordManager;
 import org.apache.directory.mavibot.btree.exception.BTreeAlreadyManagedException;
 import org.apache.directory.mavibot.btree.exception.KeyNotFoundException;
-import org.apache.directory.mavibot.btree.persisted.RecordManager;
 import org.apache.directory.mavibot.btree.serializer.LongSerializer;
 import org.apache.directory.mavibot.btree.serializer.StringSerializer;
 import org.junit.Before;



Mime
View raw message