[cweb-CVS] bigdata-rdf/src/test/com/bigdata/rdf/metrics TestMetrics.java, 1.3, 1.4

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

Update of /cvsroot/cweb/bigdata-rdf/src/test/com/bigdata/rdf/metrics
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16595/src/test/com/bigdata/rdf/metrics

Modified Files:
	TestMetrics.java 
Log Message:
Fixed bug in overflow handling for triple store.
Added DataService UUID[] to partition metadata.

Index: TestMetrics.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/test/com/bigdata/rdf/metrics/TestMetrics.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMetrics.java	21 Feb 2007 20:16:44 -0000	1.3
--- TestMetrics.java	29 Mar 2007 17:01:47 -0000	1.4
***************
*** 62,65 ****
--- 62,66 ----
  import org.CognitiveWeb.util.PropertyUtil;
  
+ import com.bigdata.rawstore.Bytes;
  import com.bigdata.rdf.TripleStore.LoadStats;
  
***************
*** 340,343 ****
--- 341,347 ----
       * <dd>The total #of literals in the store or zero if not using the GOM
       * SAIL.</dd>
+      * <dt>totalMemory</dt>
+      * <dd>The total VM memory (in Megabytes) as reported by
+      * {@link Runtime#totalMemory()}.</dd>
       * <dt>error</dt>
       * <dd>This column is <code>Ok</code> if there was no error. Otherwise
***************
*** 355,365 ****
       * 
       * <pre>
!      *  triplesInStore    - #of triples in the repository
!      *  inferencesInStore - #of inferences in the repository
!      *  proofsInStore     - #of proofs in the repository.
!      *  urisInStore       - #of URIs in the repository.
!      *  bnodesInStore     - #of blank nodes in the repository.
!      *  literalsInStore   - #of literals in the repository.
!      *  sizeOnDisk        - #of bytes, MB, GB on disk for the repository.
       * </pre>
       * 
--- 359,369 ----
       * 
       * <pre>
!      *   triplesInStore    - #of triples in the repository
!      *   inferencesInStore - #of inferences in the repository
!      *   proofsInStore     - #of proofs in the repository.
!      *   urisInStore       - #of URIs in the repository.
!      *   bnodesInStore     - #of blank nodes in the repository.
!      *   literalsInStore   - #of literals in the repository.
!      *   sizeOnDisk        - #of bytes, MB, GB on disk for the repository.
       * </pre>
       * 
***************
*** 446,450 ****
          metricsWriter.write(""+t.bnodeCount1+", ");
          metricsWriter.write(""+t.literalCount1+", ");
!         
          // error
          metricsWriter.write(""+(t.error == null?"Ok":t.error.getMessage())+", ");
--- 450,456 ----
          metricsWriter.write(""+t.bnodeCount1+", ");
          metricsWriter.write(""+t.literalCount1+", ");
! 
!         // total VM memory (in MB).
!         metricsWriter.write(""+Runtime.getRuntime().totalMemory()/Bytes.megabyte+", ");
          // error
          metricsWriter.write(""+(t.error == null?"Ok":t.error.getMessage())+", ");
***************
*** 537,540 ****
--- 543,547 ----
          metricsWriter.write("bnodesInStore, ");
          metricsWriter.write("literalsInStore, ");
+         metricsWriter.write("totalMemory, ");
          metricsWriter.write("error, ");
          metricsWriter.write("filename\n");
***************
*** 1060,1066 ****
          }
          
!         testMetrics.loadFiles();
!         
!         testMetrics.tearDown();
          
      }
--- 1067,1079 ----
          }
          
!         try {
! 
!             testMetrics.loadFiles();
!             
!         } finally {
!             
!             testMetrics.tearDown();
!             
!         }
          
      }