[cweb-CVS] bigdata/src/test/com/bigdata/scaleup TestMetadataIndex.java, 1.16, 1.17 TestPartitionedJournal.java, 1.10, 1.11

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

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

Modified Files:
	TestMetadataIndex.java TestPartitionedJournal.java 
Log Message:
Refactored the MetadataIndex to extend UnisolatedBTree and put it to some use in the MetadataService and validated aspects of its use in the test case for the metadata service.

Index: TestMetadataIndex.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/scaleup/TestMetadataIndex.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** TestMetadataIndex.java	23 Apr 2007 17:22:17 -0000	1.16
--- TestMetadataIndex.java	23 Apr 2007 18:58:38 -0000	1.17
***************
*** 137,141 ****
          
          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, indexUUID,
                  managedIndexUUID, "abc");
  
--- 137,141 ----
          
          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, indexUUID,
                  managedIndexUUID, "abc");
  
***************
*** 220,224 ****
          
          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, indexUUID,
                  managedIndexUUID, "abc");
  
--- 220,224 ----
          
          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, indexUUID,
                  managedIndexUUID, "abc");
  
***************
*** 290,294 ****
          // re-load the index.
          md = (MetadataIndex)BTree.load(store, addr);
!         assertEquals("name","abc",md.getName());
          
          assertEquals("#entries",3,md.getEntryCount());
--- 290,294 ----
          // re-load the index.
          md = (MetadataIndex)BTree.load(store, addr);
!         assertEquals("name","abc",md.getManagedIndexName());
          
          assertEquals("#entries",3,md.getEntryCount());
***************
*** 320,324 ****
          
          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, indexUUID,
                  managedIndexUUID, "abc");
  
--- 320,324 ----
          
          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, indexUUID,
                  managedIndexUUID, "abc");
  
***************
*** 440,444 ****
          
          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, indexUUID,
                  managedIndexUUID, "abc");
          
--- 440,444 ----
          
          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, indexUUID,
                  managedIndexUUID, "abc");
          
***************
*** 550,554 ****
          
          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, indexUUID,
                  managedIndexUUID, "abc");
          
--- 550,554 ----
          
          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, indexUUID,
                  managedIndexUUID, "abc");
          
***************
*** 734,738 ****
          
          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, indexUUID,
                  managedIndexUUID, "abc");
          
--- 734,738 ----
          
          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, indexUUID,
                  managedIndexUUID, "abc");
          
***************
*** 968,972 ****
                  seg.close();
                  
!                 new File(oldpart.resources[0].getFile()).delete();
  
                  // this is now the current index segment.
--- 968,972 ----
                  seg.close();
                  
!                 new File(oldpart.getResources()[0].getFile()).delete();
  
                  // this is now the current index segment.
***************
*** 995,999 ****
          seg.close();
  
!         new File(md.get(new byte[]{}).resources[0].getFile()).delete();
  
          System.err.println("End of stress test: ntrial="+ntrials+", nops="+nops);
--- 995,999 ----
          seg.close();
  
!         new File(md.get(new byte[]{}).getResources()[0].getFile()).delete();
  
          System.err.println("End of stress test: ntrial="+ntrials+", nops="+nops);
***************
*** 1035,1039 ****
          
          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, indexUUID,
                  managedIndexUUID, "abc");
          
--- 1035,1039 ----
          
          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, indexUUID,
                  managedIndexUUID, "abc");
          

Index: TestPartitionedJournal.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/scaleup/TestPartitionedJournal.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TestPartitionedJournal.java	13 Apr 2007 15:04:24 -0000	1.10
--- TestPartitionedJournal.java	23 Apr 2007 18:58:38 -0000	1.11
***************
*** 327,331 ****
          assertEquals("#partitions",1,mdi.getEntryCount());
          
!         assertEquals("#segments",0,mdi.get(new byte[]{}).resources.length);
          
          /*
--- 327,331 ----
          assertEquals("#partitions",1,mdi.getEntryCount());
          
!         assertEquals("#segments",0,mdi.get(new byte[]{}).getResources().length);
          
          /*
***************
*** 376,380 ****
          assertEquals("#partitions",1,mdi.getEntryCount());
          
!         assertEquals("#segments",1,mdi.get(new byte[]{}).resources.length);
          
          /*
--- 376,380 ----
          assertEquals("#partitions",1,mdi.getEntryCount());
          
!         assertEquals("#segments",1,mdi.get(new byte[]{}).getResources().length);
          
          /*
***************
*** 453,469 ****
              PartitionMetadata pmd = mdi.get(separatorKey);
              
!             assertEquals("partId",0,pmd.partId);
              
              assertEquals("#segments", 1, pmd.getLiveCount());
              
!             if(pmd.resources.length>1) {
                  
!                 assertEquals("#segments",2,pmd.resources.length);
                  
                  assertEquals("state", ResourceState.Dead,
!                         pmd.resources[0].state());
                  
                  assertEquals("state", ResourceState.Live,
!                         pmd.resources[1].state());
                  
              }
--- 453,471 ----
              PartitionMetadata pmd = mdi.get(separatorKey);
              
!             assertEquals("partId",0,pmd.getPartitionId());
              
              assertEquals("#segments", 1, pmd.getLiveCount());
              
!             IResourceMetadata[] resources = pmd.getResources();
!             
!             if(resources.length>1) {
                  
!                 assertEquals("#segments",2,resources.length);
                  
                  assertEquals("state", ResourceState.Dead,
!                         resources[0].state());
                  
                  assertEquals("state", ResourceState.Live,
!                         resources[1].state());
                  
              }