directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1812791 - in /directory/mavibot/branches/single-value/mavibot/src: main/java/org/apache/directory/mavibot/btree/ test/java/org/apache/directory/mavibot/btree/
Date Fri, 20 Oct 2017 21:55:22 GMT
Author: elecharny
Date: Fri Oct 20 21:55:22 2017
New Revision: 1812791

URL: http://svn.apache.org/viewvc?rev=1812791&view=rev
Log:
o Removed the allowDuplicate flag from the RM.addBtree() method
o Remove some unused methods

Modified:
    directory/mavibot/branches/single-value/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java
    directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeBrowseTest.java
    directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeBuilderTest.java
    directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeTransactionTest.java
    directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BulkLoaderTest.java
    directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/PageReclaimerTest.java
    directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java
    directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerPrivateMethodTest.java
    directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java

Modified: directory/mavibot/branches/single-value/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java
URL: http://svn.apache.org/viewvc/directory/mavibot/branches/single-value/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java?rev=1812791&r1=1812790&r2=1812791&view=diff
==============================================================================
--- directory/mavibot/branches/single-value/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java
(original)
+++ directory/mavibot/branches/single-value/mavibot/src/main/java/org/apache/directory/mavibot/btree/RecordManager.java
Fri Oct 20 21:55:22 2017
@@ -26,7 +26,6 @@ import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.channels.FileChannel;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -1168,19 +1167,6 @@ public class RecordManager implements Tr
         return value;
     }
 
-    
-    private <K, V> BTreeInfo<K, V> createBtreeInfo( BTree<K, V> btree,
String name )
-    {
-        BTreeInfo<K,V> btreeInfo = new BTreeInfo<>();
-        
-        btreeInfo.setPageNbElem( btree.getPageNbElem() );
-        btreeInfo.setName( name );
-        btreeInfo.setKeySerializerFQCN( btree.getKeySerializerFQCN() );
-        btreeInfo.setValueSerializerFQCN( btree.getValueSerializerFQCN() );
-        
-        return btreeInfo;
-    }
-
 
     /**
      * Manage a B-tree. The btree will be added and managed by this RecordManager. We will
create a
@@ -1612,42 +1598,6 @@ public class RecordManager implements Tr
         return btreeHeaderPageIos;
     }
 
-    
-    /**
-     * Write the RootPage content.
-     * 
-     * @param btree The BTree we are working on
-     * @param btreeHeader The BtreeHeader for this BTree
-     * @return The offset of the rootPage
-     * @throws IOException If we have had an error while accessing to the underlying file
-     */
-    private <K, V> long writeRootPage( BTree<K, V> btree, BTreeHeader<K, V>
btreeHeader ) throws IOException
-    {
-        Page<K, V> rootPage = btreeHeader.getRootPage();
-
-        context.addPage( ((AbstractPage)rootPage).getOffset(), rootPage );
-        
-        return ((AbstractPage)rootPage).getOffset();
-
-        /*
-        PageIO[] rootPageIos = serializePage( btree, btreeHeader.getRevision(), rootPage
);
-
-        // Get the reference on the first page
-        long rootPageOffset = rootPageIos[0].getOffset();
-
-        // Store the rootPageOffset into the Btree header and into the rootPage
-        btreeHeader.setRootPageOffset( rootPageOffset );
-
-        ( ( AbstractPage<K, V> ) rootPage ).setOffset( rootPageOffset );
-
-        LOG.debug( "Flushing the newly managed '{}' btree rootpage", btree.getName() );
-        
-        // Store the PageIO and the rootPage
-        storePages( rootPageIos );
-        context.addPage( rootPageOffset, rootPage );
-        */
-    }
-
 
     /**
      * Update the B-tree header after a B-tree modification. This will make the latest modification
@@ -1879,29 +1829,6 @@ public class RecordManager implements Tr
     }
 
     
-    private void flushObjects( Transaction transaction, Collection<WALObject> walObjects
) throws IOException
-    {
-        if ( ( walObjects == null ) || walObjects.isEmpty() )
-        {
-            LOG.debug( "No Page to flush" );
-            return;
-        }
-        
-        if ( LOG.isDebugEnabled() )
-        {
-            //for ( Page page : pages )
-            {
-                //dump( page );
-            }
-        }
-
-        for ( WALObject walObject : walObjects )
-        {
-            // We can write pages immediately
-            flushPages( transaction.getRecordManagerHeader(), walObject.getPageIOs() );
-        }
-    }
-
     /**
      * Store  the pages in the context. If the page has no Offset, we will
      * use a virtual offset (ie, a negative one)
@@ -3287,13 +3214,12 @@ public class RecordManager implements Tr
      * @param name the name of the B-tree
      * @param keySerializer key serializer
      * @param valueSerializer value serializer
-     * @param allowDuplicates flag for allowing duplicate keys
      * @return a managed B-tree
      * @throws IOException If we weren't able to update the file on disk
      * @throws BTreeAlreadyManagedException If the B-tree is already managed
      */
     public <K, V> BTree<K, V> addBTree( WriteTransaction transaction, String
name, ElementSerializer<K> keySerializer,
-        ElementSerializer<V> valueSerializer, boolean allowDuplicates )
+        ElementSerializer<V> valueSerializer )
         throws IOException, BTreeAlreadyManagedException
     {
         BTreeConfiguration<K, V> config = new BTreeConfiguration<>();
@@ -3365,47 +3291,6 @@ public class RecordManager implements Tr
     }
 
 
