[cweb-CVS] bigdata-rdf/src/test/com/bigdata/rdf/inf TestMagicSets.java, 1.6, 1.7

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

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

Modified Files:
	TestMagicSets.java 
Log Message:
Added indexUUID to AbstractBTree so that each scale-out index may have a unique indentifier.
Modified the BTreeMetadata class and derived classes to use Externalizable, to support explicit versioning of the metadata record, and to have private fields since they can not be final with Externalizable.

Index: TestMagicSets.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/test/com/bigdata/rdf/inf/TestMagicSets.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestMagicSets.java	22 Feb 2007 16:58:58 -0000	1.6
--- TestMagicSets.java	27 Mar 2007 14:35:08 -0000	1.7
***************
*** 55,58 ****
--- 55,59 ----
  import org.openrdf.vocabulary.RDFS;
  
+ import com.bigdata.rdf.model.OptimizedValueFactory._URI;
  import com.bigdata.rdf.TempTripleStore;
  import com.bigdata.rdf.TripleStore;
***************
*** 187,201 ****
           * setup the database.
           */
!         URI x = new URIImpl("http://www.foo.org/x");
!         URI y = new URIImpl("http://www.foo.org/y");
!         URI z = new URIImpl("http://www.foo.org/z");
  
!         URI A = new URIImpl("http://www.foo.org/A");
!         URI B = new URIImpl("http://www.foo.org/B");
!         URI C = new URIImpl("http://www.foo.org/C");
  
!         URI rdfType = new URIImpl(RDF.TYPE);
  
!         URI rdfsSubClassOf = new URIImpl(RDFS.SUBCLASSOF);
  
          store.addStatement(x, rdfType, C);
--- 188,202 ----
           * setup the database.
           */
!         URI x = new _URI("http://www.foo.org/x");
!         URI y = new _URI("http://www.foo.org/y");
!         URI z = new _URI("http://www.foo.org/z");
  
!         URI A = new _URI("http://www.foo.org/A");
!         URI B = new _URI("http://www.foo.org/B");
!         URI C = new _URI("http://www.foo.org/C");
  
!         URI rdfType = new _URI(RDF.TYPE);
  
!         URI rdfsSubClassOf = new _URI(RDFS.SUBCLASSOF);
  
          store.addStatement(x, rdfType, C);
***************
*** 221,225 ****
          // query :- triple(?s,rdf:type,A).
          Triple query = new Triple(store.nextVar(), store.rdfType, new Id(store
!                 .addTerm(new URIImpl("http://www.foo.org/A"))));
  
          // Run the queryy.
--- 222,226 ----
          // query :- triple(?s,rdf:type,A).
          Triple query = new Triple(store.nextVar(), store.rdfType, new Id(store
!                 .addTerm(new _URI("http://www.foo.org/A"))));
  
          // Run the queryy.