You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2010/03/12 06:01:17 UTC
svn commit: r922139 - in
/hadoop/hbase/branches/0.20/src/contrib/indexed/src/java/org/apache/hadoop/hbase/regionserver:
CompleteIndex.java idx/support/sets/BitSet.java
Author: stack
Date: Fri Mar 12 05:01:16 2010
New Revision: 922139
URL: http://svn.apache.org/viewvc?rev=922139&view=rev
Log:
HBASE-2311 Not having assertions enabled causes index contrib tests to fail -- part2... fixes for 32bit jvm up on hudson
Modified:
hadoop/hbase/branches/0.20/src/contrib/indexed/src/java/org/apache/hadoop/hbase/regionserver/CompleteIndex.java
hadoop/hbase/branches/0.20/src/contrib/indexed/src/java/org/apache/hadoop/hbase/regionserver/idx/support/sets/BitSet.java
Modified: hadoop/hbase/branches/0.20/src/contrib/indexed/src/java/org/apache/hadoop/hbase/regionserver/CompleteIndex.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/contrib/indexed/src/java/org/apache/hadoop/hbase/regionserver/CompleteIndex.java?rev=922139&r1=922138&r2=922139&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/contrib/indexed/src/java/org/apache/hadoop/hbase/regionserver/CompleteIndex.java (original)
+++ hadoop/hbase/branches/0.20/src/contrib/indexed/src/java/org/apache/hadoop/hbase/regionserver/CompleteIndex.java Fri Mar 12 05:01:16 2010
@@ -36,7 +36,7 @@ class CompleteIndex implements IdxIndex
* The fixed part in the heap size calcualtion.
*/
static final long FIXED_SIZE = ClassSize.align(ClassSize.OBJECT +
- 2 * ClassSize.REFERENCE + 3 * (ClassSize.ARRAY + ClassSize.REFERENCE) +
+ 5 * ClassSize.REFERENCE + ClassSize.align(3 * ClassSize.ARRAY) +
Bytes.SIZEOF_LONG + 2 * Bytes.SIZEOF_INT
);
Modified: hadoop/hbase/branches/0.20/src/contrib/indexed/src/java/org/apache/hadoop/hbase/regionserver/idx/support/sets/BitSet.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/contrib/indexed/src/java/org/apache/hadoop/hbase/regionserver/idx/support/sets/BitSet.java?rev=922139&r1=922138&r2=922139&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/contrib/indexed/src/java/org/apache/hadoop/hbase/regionserver/idx/support/sets/BitSet.java (original)
+++ hadoop/hbase/branches/0.20/src/contrib/indexed/src/java/org/apache/hadoop/hbase/regionserver/idx/support/sets/BitSet.java Fri Mar 12 05:01:16 2010
@@ -43,7 +43,7 @@ class BitSet extends IntSetBase {
* The fixed part in the heap size calcualtion.
*/
static final int FIXED_SIZE = ClassSize.align(ClassSize.OBJECT +
- Bytes.SIZEOF_INT * 4 + ClassSize.ARRAY +
+ Bytes.SIZEOF_INT * 4 + ClassSize.align(ClassSize.ARRAY) +
ClassSize.REFERENCE + Bytes.SIZEOF_LONG);
/**