svn commit: r1205413 - /cassandra/trunk/src/java/org/apache/cassandra/db/CollationController.java

[jbellis]

Author: jbellis
Date: Wed Nov 23 14:20:39 2011
New Revision: 1205413

URL: http://svn.apache.org/viewvc?rev=1205413&view=rev
Log:
fix post-review editing goof

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/db/CollationController.java

Modified: 
cassandra/trunk/src/java/org/apache/cassandra/db/CollationController.java
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/CollationController.java?rev=1205413&r1=1205412&r2=1205413&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/CollationController.java 
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/CollationController.java 
Wed Nov 23 14:20:39 2011
@@ -152,8 +152,8 @@ public class CollationController
             filter.collateColumns(returnCF, 
Collections.singletonList(toCollate), cfs.metadata.comparator, gcBefore);
             
             // "hoist up" the requested data into a more recent sstable
-            if (!cfs.isCompactionDisabled()
-                && cfs.getMinimumCompactionThreshold() > 0
+            if (sstablesIterated > cfs.getMinimumCompactionThreshold()
+                && !cfs.isCompactionDisabled()
                 && cfs.getCompactionStrategy() instanceof 
SizeTieredCompactionStrategy)
             {
                 RowMutation rm = new RowMutation(cfs.table.name, new 
Row(filter.key, returnCF.cloneMe()));