cweb-cvs

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

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

Modified Files:
	TestMetadataIndex.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: TestMetadataIndex.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/scaleup/TestMetadataIndex.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** TestMetadataIndex.java	27 Mar 2007 14:34:24 -0000	1.12
--- TestMetadataIndex.java	27 Mar 2007 17:11:42 -0000	1.13
***************
*** 166,171 ****
          assertEquals(part1,md.get(key0));
          
!         PartitionMetadata part2 = new PartitionMetadata(partId0,1,
!                 new SegmentMetadata[] { new SegmentMetadata("a", 10L,ResourceState.Live) });
  
          assertEquals(part1,md.put(key0, part2));
--- 166,175 ----
          assertEquals(part1,md.get(key0));
          
!         final UUID segmentUUID_a = UUID.randomUUID();
!         final UUID segmentUUID_b = UUID.randomUUID();
!         
!         PartitionMetadata part2 = new PartitionMetadata(partId0, 1,
!                 new SegmentMetadata[] { new SegmentMetadata("a", 10L,
!                         ResourceState.Live, segmentUUID_a) });
  
          assertEquals(part1,md.put(key0, part2));
***************
*** 173,179 ****
          assertEquals(part2,md.get(key0));
          
!         PartitionMetadata part3 = new PartitionMetadata(partId0,2,
!                 new SegmentMetadata[] { new SegmentMetadata("a", 10L,ResourceState.Live),
!                         new SegmentMetadata("b", 20L,ResourceState.Live) });
  
          assertEquals(part2,md.put(key0, part3));
--- 177,186 ----
          assertEquals(part2,md.get(key0));
          
!         PartitionMetadata part3 = new PartitionMetadata(partId0, 2,
!                 new SegmentMetadata[] {
!                         new SegmentMetadata("a", 10L, ResourceState.Live,
!                                 segmentUUID_a),
!                         new SegmentMetadata("b", 20L, ResourceState.Live,
!                                 segmentUUID_b) });
  
          assertEquals(part2,md.put(key0, part3));
***************
*** 248,254 ****
          assertEquals(part0,md.get(key0));
          
          final int partId1 = 1;
          PartitionMetadata part1 = new PartitionMetadata(partId1,1,
!                 new SegmentMetadata[] { new SegmentMetadata("a", 10L,ResourceState.Live) });
          assertEquals(null,md.put(key1, part1));
          assertEquals(part1,md.get(key1));
--- 255,264 ----
          assertEquals(part0,md.get(key0));
          
+         final UUID segmentUUID_a = UUID.randomUUID();
+         final UUID segmentUUID_b = UUID.randomUUID();
+         
          final int partId1 = 1;
          PartitionMetadata part1 = new PartitionMetadata(partId1,1,
!                 new SegmentMetadata[] { new SegmentMetadata("a", 10L,ResourceState.Live, segmentUUID_a) });
          assertEquals(null,md.put(key1, part1));
          assertEquals(part1,md.get(key1));
***************
*** 256,261 ****
          final int partId2 = 2;
          PartitionMetadata part2 = new PartitionMetadata(partId2,2,
!                 new SegmentMetadata[] { new SegmentMetadata("a", 10L,ResourceState.Live),
!                         new SegmentMetadata("b", 20L,ResourceState.Live) });
          assertEquals(null, md.put(key2, part2));
          assertEquals(part2, md.get(key2));
--- 266,271 ----
          final int partId2 = 2;
          PartitionMetadata part2 = new PartitionMetadata(partId2,2,
!                 new SegmentMetadata[] { new SegmentMetadata("a", 10L,ResourceState.Live, segmentUUID_a),
!                         new SegmentMetadata("b", 20L,ResourceState.Live, segmentUUID_b) });
          assertEquals(null, md.put(key2, part2));
          assertEquals(part2, md.get(key2));
***************
*** 340,347 ****
          assertEquals(null,md.put(key0, part0));
          assertEquals(part0,md.get(key0));
          
          final int partId1 = 1;
          PartitionMetadata part1 = new PartitionMetadata(partId1,1,
!                 new SegmentMetadata[] { new SegmentMetadata("a", 10L,ResourceState.Live) });
          assertEquals(null,md.put(key1, part1));
          assertEquals(part1,md.get(key1));
--- 350,360 ----
          assertEquals(null,md.put(key0, part0));
          assertEquals(part0,md.get(key0));