-    /**
-     * Swap the current BtreeHeader map with the new one. This method will only
-     * be called in a single trhead, when the current transaction will be committed.
-     */
-    private void swapCurrentBtreeHeaders()
-    {
-        // Copy the reference to the current BtreeHeader Map
-        Map<String, BTreeHeader<?, ?>> tmp = currentBTreeHeaders;
-
-        // Get a write lock
-        btreeHeadersLock.writeLock().lock();
-
-        // Swap the new BTreeHeader Map
-        currentBTreeHeaders = newBTreeHeaders;
-
-        // And unlock 
-        btreeHeadersLock.writeLock().unlock();
-
-        // Last, not least, clear the Map and reinject the latest revision in it
-        tmp.clear();
-        tmp.putAll( currentBTreeHeaders );
-
-        // And update the new BTreeHeader map
-        newBTreeHeaders = tmp;
-    }
-
-
-    /**
-     * revert the new BTreeHeaders Map to the current BTreeHeader Map. This method
-     * is called when we have to rollback a transaction.
-     */
-    private void revertBtreeHeaders()
-    {
-        // Clean up teh new BTreeHeaders Map
-        newBTreeHeaders.clear();
-
-        // Reinject the latest revision in it
-        newBTreeHeaders.putAll( currentBTreeHeaders );
-    }
-
-
     private void checkFreePages() throws EndOfFileExceededException, IOException
     {
         RecordManagerHeader recordManagerHeader = recordManagerHeaderReference.get();

Modified: directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeBrowseTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeBrowseTest.java?rev=1812791&r1=1812790&r2=1812791&view=diff
==============================================================================
--- directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeBrowseTest.java
(original)
+++ directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeBrowseTest.java
Fri Oct 20 21:55:22 2017
@@ -78,10 +78,10 @@ public class BTreeBrowseTest
 
         openRecordManagerAndBtree();
 
-        // Create a new BTree which allows duplicate values
+        // Create a new BTree
         try ( WriteTransaction transaction = recordManager.beginWriteTransaction() )
         {
-            btree = recordManager.addBTree( transaction, "test", LongSerializer.INSTANCE,
StringSerializer.INSTANCE, true );
+            btree = recordManager.addBTree( transaction, "test", LongSerializer.INSTANCE,
StringSerializer.INSTANCE );
         }
         catch ( Exception e )
         {
@@ -652,7 +652,7 @@ public class BTreeBrowseTest
     public void testAddRandom() throws Exception
     {
         // Inject some data
-        long increment = 20L;
+        long increment = 1_000L;
         long nbRound = 100_000L;
         long t0 = System.currentTimeMillis();
 
@@ -684,7 +684,7 @@ public class BTreeBrowseTest
         
         System.out.println( "Delta for " + nbRound + " : " + ( t1 - t0 ) );
         
-        MavibotInspector.check( recordManager );
+        //MavibotInspector.check( recordManager );
 
         int counter = 0;
 
@@ -705,6 +705,8 @@ public class BTreeBrowseTest
         // Now delete the elements
         shuffle( values );
         
+        long tt0 = System.currentTimeMillis();
+
         increment = 1L;
         
         for ( long i = 0; i < nbRound/increment; i++ )
@@ -723,6 +725,10 @@ public class BTreeBrowseTest
                 }
             }
         }
