[cweb-CVS] bigdata/src/test/com/bigdata/scaleup TestMetadataIndex.java, 1.11, 1.12 TestPartitionedJ

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	TestMetadataIndex.java TestPartitionedJournal.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: TestMetadataIndex.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/scaleup/TestMetadataIndex.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TestMetadataIndex.java	22 Mar 2007 21:11:25 -0000	1.11
--- TestMetadataIndex.java	27 Mar 2007 14:34:24 -0000	1.12
***************
*** 52,55 ****
--- 52,56 ----
  import java.util.Properties;
  import java.util.Random;
+ import java.util.UUID;

  import org.apache.log4j.Level;
***************
*** 131,136 ****
          IRawStore store = new SimpleMemoryRawStore();

          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store,3,"abc");

          /*
--- 132,142 ----
          IRawStore store = new SimpleMemoryRawStore();

+         final UUID indexUUID = UUID.randomUUID();
+         
+         final UUID managedIndexUUID = UUID.randomUUID();  
+         
          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, indexUUID,
!                 managedIndexUUID, "abc");

          /*
***************
*** 200,205 ****
          Journal store = new Journal(properties);

          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store,3,"abc");

          /*
--- 206,216 ----
          Journal store = new Journal(properties);

+         final UUID indexUUID = UUID.randomUUID();
+         
+         final UUID managedIndexUUID = UUID.randomUUID();  
+         
          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, indexUUID,
!                 managedIndexUUID, "abc");

          /*
***************
*** 291,296 ****
          IRawStore store = new SimpleMemoryRawStore();

          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store,3,"abc");

          /*
--- 302,312 ----
          IRawStore store = new SimpleMemoryRawStore();

+         final UUID indexUUID = UUID.randomUUID();
+         
+         final UUID managedIndexUUID = UUID.randomUUID();  
+         
          // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, indexUUID,
!                 managedIndexUUID, "abc");

          /*
***************
*** 400,405 ****
          Journal store = new Journal(properties);

!         // partition metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, "abc");

          // define a single partition with no segments.
--- 416,426 ----
          Journal store = new Journal(properties);

!         final UUID indexUUID = UUID.randomUUID();
!         
!         final UUID managedIndexUUID = UUID.randomUUID();  
!         
!         // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, indexUUID,
!                 managedIndexUUID, "abc");

          // define a single partition with no segments.
***************
*** 407,411 ****

          // btree to be filled with data.
!         BTree btree = new BTree(store, 3, SimpleEntry.Serializer.INSTANCE);

          /*
--- 428,433 ----

          // btree to be filled with data.
!         BTree btree = new BTree(store, 3, managedIndexUUID,
!                 SimpleEntry.Serializer.INSTANCE);

          /*
***************
*** 501,506 ****
          Journal store = new Journal(properties);

!         // partition metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, "abc");

          // define a single partition with no segments.
--- 523,533 ----
          Journal store = new Journal(properties);

!         final UUID indexUUID = UUID.randomUUID();
!         
!         final UUID managedIndexUUID = UUID.randomUUID();  
!         
!         // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, indexUUID,
!                 managedIndexUUID, "abc");

          // define a single partition with no segments.
***************
*** 508,512 ****

          // btree to be filled with data.
!         BTree btree = new BTree(store, 3, SimpleEntry.Serializer.INSTANCE);

          /*
--- 535,540 ----

          // btree to be filled with data.
!         BTree btree = new BTree(store, 3, managedIndexUUID,
!                 SimpleEntry.Serializer.INSTANCE);

          /*
***************
*** 572,576 ****
           * create a new btree and insert the other keys/values into this btree.
           */
!         btree = new BTree(store,3,SimpleEntry.Serializer.INSTANCE);

          btree.insert(new BatchInsert(values2.length, keys2, values2));
--- 600,605 ----
           * create a new btree and insert the other keys/values into this btree.
           */
!         btree = new BTree(store, 3, managedIndexUUID,
!                 SimpleEntry.Serializer.INSTANCE);

          btree.insert(new BatchInsert(values2.length, keys2, values2));
***************
*** 597,601 ****
                  new MergedEntryIterator(mergeItr), 100, btree
                          .getNodeSerializer().getValueSerializer(),
!                 false/* useChecksum */, null/* recordCompressor */, 0d/* errorRate */);

          /*
--- 626,631 ----
                  new MergedEntryIterator(mergeItr), 100, btree
                          .getNodeSerializer().getValueSerializer(),
!                 false/* useChecksum */, null/* recordCompressor */, 0d/* errorRate */,
!                 btree.getIndexUUID());

          /*
***************
*** 671,676 ****
          Journal store = new Journal(properties);

!         // partition metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, "abc");

          // define a single partition with no segments.
--- 701,711 ----
          Journal store = new Journal(properties);

!         final UUID indexUUID = UUID.randomUUID();
!         
!         final UUID managedIndexUUID = UUID.randomUUID();  
!         
!         // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, indexUUID,
!                 managedIndexUUID, "abc");

          // define a single partition with no segments.
***************
*** 701,705 ****

          // ground truth btree.
!         BTree groundTruth = new BTree(store, mmut, SimpleEntry.Serializer.INSTANCE);

          // the current index segment and null if there is none yet.
--- 736,740 ----

          // ground truth btree.
!         BTree groundTruth = new BTree(store, mmut, managedIndexUUID, SimpleEntry.Serializer.INSTANCE);

          // the current index segment and null if there is none yet.
***************
*** 711,715 ****

              // test data btree - new tree on each trial!
!             BTree testData = new BTree(store, mmut, SimpleEntry.Serializer.INSTANCE);

              /*
--- 746,750 ----

              // test data btree - new tree on each trial!
!             BTree testData = new BTree(store, mmut, managedIndexUUID, SimpleEntry.Serializer.INSTANCE);

              /*
***************
*** 863,867 ****
                                  .getNodeSerializer().getValueSerializer(),
                          false/* useChecksum */, null/* recordCompressor */,