+ 
+         final UUID segmentUUID_a = UUID.randomUUID();
+         final UUID segmentUUID_b = UUID.randomUUID();
          
          final int partId1 = 1;
          PartitionMetadata part1 = new PartitionMetadata(partId1,1,
!                 new SegmentMetadata[] { new SegmentMetadata("a", 10L,ResourceState.Live, segmentUUID_a) });
          assertEquals(null,md.put(key1, part1));
          assertEquals(part1,md.get(key1));
***************
*** 349,354 ****
          final int partId2 = 2;
          PartitionMetadata part2 = new PartitionMetadata(partId2,2,
!                 new SegmentMetadata[] { new SegmentMetadata("a", 10L,ResourceState.Live),
!                         new SegmentMetadata("b", 20L,ResourceState.Live) });
          assertEquals(null, md.put(key2, part2));
          assertEquals(part2,md.get(key2));
--- 362,367 ----
          final int partId2 = 2;
          PartitionMetadata part2 = new PartitionMetadata(partId2,2,
!                 new SegmentMetadata[] { new SegmentMetadata("a", 10L,ResourceState.Live, segmentUUID_a),
!                         new SegmentMetadata("b", 20L,ResourceState.Live, segmentUUID_b) });
          assertEquals(null, md.put(key2, part2));
          assertEquals(part2,md.get(key2));
***************
*** 465,476 ****
          assertTrue(!outFile.exists() || outFile.delete());
          
!         new IndexSegmentBuilder(outFile,null,btree,100,0d);
  
          /*
           * update the metadata index for this partition.
           */
!         md.put(new byte[] {}, new PartitionMetadata(0,1,
                  new SegmentMetadata[] { new SegmentMetadata("" + outFile,
!                         outFile.length(),ResourceState.Live) }));
  
          /*
--- 478,490 ----
          assertTrue(!outFile.exists() || outFile.delete());
          
!         IndexSegmentBuilder builder = new IndexSegmentBuilder(outFile,null,btree,100,0d);
  
          /*
           * update the metadata index for this partition.
           */
!         md.put(new byte[] {}, new PartitionMetadata(0, 1,
                  new SegmentMetadata[] { new SegmentMetadata("" + outFile,
!                         outFile.length(), ResourceState.Live,
!                         builder.segmentUUID) }));
  
          /*
***************
*** 574,585 ****
          assertTrue(!outFile01.exists() || outFile01.delete());
          
!         new IndexSegmentBuilder(outFile01,null,btree,100,0d);
  
          /*
           * update the metadata index for this partition.
           */
!         md.put(new byte[] {}, new PartitionMetadata(0,2,
                  new SegmentMetadata[] { new SegmentMetadata("" + outFile01,
!                         outFile01.length(),ResourceState.Live) }));
  
          /*
--- 588,600 ----
          assertTrue(!outFile01.exists() || outFile01.delete());
          
!         IndexSegmentBuilder builder1 = new IndexSegmentBuilder(outFile01,null,btree,100,0d);
  
          /*
           * update the metadata index for this partition.
           */
!         md.put(new byte[] {}, new PartitionMetadata(0, 2,
                  new SegmentMetadata[] { new SegmentMetadata("" + outFile01,
!                         outFile01.length(), ResourceState.Live,
!                         builder1.segmentUUID) }));
  
          /*
***************
*** 623,631 ****
                  .merge();
          
!         new IndexSegmentBuilder(outFile02, null, mergeItr.nentries,
!                 new MergedEntryIterator(mergeItr), 100, btree
!                         .getNodeSerializer().getValueSerializer(),
!                 false/* useChecksum */, null/* recordCompressor */, 0d/* errorRate */,
!                 btree.getIndexUUID());
  
          /*
--- 638,646 ----
                  .merge();
          
!         IndexSegmentBuilder builder2 = new IndexSegmentBuilder(outFile02, null,
!                 mergeItr.nentries, new MergedEntryIterator(mergeItr), 100,
!                 btree.getNodeSerializer().getValueSerializer(),
!                 false/* useChecksum */, null/* recordCompressor */,
!                 0d/* errorRate */, btree.getIndexUUID());
  
          /*
***************
*** 635,641 ****
           * has been replaced by the merged result (index segment 02).
           */