+
+        long tt1 = System.currentTimeMillis();
+        
+        System.out.println( "Delta for " + nbRound + " : " + ( tt1 - tt0 ) );
     }
     
     

Modified: directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeBuilderTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeBuilderTest.java?rev=1812791&r1=1812790&r2=1812791&view=diff
==============================================================================
--- directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeBuilderTest.java
(original)
+++ directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeBuilderTest.java
Fri Oct 20 21:55:22 2017
@@ -74,7 +74,7 @@ public class BTreeBuilderTest
             
             try ( WriteTransaction writeTxn = rm.beginWriteTransaction() )
             {
-                btree = rm.addBTree( writeTxn, "master", IntSerializer.INSTANCE, IntSerializer.INSTANCE,
true );
+                btree = rm.addBTree( writeTxn, "master", IntSerializer.INSTANCE, IntSerializer.INSTANCE
);
             }
 
             MavibotInspector.dumpInfos( rm, rm.getCurrentRecordManagerHeader() );

Modified: directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeTransactionTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeTransactionTest.java?rev=1812791&r1=1812790&r2=1812791&view=diff
==============================================================================
--- directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeTransactionTest.java
(original)
+++ directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BTreeTransactionTest.java
Fri Oct 20 21:55:22 2017
@@ -57,7 +57,7 @@ public class BTreeTransactionTest
         try ( WriteTransaction writeTransaction = recordManager.beginWriteTransaction() )
         {
             // Create a new BTree with transaction and another one without
-            btree = recordManager.addBTree( writeTransaction, "testWithTxn", LongSerializer.INSTANCE,
StringSerializer.INSTANCE, false );
+            btree = recordManager.addBTree( writeTransaction, "testWithTxn", LongSerializer.INSTANCE,
StringSerializer.INSTANCE );
         }
         catch ( Exception e )
         {

Modified: directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BulkLoaderTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BulkLoaderTest.java?rev=1812791&r1=1812790&r2=1812791&view=diff
==============================================================================
--- directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BulkLoaderTest.java
(original)
+++ directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/BulkLoaderTest.java
Fri Oct 20 21:55:22 2017
@@ -60,19 +60,22 @@ public class BulkLoaderTest
     {
         assertEquals( oldBtree.getNbElems(), newBtree.getNbElems() );
 
-        TupleCursor<Long, String> cursorOld = oldBtree.browse();
-        TupleCursor<Long, String> cursorNew = newBtree.browse();
-
-        while ( cursorOld.hasNext() && cursorNew.hasNext() )
+        try ( Transaction transaction = oldBtree.getRecordManager().beginReadTransaction()
)
         {
-            Tuple<Long, String> tupleOld = cursorOld.next();
-            Tuple<Long, String> tupleNew = cursorNew.next();
+            TupleCursor<Long, String> cursorOld = oldBtree.browse( transaction );
+            TupleCursor<Long, String> cursorNew = newBtree.browse( transaction );
 
-            assertEquals( tupleOld.getKey(), tupleNew.getKey() );
-            assertEquals( tupleOld.getValue(), tupleNew.getValue() );
-        }
+            while ( cursorOld.hasNext() && cursorNew.hasNext() )
+            {
+                Tuple<Long, String> tupleOld = cursorOld.next();
+                Tuple<Long, String> tupleNew = cursorNew.next();
+    
+                assertEquals( tupleOld.getKey(), tupleNew.getKey() );
+                assertEquals( tupleOld.getValue(), tupleNew.getValue() );
+            }
 
-        assertEquals( cursorOld.hasNext(), cursorNew.hasNext() );
+            assertEquals( cursorOld.hasNext(), cursorNew.hasNext() );
+        } 
     }
 
 
@@ -81,10 +84,10 @@ public class BulkLoaderTest
      * @throws BTreeAlreadyManagedException 
      */
     @Test
