Author: jbellis
Date: Tue Oct 5 16:39:37 2010
New Revision: 1004704
URL: http://svn.apache.org/viewvc?rev=1004704&view=rev
Log:
fix build
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTable.java
Modified:
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1004704&r1=1004703&r2=1004704&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Tue
Oct 5 16:39:37 2010
@@ -59,7 +59,10 @@ import org.apache.cassandra.service.Stor
import org.apache.cassandra.thrift.IndexClause;
import org.apache.cassandra.thrift.IndexExpression;
import org.apache.cassandra.thrift.IndexOperator;
-import org.apache.cassandra.utils.*;
+import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.LatencyTracker;
+import org.apache.cassandra.utils.Pair;
+import org.apache.cassandra.utils.WrappedRunnable;
public class ColumnFamilyStore implements ColumnFamilyStoreMBean
{
@@ -275,8 +278,8 @@ public class ColumnFamilyStore implement
long min = 0;
for (SSTableReader sstable : ssTables)
{
- if (min == 0 || sstable.estimatedRowSize.min() < min)
- min = sstable.estimatedRowSize.min();
+ if (min == 0 || sstable.getEstimatedRowSize().min() < min)
+ min = sstable.getEstimatedRowSize().min();
}
return min;
}
@@ -286,8 +289,8 @@ public class ColumnFamilyStore implement
long max = 0;
for (SSTableReader sstable : ssTables)
{
- if (sstable.estimatedRowSize.max() > max)
- max = sstable.estimatedRowSize.max();
+ if (sstable.getEstimatedRowSize().max() > max)
+ max = sstable.getEstimatedRowSize().max();
}
return max;
}
@@ -298,7 +301,7 @@ public class ColumnFamilyStore implement
long count = 0;
for (SSTableReader sstable : ssTables)
{
- sum += sstable.estimatedRowSize.median();
+ sum += sstable.getEstimatedRowSize().median();
count++;
}
return count > 0 ? sum / count : 0;
@@ -310,7 +313,7 @@ public class ColumnFamilyStore implement
int count = 0;
for (SSTableReader sstable : ssTables)
{
- sum += sstable.estimatedColumnCount.median();
+ sum += sstable.getEstimatedColumnCount().median();
count++;
}
return count > 0 ? (int) (sum / count) : 0;
Modified: cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTable.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTable.java?rev=1004704&r1=1004703&r2=1004704&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTable.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTable.java Tue
Oct 5 16:39:37 2010
@@ -66,8 +66,8 @@ public abstract class SSTable
public final CFMetaData metadata;
public final IPartitioner partitioner;
- public final EstimatedHistogram estimatedRowSize = new
EstimatedHistogram(150);
- public final EstimatedHistogram estimatedColumnCount = new
EstimatedHistogram(114);
+ protected EstimatedHistogram estimatedRowSize = new
EstimatedHistogram(150);
+ protected EstimatedHistogram estimatedColumnCount = new
EstimatedHistogram(114);
protected SSTable(Descriptor descriptor, CFMetaData metadata, IPartitioner
partitioner)
{
@@ -82,6 +82,16 @@ public abstract class SSTable
this.partitioner = partitioner;
}
+ public EstimatedHistogram getEstimatedRowSize()
+ {
+ return estimatedRowSize;
+ }
+
+ public EstimatedHistogram getEstimatedColumnCount()
+ {
+ return estimatedColumnCount;
+ }
+
/**
* We use a ReferenceQueue to manage deleting files that have been
compacted
* and for which no more SSTable references exist. But this is not
guaranteed
