[Bigdata-commit] SF.net SVN: bigdata:[3806] branches/JOURNAL_HA_BRANCH/bigdata/src

[<mar...@us...>]

Revision: 3806
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3806&view=rev
Author:   martyncutcher
Date:     2010-10-18 12:32:05 +0000 (Mon, 18 Oct 2010)

Log Message:
-----------
Rationalise rootBlock syncronization to handle rollback correctly, and amend test code

Modified Paths:
--------------
    branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/RWStrategy.java
    branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractRestartSafeTestCase.java
    branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/rwstore/TestRWJournal.java

Modified: branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/RWStrategy.java
===================================================================
--- branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/RWStrategy.java	2010-10-18 12:03:54 UTC (rev 3805)
+++ branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/RWStrategy.java	2010-10-18 12:32:05 UTC (rev 3806)
@@ -447,6 +447,10 @@
 			
 			// Current rootBlock is retained
 			m_rb = rootBlock;
+			if (m_rb.isRootBlock0())
+				m_rb0 = m_rb;
+			else
+				m_rb1 = m_rb;
 
 		}
 
@@ -525,17 +529,6 @@
 		m_commitLock.lock();
 		try {
 			m_store.commitChanges(); // includes a force(false)
-			IRootBlockView rb = getRootBlock();
-			
-			writeRootBlock(rb, ForceEnum.No);
-	
-			m_rb = rb;
-			
-			if (m_rb.isRootBlock0()) {
-				m_rb0 = m_rb;
-			} else {
-				m_rb1 = m_rb;
-			}
 		} finally {
 			m_commitLock.unlock();
 		}

Modified: branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractRestartSafeTestCase.java
===================================================================
--- branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractRestartSafeTestCase.java	2010-10-18 12:03:54 UTC (rev 3805)
+++ branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/journal/AbstractRestartSafeTestCase.java	2010-10-18 12:32:05 UTC (rev 3806)
@@ -425,6 +425,9 @@
     public void test_closeForWrites() {
         
         Journal store = (Journal) getStore();
+        
+        if (store.getBufferStrategy() instanceof RWStrategy)
+        	return; // void test
 
         try {
 

Modified: branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/rwstore/TestRWJournal.java
===================================================================
--- branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/rwstore/TestRWJournal.java	2010-10-18 12:03:54 UTC (rev 3805)
+++ branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/rwstore/TestRWJournal.java	2010-10-18 12:32:05 UTC (rev 3806)
@@ -791,7 +791,7 @@
                 
                 System.out.println("Now commit to disk");
                 
-                bs.commit();
+                store.commit();
                 
                 // Now reset - clears writeCache and reinits from disk
                 rw.reset();
@@ -836,7 +836,7 @@
                 
                 System.out.println("Now commit to disk");
                 
-                bs.commit();
+                store.commit();
                               
                 // Now reset - clears writeCache and reinits from disk
                 rw.reset();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.