-    public void testPersistedBulkLoad1000Elements() throws IOException, KeyNotFoundException,
+    public void testBulkLoad1000Elements() throws IOException, KeyNotFoundException,
         BTreeAlreadyManagedException, CursorException
     {
-        for ( int i = 1000000; i < 1000001; i++ )
+        for ( int i = 0; i < 1000001; i++ )
         {
             Random random = new Random( System.currentTimeMillis() );
             File file = File.createTempFile( "managedbtreebuilder", ".data" );
@@ -93,103 +96,107 @@ public class BulkLoaderTest
             try
             {
                 RecordManager rm = new RecordManager( file.getAbsolutePath() );
-                BTree<Long, String> btree = ( BTree<Long, String> ) rm.addBTree(
"test",
-                    LongSerializer.INSTANCE, StringSerializer.INSTANCE, false );
-                btree.setPageSize( 64 );
-
-                int nbElems = i;
-                int addedElems = 0;
-
-                final Tuple<Long, String>[] elems = new Tuple[nbElems];
-                Map<Long, Tuple<Long, Set<String>>> expected = new HashMap<Long,
Tuple<Long, Set<String>>>();
-
-                long t00 = System.currentTimeMillis();
-
-                while ( addedElems < nbElems )
+                
+                try ( WriteTransaction writeTransaction = rm.beginWriteTransaction() )
                 {
-                    long key = random.nextLong() % 3333333L;
-
-                    if ( expected.containsKey( key ) )
-                    {
-                        continue;
-                    }
-
-                    long w = random.nextLong() % 3333333L;
-                    String value = "V" + w;
-                    elems[addedElems] = new Tuple<Long, String>( key, value );
-
-                    Tuple<Long, Set<String>> expectedTuple = expected.get( key
);
-
-                    if ( expectedTuple == null )
-                    {
-                        expectedTuple = new Tuple<Long, Set<String>>( key, new
TreeSet<String>() );
-                    }
-
-                    expectedTuple.value.add( value );
-                    expected.put( key, expectedTuple );
-                    addedElems++;
-                }
-
-                long t01 = System.currentTimeMillis();
-
-                // System.out.println( "Time to create the " + nbElems + " elements " + (
( t01 - t00 ) / 1 ) );
-
-                Iterator<Tuple<Long, String>> tupleIterator = new Iterator<Tuple<Long,
String>>()
-                {
-                    private int pos = 0;
-
-
-                    @Override
-                    public Tuple<Long, String> next()
-                    {
-                        return elems[pos++];
-                    }
-
-
-                    @Override
-                    public boolean hasNext()
-                    {
-                        return pos < elems.length;
-                    }
-
-
-                    @Override
-                    public void remove()
+                    BTree<Long, String> btree = ( BTree<Long, String> ) rm.addBTree(
writeTransaction, "test",
+                        LongSerializer.INSTANCE, StringSerializer.INSTANCE );
+                    btree.setPageNbElem( 64 );
+    
+                    int nbElems = i;
+                    int addedElems = 0;
+    
+                    final Tuple<Long, String>[] elems = new Tuple[nbElems];
+                    Map<Long, Tuple<Long, Set<String>>> expected = new
HashMap<>();
+    
+                    long t00 = System.currentTimeMillis();
+    
+                    while ( addedElems < nbElems )
+                    {
+                        long key = random.nextLong() % 3333333L;
+    
+                        if ( expected.containsKey( key ) )
+                        {
+                            continue;
+                        }
+    
+                        long w = random.nextLong() % 3333333L;
+                        String value = "V" + w;
+                        elems[addedElems] = new Tuple<Long, String>( key, value );
+    
+                        Tuple<Long, Set<String>> expectedTuple = expected.get(
key );
+    
+                        if ( expectedTuple == null )
+                        {
+                            expectedTuple = new Tuple<Long, Set<String>>( key,
new TreeSet<String>() );
+                        }
+    
+                        expectedTuple.value.add( value );
+                        expected.put( key, expectedTuple );
+                        addedElems++;
+                    }
+    
+                    long t01 = System.currentTimeMillis();
+    
+                    // System.out.println( "Time to create the " + nbElems + " elements "
+ ( ( t01 - t00 ) / 1 ) );
+    
+                    Iterator<Tuple<Long, String>> tupleIterator = new Iterator<Tuple<Long,
String>>()
+                    {
+                        private int pos = 0;
+    
+    
+                        @Override
+                        public Tuple<Long, String> next()
+                        {
+                            return elems[pos++];
+                        }
+    
+    
+                        @Override
+                        public boolean hasNext()
+                        {
+                            return pos < elems.length;
+                        }
+    
+    
+                        @Override
+                        public void remove()
+                        {
+                        }
+                    };
+    
+                    long t0 = System.currentTimeMillis();
+                    BTree<Long, String> result = BulkLoader.load( btree, tupleIterator,
1024000 );
+                    long t1 = System.currentTimeMillis();
+    
+                    if ( ( i % 100 ) == 0 )
+                    {
+                        System.out.println( "== Btree #" + i + ", Time to bulkoad the " +
nbElems + " elements "
+                            + ( t1 - t0 ) + "ms" );
+                    }
+    
+                    TupleCursor<Long, String> cursor = result.browse( writeTransaction
);
+                    int nbFetched = 0;
+    
+                    long t2 = System.currentTimeMillis();
+    
+                    while ( cursor.hasNext() )
                     {
+                        Tuple<Long, String> elem = cursor.next();
+    
+                        assertTrue( expected.containsKey( elem.key ) );
+                        Tuple<Long, Set<String>> tuple = expected.get( elem.key
);
+                        assertNotNull( tuple );
+                        nbFetched++;
                     }
-                };
-
-                long t0 = System.currentTimeMillis();
-                BTree<Long, String> result = BulkLoader.load( btree, tupleIterator,
1024000 );
-                long t1 = System.currentTimeMillis();
-
-                if ( ( i % 100 ) == 0 )
-                {
-                    System.out.println( "== Btree #" + i + ", Time to bulkoad the " + nbElems
+ " elements "
-                        + ( t1 - t0 ) + "ms" );
+    
+                    long t3 = System.currentTimeMillis();
+    
+                    //System.out.println( "Time to read the " + nbElems + " elements " +
( t3 - t2 ) );
+                    assertEquals( nbElems, nbFetched );
+    
+                    checkBtree( btree, result );
                 }
