svn commit: r818517 - in /incubator/cassandra/trunk: src/java/org/apache/cassandra/db/ test/unit/org/apache/cassandra/db/

[jbellis]

Author: jbellis
Date: Thu Sep 24 15:32:21 2009
New Revision: 818517

URL: http://svn.apache.org/viewvc?rev=818517&view=rev
Log:
remove unused skip argument from anticompaction. change HHM to perform a major 
compaction instead of anticompaction since that's really what we want there
patch by jbellis; reviewed by junrao for CASSANDRA-454

Modified:
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
    
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
    incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
    
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/BootstrapTest.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=818517&r1=818516&r2=818517&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
 Thu Sep 24 15:32:21 2009
@@ -270,7 +270,7 @@
      * This method forces a compaction of the SSTables on disk. We wait
      * for the process to complete by waiting on a future pointer.
     */
-    List<SSTableReader> forceAntiCompaction(List<Range> ranges, EndPoint 
target, long skip)
+    List<SSTableReader> forceAntiCompaction(List<Range> ranges, EndPoint 
target)
     {
         assert ranges != null;
         Future<List<SSTableReader>> futurePtr = 
CompactionManager.instance().submit(ColumnFamilyStore.this, ranges, target);

Modified: 
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java?rev=818517&r1=818516&r2=818517&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
 (original)
+++ 
incubator/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
 Thu Sep 24 15:32:21 2009
@@ -187,7 +187,7 @@
             }
         }
         hintStore.forceFlush();
-        hintStore.forceAntiCompaction(null, null, 0);
+        hintStore.doMajorCompaction(0);
 
         if (logger_.isDebugEnabled())
           logger_.debug("Finished deliverAllHints");

Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java?rev=818517&r1=818516&r2=818517&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java 
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java Thu 
Sep 24 15:32:21 2009
@@ -475,7 +475,7 @@
                 continue;
             
             ColumnFamilyStore cfStore = columnFamilyStores_.get( columnFamily 
);
-            allResults.addAll(cfStore.forceAntiCompaction(ranges, target, 0));
+            allResults.addAll(cfStore.forceAntiCompaction(ranges, target));
         }
         return allResults;
     }

Modified: 
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/BootstrapTest.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/BootstrapTest.java?rev=818517&r1=818516&r2=818517&view=diff
==============================================================================
--- 
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/BootstrapTest.java 
(original)
+++ 
incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/BootstrapTest.java 
Thu Sep 24 15:32:21 2009
@@ -61,7 +61,7 @@
         Range r = new Range(partitioner.getToken("0"), 
partitioner.getToken("zzzzzzz"));
         ranges.add(r);
 
-        List<SSTableReader> fileList = store.forceAntiCompaction(ranges, new 
EndPoint("127.0.0.1", 9150), 0);
+        List<SSTableReader> fileList = store.forceAntiCompaction(ranges, new 
EndPoint("127.0.0.1", 9150));
         assert fileList.size() >= 1;
     }