[cweb-CVS] bigdata-rdf/src/test/com/bigdata/rdf/rio TestRioIntegration.java, 1.18, 1.19

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

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

Modified Files:
	TestRioIntegration.java 
Log Message:
testing SAIL and lubm, including adding BTree#removeAll(), touching up some inferences, making it possible to load different RDF interchange formats, and adding JOIN ordering based on the sesame optimizer and the actual triple pattern selectivity in the data.

Index: TestRioIntegration.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/test/com/bigdata/rdf/rio/TestRioIntegration.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** TestRioIntegration.java	15 Mar 2007 16:11:54 -0000	1.18
--- TestRioIntegration.java	18 Apr 2007 17:29:08 -0000	1.19
***************
*** 50,53 ****
--- 50,55 ----
  import java.io.Reader;
  
+ import org.openrdf.sesame.constants.RDFFormat;
+ 
  import com.bigdata.journal.BufferMode;
  import com.bigdata.rawstore.Bytes;
***************
*** 189,193 ****
                  
                  // @todo no baseURI here.
!                 loader.loadRdfXml( reader, "" );
                  
                  long nstmts = loader.getStatementsAdded();
--- 191,195 ----
                  
                  // @todo no baseURI here.
!                 loader.loadRdf( reader, "" );
                  
                  long nstmts = loader.getStatementsAdded();
***************
*** 243,248 ****
      public void test_loadFile_presortRioLoader() throws IOException {
  
!         doTest(new PresortRioLoader(store,
!                 PresortRioLoader.DEFAULT_BUFFER_SIZE, true), testData);
  
          assertDataLoaded();
--- 245,249 ----
      public void test_loadFile_presortRioLoader() throws IOException {
  
!         doTest(new PresortRioLoader(store), testData);
  
          assertDataLoaded();
***************
*** 254,259 ****
          String[] testData = new String[]{"data/wikipedia/enwiki/20060306.rdf"};
          
!         doTest(new PresortRioLoader(store,
!                 PresortRioLoader.DEFAULT_BUFFER_SIZE, true), testData);
          
  
--- 255,259 ----
          String[] testData = new String[]{"data/wikipedia/enwiki/20060306.rdf"};
          
!         doTest(new PresortRioLoader(store), testData);