-
-                TupleCursor<Long, String> cursor = result.browse();
-                int nbFetched = 0;
-
-                long t2 = System.currentTimeMillis();
-
-                while ( cursor.hasNext() )
-                {
-                    Tuple<Long, String> elem = cursor.next();
-
-                    assertTrue( expected.containsKey( elem.key ) );
-                    Tuple<Long, Set<String>> tuple = expected.get( elem.key );
-                    assertNotNull( tuple );
-                    nbFetched++;
-                }
-
-                long t3 = System.currentTimeMillis();
-
-                //System.out.println( "Time to read the " + nbElems + " elements " + ( t3
- t2 ) );
-                assertEquals( nbElems, nbFetched );
-
-                checkBtree( btree, result );
             }
             finally
             {
@@ -214,7 +221,7 @@ public class BulkLoaderTest
         {
             RecordManager rm = new RecordManager( file.getAbsolutePath() );
             BTree<Long, String> btree = ( BTree<Long, String> ) rm.addBTree(
"test",
-                LongSerializer.INSTANCE, StringSerializer.INSTANCE, false );
+                LongSerializer.INSTANCE, StringSerializer.INSTANCE );
 
             int[] expectedNbPages = new int[]
                 {
@@ -271,7 +278,7 @@ public class BulkLoaderTest
         {
             RecordManager rm = new RecordManager( file.getAbsolutePath() );
             BTree<Long, String> btree = ( BTree<Long, String> ) rm.addBTree(
"test",
-                LongSerializer.INSTANCE, StringSerializer.INSTANCE, false );
+                LongSerializer.INSTANCE, StringSerializer.INSTANCE );
 
             int[] expectedNbPages = new int[]
                 {
@@ -326,7 +333,7 @@ public class BulkLoaderTest
         {
             RecordManager rm = new RecordManager( file.getAbsolutePath() );
             BTree<Long, String> btree = ( BTree<Long, String> ) rm.addBTree(
"test",
-                LongSerializer.INSTANCE, StringSerializer.INSTANCE, false );
+                LongSerializer.INSTANCE, StringSerializer.INSTANCE );
 
             int[] expectedNbPages = new int[]
                 {
@@ -381,7 +388,7 @@ public class BulkLoaderTest
             {
                 RecordManager rm = new RecordManager( file.getAbsolutePath() );
                 BTree<Long, String> btree = ( BTree<Long, String> ) rm.addBTree(
"test",
-                    LongSerializer.INSTANCE, StringSerializer.INSTANCE, false );
+                    LongSerializer.INSTANCE, StringSerializer.INSTANCE );
 
                 int nbElems = i;
                 int addedElems = 0;
@@ -513,7 +520,7 @@ public class BulkLoaderTest
         {
             RecordManager rm = new RecordManager( file.getAbsolutePath() );
             BTree<Long, String> btree = ( BTree<Long, String> ) rm.addBTree(
"test",
-                LongSerializer.INSTANCE, StringSerializer.INSTANCE, false );
+                LongSerializer.INSTANCE, StringSerializer.INSTANCE );
 
             int nbElems = 4;
             int addedElems = 0;
@@ -915,7 +922,7 @@ public class BulkLoaderTest
         {
             RecordManager rm = new RecordManager( file.getAbsolutePath() );
             BTree<Long, String> btree = ( BTree<Long, String> ) rm.addBTree(
"test",
-                LongSerializer.INSTANCE, StringSerializer.INSTANCE, false );
+                LongSerializer.INSTANCE, StringSerializer.INSTANCE );
 
             // btree.valueThresholdUp = 8;
 

Modified: directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/PageReclaimerTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/PageReclaimerTest.java?rev=1812791&r1=1812790&r2=1812791&view=diff
==============================================================================
--- directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/PageReclaimerTest.java
(original)
+++ directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/PageReclaimerTest.java
Fri Oct 20 21:55:22 2017
@@ -74,7 +74,7 @@ public class PageReclaimerTest
         rm = new RecordManager( dbFile.getAbsolutePath() );
         rm.setPageReclaimerThreshold( 10 );
         
-        uidTree = ( BTree<Integer, String> ) rm.addBTree( TREE_NAME, IntSerializer.INSTANCE,
StringSerializer.INSTANCE, false );
+        uidTree = ( BTree<Integer, String> ) rm.addBTree( TREE_NAME, IntSerializer.INSTANCE,
StringSerializer.INSTANCE );
     }
 
 

Modified: directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java?rev=1812791&r1=1812790&r2=1812791&view=diff
==============================================================================
--- directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java
(original)
+++ directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerFreePageTest.java
Fri Oct 20 21:55:22 2017
@@ -69,7 +69,7 @@ public class RecordManagerFreePageTest
         try
         {
             // Create a new BTree
-            btree = recordManager1.addBTree( "test", LongSerializer.INSTANCE, StringSerializer.INSTANCE,
false );
+            btree = recordManager1.addBTree( "test", LongSerializer.INSTANCE, StringSerializer.INSTANCE
);
         }
         catch ( Exception e )
         {

Modified: directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerPrivateMethodTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerPrivateMethodTest.java?rev=1812791&r1=1812790&r2=1812791&view=diff
==============================================================================
--- directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerPrivateMethodTest.java
(original)
+++ directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerPrivateMethodTest.java
Fri Oct 20 21:55:22 2017
@@ -67,7 +67,7 @@ public class RecordManagerPrivateMethodT
         // Create a new BTree
         try ( WriteTransaction writeTransaction = recordManager.beginWriteTransaction() )
         { 
-            btree = recordManager.addBTree( writeTransaction, "test", LongSerializer.INSTANCE,
StringSerializer.INSTANCE, false );
+            btree = recordManager.addBTree( writeTransaction, "test", LongSerializer.INSTANCE,
StringSerializer.INSTANCE );
         }
     }
 

Modified: directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java
URL: http://svn.apache.org/viewvc/directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java?rev=1812791&r1=1812790&r2=1812791&view=diff
==============================================================================
--- directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java
(original)
+++ directory/mavibot/branches/single-value/mavibot/src/test/java/org/apache/directory/mavibot/btree/RecordManagerTest.java
Fri Oct 20 21:55:22 2017
@@ -74,7 +74,7 @@ public class RecordManagerTest
         try ( WriteTransaction writeTransaction = recordManager.beginWriteTransaction() )
         {
             // Create a new BTree
-            btree = recordManager.addBTree( writeTransaction, "test", LongSerializer.INSTANCE,
StringSerializer.INSTANCE, false );
+            btree = recordManager.addBTree( writeTransaction, "test", LongSerializer.INSTANCE,
StringSerializer.INSTANCE );
         }
         catch ( Exception e )
         {



Mime
View raw message