bigdata-commit

[Bigdata-commit] SF.net SVN: bigdata:[3519] branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/ bigdata/journal/RWStrategy.java

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

Revision: 3519
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3519&view=rev
Author:   martyncutcher
Date:     2010-09-08 14:51:48 +0000 (Wed, 08 Sep 2010)

Log Message:
-----------
make reopen public for call from tests

Modified Paths:
--------------
    branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/RWStrategy.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-09-08 14:49:01 UTC (rev 3518)
+++ branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/RWStrategy.java	2010-09-08 14:51:48 UTC (rev 3519)
@@ -563,7 +563,7 @@
 	 * TODO: Modify so that current WriteCacheService is reset and re-used by new
 	 * store.
 	 */
-	protected void reopen() {
+	public void reopen() {
 		try {
 			log.warn("Request to reopen store after interrupt");
 


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

[Bigdata-commit] SF.net SVN: bigdata:[3795] branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/ bigdata/journal/RWStrategy.java

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

Revision: 3795
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3795&view=rev
Author:   martyncutcher
Date:     2010-10-14 11:33:31 +0000 (Thu, 14 Oct 2010)

Log Message:
-----------
Ensure both rootblocks are correctly initialized on a new RWStore

Modified Paths:
--------------
    branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/RWStrategy.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-14 08:54:19 UTC (rev 3794)
+++ branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/RWStrategy.java	2010-10-14 11:33:31 UTC (rev 3795)
@@ -115,6 +115,8 @@
 		m_store = new RWStore(m_fmv, false, quorum); // not read-only for now
 		m_open = true;
 		
+		m_rb = getRootBlock(); // ensure values correct from create/reopen
+		
 		m_rb0 = copyRootBlock(true);
 		m_rb1 = copyRootBlock(false);
 		


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

[Bigdata-commit] SF.net SVN: bigdata:[3893] branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/ bigdata/journal/RWStrategy.java

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

Revision: 3893
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3893&view=rev
Author:   thompsonbry
Date:     2010-11-04 15:23:28 +0000 (Thu, 04 Nov 2010)

Log Message:
-----------
javadoc

Modified Paths:
--------------
    branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/RWStrategy.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-11-04 15:01:43 UTC (rev 3892)
+++ branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/RWStrategy.java	2010-11-04 15:23:28 UTC (rev 3893)
@@ -40,6 +40,7 @@
 import com.bigdata.rawstore.AbstractRawStore;
 import com.bigdata.rawstore.IAddressManager;
 import com.bigdata.rwstore.IAllocationContext;
+import com.bigdata.rwstore.JournalShadow;
 import com.bigdata.rwstore.RWStore;
 import com.bigdata.rwstore.RWStore.StoreCounters;
 import com.bigdata.util.ChecksumError;
@@ -175,6 +176,15 @@
 	    
 	}
 
+    /**
+     * Overridden to integrate with the shadow allocator support of the
+     * {@link RWStore}. Shadow allocators may be used to isolate allocation
+     * changes (both allocating slots and releasing slots) across different
+     * processes.  
+     * 
+     * @see JournalShadow
+     */
+	@Override
 	public long write(final ByteBuffer data, final IAllocationContext context) {
 
         if (data == null)


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