!         md.put(new byte[] {}, new PartitionMetadata(0, 3, new SegmentMetadata[] {
!                 new SegmentMetadata("" + outFile01, outFile01.length(),ResourceState.Dead),
!                 new SegmentMetadata("" + outFile02, outFile02.length(),ResourceState.Live) }));
  
          /*
--- 650,659 ----
           * has been replaced by the merged result (index segment 02).
           */
!         md.put(new byte[] {}, new PartitionMetadata(0, 3,
!                 new SegmentMetadata[] {
!                         new SegmentMetadata("" + outFile01, outFile01.length(),
!                                 ResourceState.Dead, builder1.segmentUUID),
!                         new SegmentMetadata("" + outFile02, outFile02.length(),
!                                 ResourceState.Live, builder2.segmentUUID) }));
  
          /*
***************
*** 846,859 ****
                  assertTrue(!outFile01.exists() || outFile01.delete());
  
!                 new IndexSegmentBuilder(outFile01, null, testData, mseg, 0d);
  
                  /*
                   * update the metadata index for this partition.
                   */
!                 md.put(new byte[] {},
!                         new PartitionMetadata(0,2,
!                                 new SegmentMetadata[] { new SegmentMetadata(""
!                                         + outFile01, outFile01.length(),
!                                         ResourceState.Live) }));
  
                  /*
--- 864,876 ----
                  assertTrue(!outFile01.exists() || outFile01.delete());
  
!                 IndexSegmentBuilder builder = new IndexSegmentBuilder(outFile01, null, testData, mseg, 0d);
  
                  /*
                   * update the metadata index for this partition.
                   */
!                 md.put(new byte[] {}, new PartitionMetadata(0, 2,
!                         new SegmentMetadata[] { new SegmentMetadata(""
!                                 + outFile01, outFile01.length(),
!                                 ResourceState.Live, builder.segmentUUID) }));
  
                  /*
***************
*** 920,924 ****
                          new SegmentMetadata[] {
                                  new SegmentMetadata("" + outFile02, outFile02
!                                         .length(), ResourceState.Live) }));
  
                  /*
--- 937,941 ----
                          new SegmentMetadata[] {
                                  new SegmentMetadata("" + outFile02, outFile02
!                                         .length(), ResourceState.Live, builder.segmentUUID) }));
  
                  /*
***************
*** 1050,1054 ****
          assertTrue(!outFile01.exists() || outFile01.delete());
          
!         new IndexSegmentBuilder(outFile01,null,btree,100,0d);
  
          /*
--- 1067,1071 ----
          assertTrue(!outFile01.exists() || outFile01.delete());
          
!         IndexSegmentBuilder builder1 = new IndexSegmentBuilder(outFile01,null,btree,100,0d);
  
          /*
***************
*** 1057,1061 ****
          md.put(new byte[] {}, new PartitionMetadata(0,1,
                  new SegmentMetadata[] { new SegmentMetadata("" + outFile01,
!                         outFile01.length(),ResourceState.Live) }));
  
          /*
--- 1074,1078 ----
          md.put(new byte[] {}, new PartitionMetadata(0,1,
                  new SegmentMetadata[] { new SegmentMetadata("" + outFile01,
!                         outFile01.length(),ResourceState.Live, builder1.segmentUUID) }));
  
          /*
***************
*** 1094,1105 ****
          assertTrue(!outFile02.exists() || outFile02.delete());
  
!         new IndexSegmentBuilder(outFile02, null, btree, 100, 0d);
  
          /*
           * update the metadata index for this partition.
           */
!         md.put(new byte[] {}, new PartitionMetadata(0, 1, new SegmentMetadata[] {
!                 new SegmentMetadata("" + outFile01, outFile01.length(),ResourceState.Live),
!                 new SegmentMetadata("" + outFile02, outFile02.length(),ResourceState.Live) }));
  
          /*
--- 1111,1125 ----
          assertTrue(!outFile02.exists() || outFile02.delete());
  
!         IndexSegmentBuilder builder2 = new IndexSegmentBuilder(outFile02, null, btree, 100, 0d);
  
          /*
           * update the metadata index for this partition.
           */
!         md.put(new byte[] {}, new PartitionMetadata(0, 1,
!                 new SegmentMetadata[] {
!                         new SegmentMetadata("" + outFile01, outFile01.length(),
!                                 ResourceState.Live, builder1.segmentUUID),
!                         new SegmentMetadata("" + outFile02, outFile02.length(),
!                                 ResourceState.Live, builder2.segmentUUID) }));
  
          /*