[cweb-CVS] bigdata/src/test/com/bigdata/isolation TestIsolatedBTree.java, 1.5, 1.6 TestUnisolatedBTree.java, 1.6, 1.7

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

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

Modified Files:
	TestIsolatedBTree.java TestUnisolatedBTree.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: TestUnisolatedBTree.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/isolation/TestUnisolatedBTree.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestUnisolatedBTree.java	11 Mar 2007 11:42:49 -0000	1.6
--- TestUnisolatedBTree.java	27 Mar 2007 14:34:24 -0000	1.7
***************
*** 48,51 ****
--- 48,53 ----
  package com.bigdata.isolation;
  
+ import java.util.UUID;
+ 
  import com.bigdata.objndx.AbstractBTree;
  import com.bigdata.objndx.AbstractBTreeTestCase;
***************
*** 98,102 ****
          {
              
!             UnisolatedBTree btree = new UnisolatedBTree(store,branchingFactor,null);
              
              assertTrue(store==btree.getStore());
--- 100,105 ----
          {
              
!             UnisolatedBTree btree = new UnisolatedBTree(store,branchingFactor,UUID.randomUUID(),
!                     null);
              
              assertTrue(store==btree.getStore());
***************
*** 116,120 ****
              
              UnisolatedBTree btree = new UnisolatedBTree(store, branchingFactor,
!                     conflictResolver);
  
              assertTrue(store == btree.getStore());
--- 119,123 ----
              
              UnisolatedBTree btree = new UnisolatedBTree(store, branchingFactor,
!                     UUID.randomUUID(), conflictResolver);
  
              assertTrue(store == btree.getStore());
***************
*** 147,151 ****
          
          UnisolatedBTree btree = new UnisolatedBTree(new SimpleMemoryRawStore(),
!                 3, null);
  
          /*
--- 150,154 ----
          
          UnisolatedBTree btree = new UnisolatedBTree(new SimpleMemoryRawStore(),
!                 3, UUID.randomUUID(), null);
  
          /*
***************
*** 224,228 ****
  
          UnisolatedBTree btree = new UnisolatedBTree(new SimpleMemoryRawStore(),
!                 3, null);
          
          btree.insert(k3,v3);
--- 227,231 ----
  
          UnisolatedBTree btree = new UnisolatedBTree(new SimpleMemoryRawStore(),
!                 3, UUID.randomUUID(), null);
          
          btree.insert(k3,v3);
***************
*** 286,290 ****
  
          UnisolatedBTree btree = new UnisolatedBTree(new SimpleMemoryRawStore(),
!                 3, null);
          
          /*
--- 289,293 ----
  
          UnisolatedBTree btree = new UnisolatedBTree(new SimpleMemoryRawStore(),
!                 3, UUID.randomUUID(), null);
          
          /*
***************
*** 396,400 ****
          final byte[] v7a = new byte[]{7,1};
  
!         UnisolatedBTree btree = new UnisolatedBTree(store, 3, null);
          
          /*
--- 399,403 ----
          final byte[] v7a = new byte[]{7,1};
  
!         UnisolatedBTree btree = new UnisolatedBTree(store, 3, UUID.randomUUID(), null);
          
          /*

Index: TestIsolatedBTree.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/isolation/TestIsolatedBTree.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TestIsolatedBTree.java	15 Mar 2007 16:11:14 -0000	1.5
--- TestIsolatedBTree.java	27 Mar 2007 14:34:24 -0000	1.6
***************
*** 48,51 ****
--- 48,53 ----
  package com.bigdata.isolation;
  
+ import java.util.UUID;
+ 
  import com.bigdata.journal.TestTx;
  import com.bigdata.objndx.AbstractBTreeTestCase;
***************
*** 124,128 ****
          {
              
!             UnisolatedBTree src = new UnisolatedBTree(store,branchingFactor,null);
  
              IsolatedBTree btree = new IsolatedBTree(store,src);
--- 126,131 ----
          {
              
!             UnisolatedBTree src = new UnisolatedBTree(store, branchingFactor,
!                     UUID.randomUUID(), null);
  
              IsolatedBTree btree = new IsolatedBTree(store,src);
***************
*** 146,150 ****
              
              UnisolatedBTree src = new UnisolatedBTree(store, branchingFactor,
!                     conflictResolver);
  
              IsolatedBTree btree = new IsolatedBTree(store,src);
--- 149,153 ----
              
              UnisolatedBTree src = new UnisolatedBTree(store, branchingFactor,
!                     UUID.randomUUID(), conflictResolver);
  
              IsolatedBTree btree = new IsolatedBTree(store,src);
***************
*** 186,190 ****
           */
          UnisolatedBTree src = new UnisolatedBTree(new SimpleMemoryRawStore(),
!                 3, null);
  
          src.insert(k3, v3);
--- 189,193 ----
           */
          UnisolatedBTree src = new UnisolatedBTree(new SimpleMemoryRawStore(),
!                 3, UUID.randomUUID(), null);
  
          src.insert(k3, v3);