[cweb-CVS] bigdata-rdf/src/java/com/bigdata/rdf TempTripleStore.java, 1.2, 1.3 TripleStore.java, 1.23, 1.24 RdfKeyBuilder.java, 1.7, 1.8

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

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

Modified Files:
	TempTripleStore.java TripleStore.java RdfKeyBuilder.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: TempTripleStore.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/TempTripleStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TempTripleStore.java	17 Feb 2007 21:34:57 -0000	1.2
--- TempTripleStore.java	27 Mar 2007 14:35:08 -0000	1.3
***************
*** 49,52 ****
--- 49,53 ----
  
  import java.util.Locale;
+ import java.util.UUID;
  
  import org.apache.log4j.Logger;
***************
*** 110,113 ****
--- 111,115 ----
              ndx = registerIndex(name, new BTree(this,
                      BTree.DEFAULT_BRANCHING_FACTOR,
+                     UUID.randomUUID(),
                      StatementSerializer.INSTANCE));
  

Index: RdfKeyBuilder.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/RdfKeyBuilder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RdfKeyBuilder.java	9 Feb 2007 20:18:56 -0000	1.7
--- RdfKeyBuilder.java	27 Mar 2007 14:35:08 -0000	1.8
***************
*** 307,311 ****
  
              /*
!              * @todo if we know that the bnode id is a uuid that we generated
               * then we should encode that using faster logic that this unicode
               * conversion and stick the sort key on the bnode so that we do
--- 307,311 ----
  
              /*
!              * @todo if we know that the bnode id is a segmentUUID that we generated
               * then we should encode that using faster logic that this unicode
               * conversion and stick the sort key on the bnode so that we do

Index: TripleStore.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/TripleStore.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** TripleStore.java	15 Mar 2007 16:11:54 -0000	1.23
--- TripleStore.java	27 Mar 2007 14:35:08 -0000	1.24
***************
*** 57,60 ****
--- 57,61 ----
  import java.util.Locale;
  import java.util.Properties;
+ import java.util.UUID;
  
  import org.apache.log4j.Level;
***************
*** 268,272 ****
              
              ndx_termId = ndx = registerIndex(name_termId, new BTree(this,
!                     BTree.DEFAULT_BRANCHING_FACTOR, TermIdSerializer.INSTANCE));
              
          }
--- 269,274 ----
              
              ndx_termId = ndx = registerIndex(name_termId, new BTree(this,
!                     BTree.DEFAULT_BRANCHING_FACTOR, UUID.randomUUID(),
!                     TermIdSerializer.INSTANCE));
              
          }
***************
*** 286,289 ****
--- 288,292 ----
              ndx_idTerm = ndx = registerIndex(name_idTerm,
                      new BTree(this, BTree.DEFAULT_BRANCHING_FACTOR,
+                             UUID.randomUUID(),
                              RdfValueSerializer.INSTANCE));
  
***************
*** 312,315 ****
--- 315,319 ----
              ndx = registerIndex(name, new BTree(this,
                      BTree.DEFAULT_BRANCHING_FACTOR,
+                     UUID.randomUUID(),
                      StatementSerializer.INSTANCE));