You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2010/07/23 22:35:33 UTC
svn commit: r967248 - in /cassandra/trunk: ./
src/java/org/apache/cassandra/db/ src/java/org/apache/cassandra/tools/
test/unit/org/apache/cassandra/io/sstable/
Author: jbellis
Date: Fri Jul 23 20:35:33 2010
New Revision: 967248
URL: http://svn.apache.org/viewvc?rev=967248&view=rev
Log:
{Min,Mean,Max}RowCompactedSize renamed to {Min,Mean,Max}RowSize. patch by jbellis
Modified:
cassandra/trunk/NEWS.txt
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java
cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java
cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
Modified: cassandra/trunk/NEWS.txt
URL: http://svn.apache.org/viewvc/cassandra/trunk/NEWS.txt?rev=967248&r1=967247&r2=967248&view=diff
==============================================================================
--- cassandra/trunk/NEWS.txt (original)
+++ cassandra/trunk/NEWS.txt Fri Jul 23 20:35:33 2010
@@ -50,6 +50,8 @@ JMX
---
- StreamingService moved from o.a.c.streaming to o.a.c.service
- GMFD renamed to GOSSIP_STAGE
+ - {Min,Mean,Max}RowCompactedSize renamed to {Min,Mean,Max}RowSize
+ since it no longer has to wait til compaction to be computed
Thrift API
----------
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=967248&r1=967247&r2=967248&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Fri Jul 23 20:35:33 2010
@@ -253,7 +253,7 @@ public class ColumnFamilyStore implement
}
}
- public long getMinRowCompactedSize()
+ public long getMinRowSize()
{
long min = 0;
for (SSTableReader sstable : ssTables_)
@@ -264,7 +264,7 @@ public class ColumnFamilyStore implement
return min;
}
- public long getMaxRowCompactedSize()
+ public long getMaxRowSize()
{
long max = 0;
for (SSTableReader sstable : ssTables_)
@@ -275,7 +275,7 @@ public class ColumnFamilyStore implement
return max;
}
- public long getMeanRowCompactedSize()
+ public long getMeanRowSize()
{
long sum = 0;
long count = 0;
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java?rev=967248&r1=967247&r2=967248&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java Fri Jul 23 20:35:33 2010
@@ -144,19 +144,19 @@ public interface ColumnFamilyStoreMBean
* return the size of the smallest compacted row
* @return
*/
- public long getMinRowCompactedSize();
+ public long getMinRowSize();
/**
* return the size of the largest compacted row
* @return
*/
- public long getMaxRowCompactedSize();
+ public long getMaxRowSize();
/**
* return the mean size of the rows compacted
* @return
*/
- public long getMeanRowCompactedSize();
+ public long getMeanRowSize();
public long getBloomFilterFalsePositives();
Modified: cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java?rev=967248&r1=967247&r2=967248&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java Fri Jul 23 20:35:33 2010
@@ -352,9 +352,9 @@ public class NodeCmd {
outs.println("\t\tRow cache: disabled");
}
- outs.println("\t\tCompacted row minimum size: " + cfstore.getMinRowCompactedSize());
- outs.println("\t\tCompacted row maximum size: " + cfstore.getMaxRowCompactedSize());
- outs.println("\t\tCompacted row mean size: " + cfstore.getMeanRowCompactedSize());
+ outs.println("\t\tCompacted row minimum size: " + cfstore.getMinRowSize());
+ outs.println("\t\tCompacted row maximum size: " + cfstore.getMaxRowSize());
+ outs.println("\t\tCompacted row mean size: " + cfstore.getMeanRowSize());
outs.println("");
}
Modified: cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java?rev=967248&r1=967247&r2=967248&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java Fri Jul 23 20:35:33 2010
@@ -3,7 +3,6 @@ package org.apache.cassandra.io.sstable;
import java.io.IOException;
import java.util.concurrent.ExecutionException;
import java.util.ArrayList;
-import java.util.Map;
import java.util.List;
import org.junit.Test;
@@ -14,7 +13,6 @@ import org.apache.cassandra.db.*;
import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
-import org.apache.cassandra.io.util.BufferedRandomAccessFile;
import org.apache.cassandra.io.util.FileDataInput;
import org.apache.cassandra.io.util.MmappedSegmentedFile;
import org.apache.cassandra.service.StorageService;
@@ -126,6 +124,6 @@ public class SSTableReaderTest extends C
rm.apply();
}
store.forceBlockingFlush();
- assert store.getMaxRowCompactedSize() != 0;
+ assert store.getMaxRowSize() != 0;
}
}