[cweb-CVS] bigdata-rdf/src/test/com/bigdata/rdf/metrics TaskATest.java, 1.1, 1.2

[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-serv2483/src/test/com/bigdata/rdf/metrics

Modified Files:
	TaskATest.java 
Log Message:
Added a Sesame 1.x SAIL implementation.  This is NOT intended for production use.  It is just being done to gain a high-level query language integration for the triple store.

Index: TaskATest.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/test/com/bigdata/rdf/metrics/TaskATest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TaskATest.java	6 Feb 2007 23:06:44 -0000	1.1
--- TaskATest.java	12 Apr 2007 23:59:22 -0000	1.2
***************
*** 52,59 ****
--- 52,62 ----
  import java.io.IOException;
  import java.io.PrintWriter;
+ import java.nio.BufferOverflowException;
  
  import org.openrdf.sesame.admin.UpdateException;
  import org.openrdf.sesame.sail.RdfSchemaRepository;
  
+ import com.bigdata.rdf.TripleStore.LoadStats;
+ 
  /**
   * @todo update javadoc.
***************
*** 188,194 ****
  
          /*
!          * Load the data.
           */
!         long elapsedLoad = loadData();
          
      }
--- 191,197 ----
  
          /*
!          * Load the data. Sets some instance variables from various counters.
           */
!         loadData();
          
      }
***************
*** 265,269 ****
      
      /**
!      * Load each RDF source in turn and perform RDFS closure on the data.
       * 
       * @return The elasped time to load the data and perform closure.
--- 268,272 ----
      
      /**
!      * Load each RDF source in turn.
       * 
       * @return The elasped time to load the data and perform closure.
***************
*** 278,282 ****
          for(int i=0; i<filename.length; i++) {
           
!             store.loadData(new File(filename[i]), baseURI[i]);
              
          }
--- 281,285 ----
          for(int i=0; i<filename.length; i++) {
           
!             loadStats = store.loadData(new File(filename[i]), baseURI[i], true);
              
          }
***************
*** 289,292 ****
--- 292,300 ----
  
      }
+     
+     /**
+      * Set by {@link #loadData()}.
+      */
+     protected LoadStats loadStats;
  
      /**
***************
*** 418,421 ****
--- 426,431 ----
          }
  
+         LoadStats[] loadStats = new LoadStats[ all_sources.length ];
+ 
          for( int i=0, run=0; i<all_sources.length; i+=3, run++ ) {
              
***************
*** 435,438 ****
--- 445,449 ----
                      test.testFilesExist();
                      test.testOntology();
+                     loadStats[run] = test.loadStats;
  //                    test.testReadPerformance();
                      w.println( "SUCCESS" );
***************
*** 462,470 ****
          System.out.println( "\n\n\n"+nok+" out of "+nruns+" Ok.");
          
          for( int run=0; run<nruns; run++ ) {
              
!             System.out.println( all_sources[ run * 3 ]+ " : " +
                      ( errors[ run ] == null
!                       ? "Ok"
                        : errors[ run ].getMessage()
                        )
--- 473,486 ----
          System.out.println( "\n\n\n"+nok+" out of "+nruns+" Ok.");
          
+         System.out.println("name, status, triplesPerSecond, loadTime(s), commitTime(ms)");
+         
          for( int run=0; run<nruns; run++ ) {
              
!             System.out.println( all_sources[ run * 3 ]+ ", " +
                      ( errors[ run ] == null
!                       ? "Ok, "
!                             + loadStats[run].triplesPerSecond() + ", "
!                             + loadStats[run].loadTime / 1000 + ", "
!                             + loadStats[run].commitTime
                        : errors[ run ].getMessage()
                        )