Author: elecharny
Date: Mon Jun 18 11:16:48 2012
New Revision: 1351298
URL: http://svn.apache.org/viewvc?rev=1351298&view=rev
Log:
o Rename the recordId to id, added getId()/setId() methods
o Fixed a ClassCastException in Node
o Improved the toString() methods
Modified:
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/AbstractPage.java
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Node.java
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Page.java
Modified:
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/AbstractPage.java
URL:
http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/AbstractPage.java?rev=1351298&r1=1351297&r2=1351298&view=diff
==============================================================================
---
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/AbstractPage.java
(original)
+++
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/AbstractPage.java
Mon Jun 18 11:16:48 2012
@@ -36,8 +36,8 @@ public class AbstractPage<K, V> implemen
/** This BPage's revision */
protected long revision;
- /** This BPage's record ID in the PageManager. */
- protected long recordId;
+ /** This BPage's ID in the PageManager. */
+ protected long id;
/** Keys of children nodes */
protected K[] keys;
@@ -67,7 +67,7 @@ public class AbstractPage<K, V> implemen
this.revision = revision;
this.nbElems = nbElems;
this.keys = (K[])new Object[nbElems];
- recordId = btree.generateRecordId();
+ id = btree.generateRecordId();
}
@@ -217,6 +217,24 @@ public class AbstractPage<K, V> implemen
{
return revision;
}
+
+
+ /**
+ * @return the id
+ */
+ public long getId()
+ {
+ return id;
+ }
+
+
+ /**
+ * @param id the id to set
+ */
+ public void setId( long id )
+ {
+ this.id = id;
+ }
/**
@@ -227,7 +245,7 @@ public class AbstractPage<K, V> implemen
StringBuilder sb = new StringBuilder();
sb.append( "r" ).append( revision );
- sb.append( ", ID:" ).append( recordId );
+ sb.append( ", ID:" ).append( id );
sb.append( ", nbElems:" ).append( nbElems );
return sb.toString();
Modified:
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java
URL:
http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java?rev=1351298&r1=1351297&r2=1351298&view=diff
==============================================================================
---
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java
(original)
+++
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java
Mon Jun 18 11:16:48 2012
@@ -293,7 +293,7 @@ public class BTree<K, V>
StringBuilder sb = new StringBuilder();
sb.append( "BTree" );
- sb.append( ", pageSize:" ).append( pageSize );
+ sb.append( "( pageSize:" ).append( pageSize );
if ( rootPage != null )
{
Modified:
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Node.java
URL:
http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Node.java?rev=1351298&r1=1351297&r2=1351298&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Node.java
(original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Node.java
Mon Jun 18 11:16:48 2012
@@ -50,7 +50,7 @@ public class Node<K, V> extends Abstract
super( btree, revision, nbElems );
// Create the children array, and store the left and right children
- children = (Page<K, V>[])new Object[btree.getPageSize()];
+ children = new Page[btree.getPageSize()];
}
@@ -70,7 +70,7 @@ public class Node<K, V> extends Abstract
super( btree, revision, 1 );
// Create the children array, and store the left and right children
- children = (Page<K, V>[])new Object[btree.getPageSize()];
+ children = new Page[btree.getPageSize()];
children[0] = leftPage;
children[1] = rightPage;
@@ -171,26 +171,19 @@ public class Node<K, V> extends Abstract
{
StringBuilder sb = new StringBuilder();
- sb.append( "Leaf[" );
+ sb.append( "Node[" );
sb.append( super.toString() );
sb.append ( "] -> {" );
if ( nbElems > 0 )
{
- boolean isFirst = true;
+ // Start with the first child
+ sb.append( children[0].getId() ).append( "-r" ).append(
children[0].getRevision() );
for ( int i = 0; i < nbElems; i++ )
{
- if ( isFirst )
- {
- isFirst = false;
- }
- else
- {
- sb.append( ", " );
- }
-
- sb.append( "<" ).append( keys[i] ).append( ",r" ).append(
children[i].getRevision() ).append( ">" );
+ sb.append( "|<" ).append( keys[i] ).append( ">|" ).
+ append( children[i + 1].getId() ).append( "-r" ).append(
children[i + 1].getRevision() );
}
}
Modified:
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Page.java
URL:
http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Page.java?rev=1351298&r1=1351297&r2=1351298&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Page.java
(original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Page.java
Mon Jun 18 11:16:48 2012
@@ -59,4 +59,10 @@ public interface Page<K, V>
* @return the revision
*/
long getRevision();
+
+
+ /**
+ * @return the id
+ */
+ long getId();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
