[Bigdata-commit] SF.net SVN: bigdata:[7605] branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/ com/bigdata/rwstore/RWStore.java

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

Revision: 7605
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7605&view=rev
Author:   thompsonbry
Date:     2013-12-04 14:21:36 +0000 (Wed, 04 Dec 2013)
Log Message:
-----------
Possible bug fix for #778 from Martyn.  The metabit addr was being incorrectly calculated in RWStore.postHACommit() at line 6239.

was:
{{{
final int metaBit = (i * cDefaultMetaBitsSize * 32) + (j * 32) + b;
}}}

now:
{{{
final int metaBit = ((i + j) * 32) + b;
}}}

Modified Paths:
--------------
    branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/rwstore/RWStore.java

Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/rwstore/RWStore.java
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/rwstore/RWStore.java	2013-12-03 21:27:25 UTC (rev 7604)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata/src/java/com/bigdata/rwstore/RWStore.java	2013-12-04 14:21:36 UTC (rev 7605)
@@ -6252,12 +6252,9 @@
 	                
 	                m_committedNextAllocation = m_nextAllocation;
 	        
-	                final long savedMetaBitsAddr = m_metaBitsAddr;
 	                // latched offset of the metabits region.
 	                m_metaBitsAddr = -(int) nxtOffset;
 	                
-	                if (savedMetaBitsAddr != m_metaBitsAddr)
-	                	log.warn("Old metaBitsAddr: " + savedMetaBitsAddr + ", new metaBitsAddr: " + m_metaBitsAddr);
                 }
                 
                 final ArrayList<FixedAllocator> nallocs = new ArrayList<FixedAllocator>();
@@ -6326,7 +6323,8 @@
                                     log.trace("Allocator at: " + paddr);
                                 
                                 // metaBit
-                                final int metaBit = (i * cDefaultMetaBitsSize * 32) + (j * 32) + b;
+//                                final int metaBit = (i * cDefaultMetaBitsSize * 32) + (j * 32) + b;
+                                final int metaBit = ((i + j) * 32) + b;
                                 
                                 // Now try to read it in
                                 final FixedAllocator nalloc = readAllocator(paddr);

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