[cweb-CVS] bigdata/src/java/com/bigdata/objndx Counters.java, 1.4, 1.5 AbstractBTree.java, 1.21, 1.22

[Bryan T. <tho...@us...>]

Update of /cvsroot/cweb/bigdata/src/java/com/bigdata/objndx
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv11927/src/java/com/bigdata/objndx

Modified Files:
	Counters.java AbstractBTree.java 
Log Message:
Updated the benchmark for sustained IO, raw journal write rates, and both unisolated and isolated index write rates.

Index: AbstractBTree.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/objndx/AbstractBTree.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** AbstractBTree.java	27 Mar 2007 14:34:22 -0000	1.21
--- AbstractBTree.java	4 Apr 2007 16:52:16 -0000	1.22
***************
*** 137,141 ****
       * Counters tracking various aspects of the btree.
       */
!     protected final Counters counters = new Counters(this);
  
      /**
--- 137,141 ----
       * Counters tracking various aspects of the btree.
       */
!     /*protected*/ public final Counters counters = new Counters(this);
  
      /**

Index: Counters.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/objndx/Counters.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Counters.java	6 Feb 2007 23:07:18 -0000	1.4
--- Counters.java	4 Apr 2007 16:52:16 -0000	1.5
***************
*** 8,16 ****
   * 
   * @todo add nano timers and track storage used by the index. The goal is to
!  *       know how much of the time of the server is consumed by the index,
!  *       what percentage of the store is dedicated to the index, how
!  *       expensive it is to do some scan-based operations (merge down,
!  *       delete of transactional isolated persistent index), and evaluate
!  *       the buffer strategy by comparing accesses with IOs.
   */
  public class Counters {
--- 8,18 ----
   * 
   * @todo add nano timers and track storage used by the index. The goal is to
!  *       know how much of the time of the server is consumed by the index, what
!  *       percentage of the store is dedicated to the index, how expensive it is
!  *       to do some scan-based operations (merge down, delete of transactional
!  *       isolated persistent index), and evaluate the buffer strategy by
!  *       comparing accesses with IOs.
!  * 
!  * @todo expose more of the counters using property access methods.
   */
  public class Counters {
***************
*** 47,50 ****
--- 49,88 ----
      long bytesRead = 0L;
      long bytesWritten = 0L;
+     
+     /**
+      * The #of nodes written on the backing store.
+      */
+     final public int getNodesWritten() {
+         
+         return nodesWritten;
+         
+     }
+     
+     /**
+      * The #of leaves written on the backing store.
+      */
+     final public int getLeavesWritten() {
+         
+         return leavesWritten;
+         
+     }
+     
+     /**
+      * The number of bytes read from the backing store.
+      */
+     final public long getBytesRead() {
+         
+         return bytesRead;
+         
+     }
+     
+     /**
+      * The number of bytes written onto the backing store.
+      */
+     final public long getBytesWritten() {
+         
+         return bytesWritten;
+         
+     }
  
      // @todo consider changing to logging so that the format will be nicer