Author: elecharny
Date: Sun Mar 3 18:37:26 2013
New Revision: 1452094
URL: http://svn.apache.org/r1452094
Log:
Fixed some compilation errors
Modified:
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/BTreeConfigurationTest.java
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/BTreeFlushTest.java
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/InMemoryBTreeTest.java
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/LeafTest.java
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/MultiThreadedBtreeTest.java
Modified:
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/BTreeConfigurationTest.java
URL:
http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/BTreeConfigurationTest.java?rev=1452094&r1=1452093&r2=1452094&view=diff
==============================================================================
---
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/BTreeConfigurationTest.java
(original)
+++
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/BTreeConfigurationTest.java
Sun Mar 3 18:37:26 2013
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertNot
import java.io.File;
import java.io.IOException;
+import org.apache.mavibot.btree.exception.KeyNotFoundException;
import org.apache.mavibot.btree.serializer.IntSerializer;
import org.apache.mavibot.btree.serializer.StringSerializer;
import org.junit.Test;
Modified:
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/BTreeFlushTest.java
URL:
http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/BTreeFlushTest.java?rev=1452094&r1=1452093&r2=1452094&view=diff
==============================================================================
---
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/BTreeFlushTest.java
(original)
+++
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/BTreeFlushTest.java
Sun Mar 3 18:37:26 2013
@@ -29,6 +29,7 @@ import java.io.IOException;
import java.util.Random;
import java.util.Set;
+import org.apache.mavibot.btree.exception.KeyNotFoundException;
import org.apache.mavibot.btree.serializer.IntSerializer;
import org.apache.mavibot.btree.serializer.LongSerializer;
import org.apache.mavibot.btree.serializer.StringSerializer;
@@ -126,7 +127,7 @@ public class BTreeFlushTest
long delta = l1;
int nbElems = 100000;
- BTree<Long, String> btree = new BTree<Long, String>( new
LongSerializer(), new StringSerializer() );
+ BTree<Long, String> btree = new BTree<Long, String>( "test", new
LongSerializer(), new StringSerializer() );
btree.setPageSize( 32 );
for ( int i = 0; i < nbElems; i++ )
@@ -232,7 +233,7 @@ public class BTreeFlushTest
try
{
- BTree<Integer, String> btree = new BTree<Integer, String>( path,
fileName, new IntSerializer(),
+ BTree<Integer, String> btree = new BTree<Integer, String>( "test",
path, fileName, new IntSerializer(),
new StringSerializer() );
btree.setPageSize( 8 );
@@ -254,7 +255,8 @@ public class BTreeFlushTest
assertEquals( 0, journal.length() );
// Load the data into a new tree
- BTree<Integer, String> btreeLoaded = new BTree<Integer, String>(
path, fileName, new IntSerializer(),
+ BTree<Integer, String> btreeLoaded = new BTree<Integer, String>(
"test", path, fileName,
+ new IntSerializer(),
new StringSerializer() );
btree.setPageSize( 8 );
@@ -294,6 +296,7 @@ public class BTreeFlushTest
{
File dataFile = new File( data100K );
BTree<Long, String> btree = new BTree<Long, String>(
+ "test",
dataFile.getParent(),
dataFile.getName(),
new LongSerializer(),
Modified:
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/InMemoryBTreeTest.java
URL:
http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/InMemoryBTreeTest.java?rev=1452094&r1=1452093&r2=1452094&view=diff
==============================================================================
---
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/InMemoryBTreeTest.java
(original)
+++
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/InMemoryBTreeTest.java
Sun Mar 3 18:37:26 2013
@@ -35,6 +35,7 @@ import java.util.List;
import java.util.Random;
import java.util.Set;
+import org.apache.mavibot.btree.exception.KeyNotFoundException;
import org.apache.mavibot.btree.serializer.IntSerializer;
import org.apache.mavibot.btree.serializer.LongSerializer;
import org.apache.mavibot.btree.serializer.StringSerializer;
@@ -166,7 +167,7 @@ public class InMemoryBTreeTest
for ( int j = 0; j < nbTrees; j++ )
{
- BTree<Long, String> btree = new BTree<Long, String>( new
LongSerializer(), new StringSerializer() );
+ BTree<Long, String> btree = new BTree<Long, String>( "test", new
LongSerializer(), new StringSerializer() );
btree.setPageSize( 32 );
for ( int i = 0; i < nbElems; i++ )
@@ -266,7 +267,7 @@ public class InMemoryBTreeTest
for ( int j = 0; j < nbTrees; j++ )
{
- BTree<Long, String> btree = new BTree<Long, String>( new
LongSerializer(), new StringSerializer() );
+ BTree<Long, String> btree = new BTree<Long, String>( "test", new
LongSerializer(), new StringSerializer() );
btree.setPageSize( 8 );
for ( int i = 0; i < nbElems; i++ )
@@ -379,7 +380,7 @@ public class InMemoryBTreeTest
368, 245, 1005, 226, 939, 320, 396, 437, 373, 61
};
- BTree<Long, String> btree = new BTree<Long, String>( new
LongSerializer(), new StringSerializer() );
+ BTree<Long, String> btree = new BTree<Long, String>( "test", new
LongSerializer(), new StringSerializer() );
btree.setPageSize( 8 );
for ( long value : values )
@@ -440,7 +441,7 @@ public class InMemoryBTreeTest
Random random = new Random( System.nanoTime() );
- BTree<Long, String> btree = new BTree<Long, String>( new
LongSerializer(), new StringSerializer() );
+ BTree<Long, String> btree = new BTree<Long, String>( "test", new
LongSerializer(), new StringSerializer() );
btree.setPageSize( 8 );
// Insert some values
@@ -496,7 +497,7 @@ public class InMemoryBTreeTest
@Ignore
public void testPageInsertDebug() throws Exception
{
- BTree<Long, String> btree = new BTree<Long, String>( new
LongSerializer(), new StringSerializer() );
+ BTree<Long, String> btree = new BTree<Long, String>( "test", new
LongSerializer(), new StringSerializer() );
btree.setPageSize( 4 );
Long[] elems = new Long[]
@@ -602,7 +603,7 @@ public class InMemoryBTreeTest
public void testBrowseForward() throws Exception
{
// Create a BTree with pages containing 8 elements
- BTree<Integer, String> btree = new BTree<Integer, String>( new
IntSerializer(), new StringSerializer() );
+ BTree<Integer, String> btree = new BTree<Integer, String>( "test", new
IntSerializer(), new StringSerializer() );
btree.setPageSize( 8 );
// Inject the values
@@ -686,7 +687,7 @@ public class InMemoryBTreeTest
public void testBrowseBackward() throws Exception
{
// Create a BTree with pages containing 8 elements
- BTree<Integer, String> btree = new BTree<Integer, String>( new
IntSerializer(), new StringSerializer() );
+ BTree<Integer, String> btree = new BTree<Integer, String>( "test", new
IntSerializer(), new StringSerializer() );
btree.setPageSize( 8 );
// Inject the values
@@ -761,7 +762,7 @@ public class InMemoryBTreeTest
public void testBrowseEmptyTree() throws Exception
{
// Create a BTree with pages containing 8 elements
- BTree<Integer, String> btree = new BTree<Integer, String>( new
IntSerializer(), new StringSerializer() );
+ BTree<Integer, String> btree = new BTree<Integer, String>( "test", new
IntSerializer(), new StringSerializer() );
btree.setPageSize( 8 );
Cursor<Integer, String> cursor = btree.browse();
@@ -781,7 +782,7 @@ public class InMemoryBTreeTest
public void testBrowseForwardBackward() throws Exception
{
// Create a BTree with pages containing 4 elements
- BTree<Integer, String> btree = new BTree<Integer, String>( new
IntSerializer(), new StringSerializer() );
+ BTree<Integer, String> btree = new BTree<Integer, String>( "test", new
IntSerializer(), new StringSerializer() );
btree.setPageSize( 4 );
for ( int i = 0; i < 16; i++ )
@@ -1041,7 +1042,7 @@ public class InMemoryBTreeTest
*/
private BTree<Integer, String> createTwoLevelBTreeFullLeaves() throws
IOException
{
- BTree<Integer, String> btree = new BTree<Integer, String>( new
IntSerializer(), new StringSerializer() );
+ BTree<Integer, String> btree = new BTree<Integer, String>( "test", new
IntSerializer(), new StringSerializer() );
btree.setPageSize( 4 );
// Create a tree with 5 children containing 4 elements each. The tree
is full.
@@ -1063,7 +1064,7 @@ public class InMemoryBTreeTest
*/
private BTree<Integer, String> createTwoLevelBTreeHalfFullLeaves() throws
IOException
{
- BTree<Integer, String> btree = new BTree<Integer, String>( new
IntSerializer(), new StringSerializer() );
+ BTree<Integer, String> btree = new BTree<Integer, String>( "test", new
IntSerializer(), new StringSerializer() );
btree.setPageSize( 4 );
// Create a tree with 5 children containing 4 elements each. The tree
is full.
@@ -1094,7 +1095,7 @@ public class InMemoryBTreeTest
// Create a BTree with pages containing 4 elements
int pageSize = 4;
- BTree<Integer, String> btree = new BTree<Integer, String>( new
IntSerializer(), new StringSerializer(),
+ BTree<Integer, String> btree = new BTree<Integer, String>( "test", new
IntSerializer(), new StringSerializer(),
pageSize );
Node<Integer, String> root = new Node<Integer, String>( btree, 1L,
pageSize );
@@ -1711,7 +1712,7 @@ public class InMemoryBTreeTest
long delta = System.currentTimeMillis();
// Create a BTree with 5 million entries
- BTree<Long, String> btree = new BTree<Long, String>( new
LongSerializer(), new StringSerializer() );
+ BTree<Long, String> btree = new BTree<Long, String>( "test", new
LongSerializer(), new StringSerializer() );
btree.setPageSize( 32 );
for ( int i = 0; i < nbElems; i++ )
Modified:
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/LeafTest.java
URL:
http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/LeafTest.java?rev=1452094&r1=1452093&r2=1452094&view=diff
==============================================================================
---
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/LeafTest.java
(original)
+++
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/LeafTest.java
Sun Mar 3 18:37:26 2013
@@ -26,6 +26,7 @@ import static org.junit.Assert.fail;
import java.io.IOException;
+import org.apache.mavibot.btree.exception.KeyNotFoundException;
import org.apache.mavibot.btree.serializer.LongSerializer;
import org.apache.mavibot.btree.serializer.StringSerializer;
import org.junit.After;
@@ -49,7 +50,7 @@ public class LeafTest
@Before
public void setup() throws IOException
{
- btree = new BTree<Long, String>( new LongSerializer(), new
StringSerializer() );
+ btree = new BTree<Long, String>( "test", new LongSerializer(), new
StringSerializer() );
btree.setPageSize( 8 );
}
Modified:
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/MultiThreadedBtreeTest.java
URL:
http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/MultiThreadedBtreeTest.java?rev=1452094&r1=1452093&r2=1452094&view=diff
==============================================================================
---
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/MultiThreadedBtreeTest.java
(original)
+++
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/MultiThreadedBtreeTest.java
Sun Mar 3 18:37:26 2013
@@ -27,6 +27,7 @@ import java.io.IOException;
import java.util.Random;
import java.util.concurrent.CountDownLatch;
+import org.apache.mavibot.btree.exception.KeyNotFoundException;
import org.apache.mavibot.btree.serializer.LongSerializer;
import org.apache.mavibot.btree.serializer.StringSerializer;
import org.junit.AfterClass;
@@ -52,7 +53,7 @@ public class MultiThreadedBtreeTest
@BeforeClass
public static void setup() throws IOException
{
- btree = new BTree<Long, String>( new LongSerializer(), new
StringSerializer() );
+ btree = new BTree<Long, String>( "test", new LongSerializer(), new
StringSerializer() );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
