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 2009/12/07 23:50:32 UTC
svn commit: r888169 -
/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Author: jbellis
Date: Mon Dec 7 22:50:31 2009
New Revision: 888169
URL: http://svn.apache.org/viewvc?rev=888169&view=rev
Log:
minor CFS cleanup. patch by Stu Hood; reviewed by jbellis for CASSANDRA-520
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=888169&r1=888168&r2=888169&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Mon Dec 7 22:50:31 2009
@@ -593,8 +593,7 @@
* 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 @@
{
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 @@
{
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());