[cweb-CVS] bigdata-rdf/src/java/com/bigdata/rdf/rio BulkLoaderBuffer.java, 1.9, 1.10

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

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

Modified Files:
	BulkLoaderBuffer.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: BulkLoaderBuffer.java
===================================================================
RCS file: /cvsroot/cweb/bigdata-rdf/src/java/com/bigdata/rdf/rio/BulkLoaderBuffer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** BulkLoaderBuffer.java	15 Feb 2007 22:01:25 -0000	1.9
--- BulkLoaderBuffer.java	27 Mar 2007 14:35:08 -0000	1.10
***************
*** 56,59 ****
--- 56,60 ----
  
  import com.bigdata.io.ByteBufferOutputStream;
+ import com.bigdata.objndx.IIndex;
  import com.bigdata.objndx.IndexSegment;
  import com.bigdata.objndx.IndexSegmentBuilder;
***************
*** 154,162 ****
          final long begin = System.currentTimeMillis();
          
!         new IndexSegmentBuilder(outFile, null, numTerms,
!                 new TermIdIterator(this), branchingFactor,
!                 TermIdSerializer.INSTANCE,
!                 useChecksum, recordCompressor,
!                 errorRate);
  
          final long elapsed = System.currentTimeMillis() - begin;
--- 155,162 ----
          final long begin = System.currentTimeMillis();
          
!         new IndexSegmentBuilder(outFile, null, numTerms, new TermIdIterator(
!                 this), branchingFactor, TermIdSerializer.INSTANCE, useChecksum,
!                 recordCompressor, errorRate, store.getTermIdIndex()
!                         .getIndexUUID());
  
          final long elapsed = System.currentTimeMillis() - begin;
***************
*** 185,194 ****
          final long begin = System.currentTimeMillis();
  
!         new IndexSegmentBuilder(outFile, null,
!                 numTerms, new TermIterator(this),
!                 branchingFactor,
!                 RdfValueSerializer.INSTANCE,
!                 useChecksum, recordCompressor,
!                 errorRate);
  
          final long elapsed = System.currentTimeMillis() - begin;
--- 185,192 ----
          final long begin = System.currentTimeMillis();
  
!         new IndexSegmentBuilder(outFile, null, numTerms,
!                 new TermIterator(this), branchingFactor,
!                 RdfValueSerializer.INSTANCE, useChecksum, recordCompressor,
!                 errorRate, store.getIdTermIndex().getIndexUUID());
  
          final long elapsed = System.currentTimeMillis() - begin;
***************
*** 210,219 ****
          final long begin = System.currentTimeMillis();
          
          new IndexSegmentBuilder(outFile, null, numStmts,
!                 new UnknownStatementIterator(keyOrder,this),
!                 branchingFactor,
!                 StatementSerializer.INSTANCE,
!                 useChecksum, recordCompressor,
!                 errorRate);
          
          final long elapsed = System.currentTimeMillis() - begin;
--- 208,230 ----
          final long begin = System.currentTimeMillis();
          
+         final IIndex ndx;
+         switch(keyOrder) {
+         case SPO:
+             ndx = store.getSPOIndex();
+             break;
+         case POS:
+             ndx = store.getPOSIndex();
+             break;
+         case OSP:
+             ndx = store.getOSPIndex();
+             break;
+         default:
+             throw new AssertionError("Unknown keyOrder=" + keyOrder);
+         }
+         
          new IndexSegmentBuilder(outFile, null, numStmts,
!                 new UnknownStatementIterator(keyOrder, this), branchingFactor,
!                 StatementSerializer.INSTANCE, useChecksum, recordCompressor,
!                 errorRate, ndx.getIndexUUID());
          
          final long elapsed = System.currentTimeMillis() - begin;