Author: elecharny
Date: Sat Jun 16 10:40:36 2012
New Revision: 1350906

URL: http://svn.apache.org/viewvc?rev=1350906&view=rev
Log:
Added toString methods to ease debugging

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/Leaf.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=1350906&r1=1350905&r2=1350906&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
 Sat Jun 16 10:40:36 2012
@@ -208,4 +208,28 @@ public class AbstractPage<K, V> implemen
 
         return newPage;
     }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    public long getRevision()
+    {
+        return revision;
+    }
+    
+    
+    /**
+     * @see Object#toString()
+     */
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( "r" ).append( revision );
+        sb.append( ", ID:" ).append( recordId );
+        sb.append( ", nbElems:" ).append( nbElems );
+        
+        return sb.toString();
+    }
 }

Modified: 
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Leaf.java
URL: 
http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Leaf.java?rev=1350906&r1=1350905&r2=1350906&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Leaf.java 
(original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Leaf.java 
Sat Jun 16 10:40:36 2012
@@ -284,4 +284,62 @@ public class Leaf<K, V> extends Abstract
         
         return result;
     }
+
+
+    /**
+     * @see Object#toString()
+     */
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( "Leaf[" );
+        sb.append( super.toString() );
+        sb.append( ", prev:" );
+        
+        if ( prevPage == null )
+        {
+            sb.append( "null" );
+        }
+        else
+        {
+            sb.append( prevPage.revision );
+        }
+        
+        sb.append( ", next:" );
+        
+        if ( nextPage == null )
+        {
+            sb.append( "null" );
+        }
+        else
+        {
+            sb.append( nextPage.revision );
+        }
+
+        sb.append ( "] -> {" );
+        
+        if ( nbElems > 0 )
+        {
+            boolean isFirst = true;
+            
+            for ( int i = 0; i < nbElems; i++ )
+            {
+                if ( isFirst )
+                {
+                    isFirst = false;
+                }
+                else
+                {
+                    sb.append( ", " );
+                }
+                
+                sb.append( "<" ).append( keys[i] ).append( "," ).append( 
values[i] ).append( ">" );
+            }
+        }
+        
+        sb.append( "}" );
+        
+        return sb.toString();
+    }
 }

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=1350906&r1=1350905&r2=1350906&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 
Sat Jun 16 10:40:36 2012
@@ -162,4 +162,40 @@ public class Node<K, V> extends Abstract
 
         return newPage;
     }
+
+
+    /**
+     * @see Object#toString()
+     */
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+        
+        sb.append( "Leaf[" );
+        sb.append( super.toString() );
+        sb.append ( "] -> {" );
+        
+        if ( nbElems > 0 )
+        {
+            boolean isFirst = true;
+            
+            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( "}" );
+        
+        return sb.toString();
+    }
 }

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=1350906&r1=1350905&r2=1350906&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 
Sat Jun 16 10:40:36 2012
@@ -53,4 +53,10 @@ public interface Page<K, V>
      * @return Either a modified Page or an Overflow element if the Page was 
full
      */
     InsertResult<K, V> insert( long revision, K key, V value );
+    
+    
+    /**
+     * @return the revision
+     */
+    long getRevision();
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to