[cweb-CVS] bigdata/src/java/com/bigdata/objndx IndexSegmentBuilder.java, 1.29, 1.30 IndexSegmentMetadata.java, 1.12, 1.13

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

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

Modified Files:
	IndexSegmentBuilder.java IndexSegmentMetadata.java 
Log Message:
Corrected problem in the interpretation of maximumExtent for an IBufferStrategy vs an IJournal.
Working through use of isolatable indices for the triple store.

Index: IndexSegmentBuilder.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/objndx/IndexSegmentBuilder.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** IndexSegmentBuilder.java	27 Mar 2007 14:34:22 -0000	1.29
--- IndexSegmentBuilder.java	27 Mar 2007 17:11:41 -0000	1.30
***************
*** 199,202 ****
--- 199,209 ----
  
      /**
+      * The unique identifier for the generated {@link IndexSegment} resource.
+      * 
+      * @see #indexUUID
+      */
+     final public UUID segmentUUID;
+     
+     /**
       * The unique identifier for the index whose data is stored in this B+Tree
       * data structure. When using a scale-out index the same <i>indexUUID</i>
***************
*** 205,210 ****
       * backwards from the B+Tree data structures and identify the index to which
       * they belong.
       */
!     final protected UUID indexUUID;
      
      /**
--- 212,219 ----
       * backwards from the B+Tree data structures and identify the index to which
       * they belong.
+      * 
+      * @see #segmentUUID
       */
!     final public UUID indexUUID;
      
      /**
***************
*** 225,234 ****
      final BloomFilter bloomFilter;
      
- //    /**
- //     * When non-null, a map containing extension metadata.  This is set by the
- //     * constructor.
- //     */
- //    final Map<String, Serializable> metadataMap;
-     
      /**
       * The offset in the output file of the last leaf written onto that file.
--- 234,237 ----
***************
*** 470,478 ****
       * @throws IOException
       */
- //    * @param metadataMap
- //    *            An optional serializable map containing application defined
- //    *            extension metadataMap. The map will be serialized with the
- //    *            {@link IndexSegmentExtensionMetadata} object as part of the
- //    *            {@link IndexSegmentFileStore}.
      public IndexSegmentBuilder(File outFile, File tmpDir, final int entryCount,
              IEntryIterator entryIterator, final int m,
--- 473,476 ----
***************
*** 480,484 ****
              RecordCompressor recordCompressor, final double errorRate,
              final UUID indexUUID
- //          , final Map<String, Serializable> metadataMap
              )
              throws IOException {
--- 478,481 ----
***************
*** 494,497 ****
--- 491,495 ----
          this.useChecksum = useChecksum;
          this.recordCompressor = recordCompressor;
+         this.segmentUUID = UUID.randomUUID();
          this.indexUUID = indexUUID;
  
***************
*** 564,569 ****
              }
  
- //            this.metadataMap = metadataMap;
-             
              // Used to serialize the nodes and leaves for the output tree.
              nodeSer = new NodeSerializer(NOPNodeFactory.INSTANCE,
--- 562,565 ----
***************
*** 1440,1444 ****
              IndexSegmentExtensionMetadata extensionMetadata = new IndexSegmentExtensionMetadata(
                      cl, nodeSer.valueSerializer, nodeSer.recordCompressor);
- //                    metadataMap);
  
              final byte[] extensionMetadataBytes = SerializerUtil
--- 1436,1439 ----
***************
*** 1475,1479 ****
                      plan.nentries, maxNodeOrLeafLength, addrLeaves, addrNodes,
                      addrRoot, addrExtensionMetadata, addrBloom, errorRate, out
!                             .length(), indexUUID, now);
  
              md.write(out);
--- 1470,1474 ----
                      plan.nentries, maxNodeOrLeafLength, addrLeaves, addrNodes,
                      addrRoot, addrExtensionMetadata, addrBloom, errorRate, out
!                             .length(), segmentUUID, indexUUID, now);
  
              md.write(out);

Index: IndexSegmentMetadata.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/objndx/IndexSegmentMetadata.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** IndexSegmentMetadata.java	27 Mar 2007 14:34:23 -0000	1.12
--- IndexSegmentMetadata.java	27 Mar 2007 17:11:41 -0000	1.13
***************
*** 286,290 ****
              int maxNodeOrLeafLength, long addrLeaves, long addrNodes,
              long addrRoot, long addrExtensionMetadata, long addrBloom,
!             double errorRate, long length, UUID indexUUID, long timestamp) {
          
          assert branchingFactor >= BTree.MIN_BRANCHING_FACTOR;
--- 286,291 ----
              int maxNodeOrLeafLength, long addrLeaves, long addrNodes,
              long addrRoot, long addrExtensionMetadata, long addrBloom,
!             double errorRate, long length, UUID indexUUID, UUID segmentUUID,
!             long timestamp) {
          
          assert branchingFactor >= BTree.MIN_BRANCHING_FACTOR;
***************
*** 327,331 ****
          assert timestamp != 0L;
          
!         this.segmentUUID = UUID.randomUUID();
  
          this.branchingFactor = branchingFactor;
--- 328,336 ----
          assert timestamp != 0L;
          
!         assert segmentUUID != null;
!         
!         assert indexUUID != null;
!         
!         this.segmentUUID = segmentUUID;
  
          this.branchingFactor = branchingFactor;