natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor CFS cleanup. patch by Stu Hood; reviewed by jbellis for CASSANDRA-520 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@888169 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-12-07 22:50:31 +00:00
parent 4a6b002090
commit c8664861b7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
View File

@ -593,8 +593,7 @@ public final class ColumnFamilyStore implements ColumnFamilyStoreMBean
* onMemtableFlush() need not be invoked.
*
* param @ filename - filename just flushed to disk
* param @ bf - bloom filter which indicates the keys that are in this file.
*/
*/
public void addSSTable(SSTableReader sstable)
{
ssTables_.add(sstable);
@ -802,6 +801,11 @@ public final class ColumnFamilyStore implements ColumnFamilyStoreMBean
{
throw new UnsupportedOperationException("disk full");
}
if (target != null)
{
// compacting for streaming: send to subdirectory
compactionFileLocation = compactionFileLocation + File.separator + DatabaseDescriptor.STREAMING_SUBDIR;
}
List<SSTableReader> results = new ArrayList<SSTableReader>();
long startTime = System.currentTimeMillis();
@ -829,10 +833,6 @@ public final class ColumnFamilyStore implements ColumnFamilyStoreMBean
{
if (writer == null)
{
if (target != null)
{
compactionFileLocation = compactionFileLocation + File.separator + DatabaseDescriptor.STREAMING_SUBDIR;
}
FileUtils.createDirectory(compactionFileLocation);
String newFilename = new File(compactionFileLocation, getTempSSTableFileName()).getAbsolutePath();
writer = new SSTableWriter(newFilename, expectedBloomFilterSize, StorageService.getPartitioner());