[cweb-CVS] bigdata/src/java/com/bigdata/scaleup PartitionedJournal.java, 1.7, 1.8 Name2MetadataAddr.java, 1.2, 1.3 SlaveJournal.java, 1.1, 1.2

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

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

Modified Files:
	PartitionedJournal.java Name2MetadataAddr.java 
	SlaveJournal.java 
Log Message:
Working through transactional isolation.

Index: Name2MetadataAddr.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/scaleup/Name2MetadataAddr.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Name2MetadataAddr.java	15 Feb 2007 14:23:50 -0000	1.2
--- Name2MetadataAddr.java	17 Feb 2007 21:34:21 -0000	1.3
***************
*** 73,77 ****
      protected IIndex loadBTree(IRawStore store, String name, long addr) {
          
!         return new MetadataIndex(this.store, BTreeMetadata.read(this.store, addr));
  
      }
--- 73,77 ----
      protected IIndex loadBTree(IRawStore store, String name, long addr) {
          
!         return (MetadataIndex)BTreeMetadata.load(this.store, addr);
  
      }

Index: SlaveJournal.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/scaleup/SlaveJournal.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SlaveJournal.java	10 Feb 2007 15:37:44 -0000	1.1
--- SlaveJournal.java	17 Feb 2007 21:34:21 -0000	1.2
***************
*** 71,75 ****
       * for the store.
       */
!     public static transient final int ROOT_NAME_2_METADATA_ADDR = 1;
      
      /**
--- 71,75 ----
       * for the store.
       */
!     public static transient final int ROOT_NAME_2_METADATA_ADDR = 2;
      
      /**
***************
*** 129,133 ****
          
          // the root address of the btree.
!         long addr = getAddr(ROOT_NAME_2_METADATA_ADDR);
  
          if (addr == 0L) {
--- 129,133 ----
          
          // the root address of the btree.
!         long addr = getRootAddr(ROOT_NAME_2_METADATA_ADDR);
  
          if (addr == 0L) {
***************
*** 148,153 ****
               */
  
!             name2MetadataAddr = new Name2MetadataAddr(this, BTreeMetadata
!                     .read(this, addr));
  
          }
--- 148,153 ----
               */
  
!             name2MetadataAddr = (Name2MetadataAddr)BTreeMetadata
!                     .load(this, addr);
  
          }

Index: PartitionedJournal.java
===================================================================
RCS file: /cvsroot/cweb/bigdata/src/java/com/bigdata/scaleup/PartitionedJournal.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** PartitionedJournal.java	15 Feb 2007 22:01:19 -0000	1.7
--- PartitionedJournal.java	17 Feb 2007 21:34:21 -0000	1.8
***************
*** 54,57 ****
--- 54,58 ----
  import java.util.Properties;
  
+ import com.bigdata.journal.CommitRecordIndex;
  import com.bigdata.journal.ICommitter;
  import com.bigdata.journal.IJournal;
***************
*** 608,611 ****
--- 609,617 ----
       * </p>
       * 
+      * FIXME handle the {@link CommitRecordIndex} during overflow. This can
+      * either be handled like the metadata indices (with a secondary index) or
+      * by extending the {@link CommitRecordIndex} so as to carry more
+      * information about {@link SlaveJournal} locations for commit records.
+      * 
       * @todo implement asynchronous overflow.
       * @todo implement using compacting merges only.
***************
*** 1163,1172 ****
      }
      
!     public void commit() {
!         slave.commit();
      }
  
!     public long getAddr(int rootSlot) {
!         return slave.getAddr(rootSlot);
      }
  
--- 1169,1178 ----
      }
      
!     public long commit() {
!         return slave.commit();
      }
  
!     public long getRootAddr(int rootSlot) {
!         return slave.getRootAddr(rootSlot);
      }