!                         0d/* errorRate */);

                  // close the merged leaf iterator (and release its buffer/file).
--- 898,902 ----
                                  .getNodeSerializer().getValueSerializer(),
                          false/* useChecksum */, null/* recordCompressor */,
!                         0d/* errorRate */, testData.getIndexUUID());

                  // close the merged leaf iterator (and release its buffer/file).
***************
*** 965,970 ****
          Journal store = new Journal(properties);

!         // partition metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, "abc");

          // define a single partition with no segments.
--- 1000,1010 ----
          Journal store = new Journal(properties);

!         final UUID indexUUID = UUID.randomUUID();
!         
!         final UUID managedIndexUUID = UUID.randomUUID();  
!         
!         // create the metadata index.
!         MetadataIndex md = new MetadataIndex(store, 3, indexUUID,
!                 managedIndexUUID, "abc");

          // define a single partition with no segments.
***************
*** 972,976 ****

          // btree to be filled with data.
!         BTree btree = new BTree(store, 3, SimpleEntry.Serializer.INSTANCE);

          /*
--- 1012,1016 ----

          // btree to be filled with data.
!         BTree btree = new BTree(store, 3, managedIndexUUID, SimpleEntry.Serializer.INSTANCE);

          /*
***************
*** 1036,1040 ****
           * create a new btree and insert the other keys/values into this btree.
           */
!         btree = new BTree(store,3,SimpleEntry.Serializer.INSTANCE);

          btree.insert(new BatchInsert(values2.length, keys2, values2));
--- 1076,1080 ----
           * create a new btree and insert the other keys/values into this btree.
           */
!         btree = new BTree(store,3, managedIndexUUID, SimpleEntry.Serializer.INSTANCE);

          btree.insert(new BatchInsert(values2.length, keys2, values2));

Index: TestPartitionedJournal.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/test/com/bigdata/scaleup/TestPartitionedJournal.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** TestPartitionedJournal.java	22 Mar 2007 21:11:25 -0000	1.7
--- TestPartitionedJournal.java	27 Mar 2007 14:34:24 -0000	1.8
***************
*** 51,54 ****
--- 51,55 ----
  import java.util.Properties;
  import java.util.Random;
+ import java.util.UUID;

  import junit.framework.TestCase2;
***************
*** 141,145 ****
          final String name = "abc";

!         IIndex index = new UnisolatedBTree(journal);

          assertNull(journal.getIndex(name));
--- 142,146 ----
          final String name = "abc";

!         IIndex index = new UnisolatedBTree(journal, UUID.randomUUID());

          assertNull(journal.getIndex(name));
***************
*** 205,209 ****
          final String name = "abc";

!         assertNotNull(journal.registerIndex(name, new UnisolatedBTree(journal)));

          journal.overflow();
--- 206,210 ----
          final String name = "abc";

!         assertNotNull(journal.registerIndex(name, new UnisolatedBTree(journal, UUID.randomUUID())));

          journal.overflow();
***************
*** 237,241 ****
          final String name = "abc";

!         assertNotNull(journal.registerIndex(name, new UnisolatedBTree(journal, 3)));

          final TestData data = new TestData(journal.migrationThreshold-1);
--- 238,243 ----
          final String name = "abc";

!         assertNotNull(journal.registerIndex(name, new UnisolatedBTree(journal,
!                 3, UUID.randomUUID())));

          final TestData data = new TestData(journal.migrationThreshold-1);
***************
*** 285,289 ****
          final String name = "abc";

!         assertNotNull(journal.registerIndex(name, new UnisolatedBTree(journal)));

          final TestData data = new TestData(journal.migrationThreshold);
--- 287,292 ----
          final String name = "abc";

!         assertNotNull(journal.registerIndex(name, new UnisolatedBTree(journal,
!                 UUID.randomUUID())));

          final TestData data = new TestData(journal.migrationThreshold);
***************
*** 348,355 ****
          final String name = "abc";

!         assertNotNull(journal.registerIndex(name, new UnisolatedBTree(journal)));

          final UnisolatedBTree groundTruth = new UnisolatedBTree(
!                 new SimpleMemoryRawStore());

          final int ntrials = 10;
--- 351,361 ----
          final String name = "abc";

!         final UUID indexUUID = UUID.randomUUID();
!         
!         assertNotNull(journal.registerIndex(name, new UnisolatedBTree(journal,
!                 indexUUID)));

          final UnisolatedBTree groundTruth = new UnisolatedBTree(
!                 new SimpleMemoryRawStore(), indexUUID);

          final int ntrials = 10;

[cweb-CVS] bigdata/src/test/com/bigdata/scaleup TestMetadataIndex.java, 1.11, 1.12 TestPartitionedJ

[cweb-CVS] bigdata/src/test/com/bigdata/scaleup TestMetadataIndex.java, 1.11, 1.12 TestPartitionedJournal.java, 1.7, 1.8