Author: kayyagari
Date: Sun Mar 24 17:53:22 2013
New Revision: 1460420
URL: http://svn.apache.org/r1460420
Log:
o fixed an NPE
o added test class
Added:
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/BTreeBuilderTest.java
Modified:
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTreeBuilder.java
Modified:
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTreeBuilder.java
URL:
http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTreeBuilder.java?rev=1460420&r1=1460419&r2=1460420&view=diff
==============================================================================
---
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTreeBuilder.java
(original)
+++
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTreeBuilder.java
Sun Mar 24 17:53:22 2013
@@ -33,7 +33,6 @@ import java.util.Iterator;
import java.util.List;
import org.apache.mavibot.btree.serializer.ElementSerializer;
-import org.apache.mavibot.btree.serializer.IntSerializer;
/**
@@ -105,7 +104,7 @@ public class BTreeBuilder<K, V>
{
if ( lastLeaf.keys[i] == null )
{
- int n = i + 1;
+ int n = i;
lastLeaf.nbElems = n;
K[] keys = lastLeaf.keys;
@@ -170,7 +169,7 @@ public class BTreeBuilder<K, V>
{
if ( lastNode.keys[j] == null )
{
- int n = j + 1;
+ int n = j;
lastNode.nbElems = n;
K[] keys = lastNode.keys;
@@ -184,28 +183,4 @@ public class BTreeBuilder<K, V>
return attachNodes( lstNodes, btree );
}
-
-
- public static void main( String[] args ) throws IOException
- {
- List<Tuple<Integer, Integer>> sortedTuple = new
ArrayList<Tuple<Integer, Integer>>();
- for ( int i = 0; i < 8; i++ )
- {
- Tuple<Integer, Integer> t = new Tuple<Integer, Integer>( i, i );
- sortedTuple.add( t );
- }
-
- IntSerializer ser = new IntSerializer();
- BTreeBuilder<Integer, Integer> bb = new BTreeBuilder<Integer,
Integer>( "master", 4, ser, ser );
-
- BTree btree = bb.build( sortedTuple.iterator() );
-
- Cursor<Integer, Integer> cursor = btree.browse();
- while ( cursor.hasNext() )
- {
- Tuple<Integer, Integer> t = cursor.next();
- System.out.println( t );
- }
- cursor.close();
- }
}
Added:
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/BTreeBuilderTest.java
URL:
http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/BTreeBuilderTest.java?rev=1460420&view=auto
==============================================================================
---
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/BTreeBuilderTest.java
(added)
+++
labs/mavibot/trunk/mavibot/src/test/java/org/apache/mavibot/btree/BTreeBuilderTest.java
Sun Mar 24 17:53:22 2013
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.mavibot.btree;
+
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.mavibot.btree.serializer.IntSerializer;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+
+/**
+ * Test cases for BTreeBuilder.
+ *
+ * @author <a href="mailto:[email protected]";>Apache Directory
Project</a>
+ */
+public class BTreeBuilderTest
+{
+ @Test
+ public void testIntegerTree() throws IOException
+ {
+ List<Tuple<Integer, Integer>> sortedTuple = new
ArrayList<Tuple<Integer, Integer>>();
+ for ( int i = 1; i < 8; i++ )
+ {
+ Tuple<Integer, Integer> t = new Tuple<Integer, Integer>( i, i );
+ sortedTuple.add( t );
+ }
+
+ IntSerializer ser = new IntSerializer();
+ BTreeBuilder<Integer, Integer> bb = new BTreeBuilder<Integer,
Integer>( "master", 4, ser, ser );
+
+ // contains 1, 2, 3, 4, 5, 6, 7
+ BTree btree = bb.build( sortedTuple.iterator() );
+
+ assertEquals( 1, btree.rootPage.getNbElems() );
+
+ assertEquals( 7, btree.rootPage.findRightMost().getKey() );
+
+ assertEquals( 1, btree.rootPage.findLeftMost().getKey() );
+
+ Cursor<Integer, Integer> cursor = btree.browse();
+ int i = 0;
+ while ( cursor.hasNext() )
+ {
+ Tuple<Integer, Integer> expected = sortedTuple.get( i++ );
+ Tuple<Integer, Integer> actual = cursor.next();
+ assertEquals( expected.getKey(), actual.getKey() );
+ assertEquals( expected.getValue(), actual.getValue() );
+ }
+
+ cursor.close();
+ btree.close();
+ }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
