Author: jbellis Date: Sun Jun 5 14:44:07 2011 New Revision: 1132427 URL: http://svn.apache.org/viewvc?rev=1132427&view=rev Log: merge from 0.8
Added: cassandra/trunk/src/java/org/apache/cassandra/db/compaction/ - copied from r1132426, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/ cassandra/trunk/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java - copied unchanged from r1132426, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionController.java - copied unchanged from r1132426, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionController.java cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java - copied unchanged from r1132426, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java - copied unchanged from r1132426, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionManager.java - copied unchanged from r1132426, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionManager.java cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java - copied unchanged from r1132426, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionType.java - copied unchanged from r1132426, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionType.java cassandra/trunk/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java - copied unchanged from r1132426, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java cassandra/trunk/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java - copied unchanged from r1132426, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java cassandra/trunk/test/long/org/apache/cassandra/db/compaction/ - copied from r1132426, cassandra/branches/cassandra-0.8/test/long/org/apache/cassandra/db/compaction/ cassandra/trunk/test/long/org/apache/cassandra/db/compaction/LongCompactionSpeedTest.java - copied unchanged from r1132426, cassandra/branches/cassandra-0.8/test/long/org/apache/cassandra/db/compaction/LongCompactionSpeedTest.java Removed: cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManager.java cassandra/trunk/src/java/org/apache/cassandra/db/CompactionManagerMBean.java cassandra/trunk/src/java/org/apache/cassandra/io/AbstractCompactedRow.java cassandra/trunk/src/java/org/apache/cassandra/io/CompactionController.java cassandra/trunk/src/java/org/apache/cassandra/io/CompactionInfo.java cassandra/trunk/src/java/org/apache/cassandra/io/CompactionIterator.java cassandra/trunk/src/java/org/apache/cassandra/io/CompactionType.java cassandra/trunk/src/java/org/apache/cassandra/io/LazilyCompactedRow.java cassandra/trunk/src/java/org/apache/cassandra/io/PrecompactedRow.java cassandra/trunk/test/long/org/apache/cassandra/db/LongCompactionSpeedTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsPurgeTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/CompactionsTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/OneCompactionTest.java Modified: cassandra/trunk/ (props changed) cassandra/trunk/contrib/ (props changed) cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java (props changed) cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java (props changed) cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java (props changed) cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java (props changed) cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java (props changed) cassandra/trunk/src/java/org/apache/cassandra/cache/AutoSavingCache.java cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java cassandra/trunk/src/java/org/apache/cassandra/db/EchoedRow.java cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java cassandra/trunk/src/java/org/apache/cassandra/db/Table.java cassandra/trunk/src/java/org/apache/cassandra/db/migration/DropColumnFamily.java cassandra/trunk/src/java/org/apache/cassandra/db/migration/DropKeyspace.java cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java cassandra/trunk/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInSession.java cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java cassandra/trunk/src/java/org/apache/cassandra/utils/StatusLogger.java cassandra/trunk/test/unit/org/apache/cassandra/Util.java cassandra/trunk/test/unit/org/apache/cassandra/db/CleanupTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/KeyCacheTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/RowCacheTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/ScrubTest.java cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java cassandra/trunk/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableWriterCommutativeTest.java cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTest.java cassandra/trunk/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java cassandra/trunk/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java Propchange: cassandra/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 5 14:44:07 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1131291 /cassandra/branches/cassandra-0.7:1026516-1131292 /cassandra/branches/cassandra-0.7.0:1053690-1055654 -/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1132408 +/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1132426 /cassandra/branches/cassandra-0.8.0:1125021-1130369 /cassandra/branches/cassandra-0.8.1:1101014-1125018 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689 Propchange: cassandra/trunk/contrib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 5 14:44:07 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009 /cassandra/branches/cassandra-0.7/contrib:1026516-1131292 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654 -/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1132408 +/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1132426 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689 Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 5 14:44:07 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1131291 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1131292 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654 -/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1132408 +/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1132426 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1130369 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1125018 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689 Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 5 14:44:07 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1131291 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1131292 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1053690-1055654 -/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090934-1125013,1125019-1132408 +/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090934-1125013,1125019-1132426 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1125021-1130369 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1101014-1125018 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1051699-1053689 Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 5 14:44:07 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:922689-1052356,1052358-1053452,1053454,1053456-1131291 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1026516-1131292 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1053690-1055654 -/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1090934-1125013,1125019-1132408 +/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1090934-1125013,1125019-1132426 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1125021-1130369 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1101014-1125018 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java:1051699-1053689 Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 5 14:44:07 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:922689-1052356,1052358-1053452,1053454,1053456-1131291 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1026516-1131292 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1053690-1055654 -/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1090934-1125013,1125019-1132408 +/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1090934-1125013,1125019-1132426 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1125021-1130369 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1101014-1125018 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java:1051699-1053689 Propchange: cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 5 14:44:07 2011 @@ -1,7 +1,7 @@ /cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:922689-1052356,1052358-1053452,1053454,1053456-1131291 /cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1026516-1131292 /cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1053690-1055654 -/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1090934-1125013,1125019-1132408 +/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1090934-1125013,1125019-1132426 /cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1125021-1130369 /cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1101014-1125018 /cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java:1051699-1053689 Modified: cassandra/trunk/src/java/org/apache/cassandra/cache/AutoSavingCache.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cache/AutoSavingCache.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/cache/AutoSavingCache.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/cache/AutoSavingCache.java Sun Jun 5 14:44:07 2011 @@ -33,10 +33,10 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.CompactionManager; +import org.apache.cassandra.db.compaction.CompactionInfo; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.io.CompactionInfo; -import org.apache.cassandra.io.CompactionType; +import org.apache.cassandra.db.compaction.CompactionType; import org.apache.cassandra.io.util.BufferedRandomAccessFile; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.service.StorageService; Modified: cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java Sun Jun 5 14:44:07 2011 @@ -33,10 +33,10 @@ import org.antlr.runtime.tree.Tree; import org.apache.cassandra.auth.SimpleAuthenticator; import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.db.ColumnFamilyStoreMBean; -import org.apache.cassandra.db.CompactionManagerMBean; +import org.apache.cassandra.db.compaction.CompactionInfo; +import org.apache.cassandra.db.compaction.CompactionManagerMBean; +import org.apache.cassandra.db.compaction.CompactionType; import org.apache.cassandra.db.marshal.*; -import org.apache.cassandra.io.CompactionInfo; -import org.apache.cassandra.io.CompactionType; import org.apache.cassandra.locator.SimpleSnitch; import org.apache.cassandra.service.StorageProxy; import org.apache.cassandra.thrift.*; 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=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Sun Jun 5 14:44:07 2011 @@ -53,6 +53,7 @@ import org.apache.cassandra.config.Datab import org.apache.cassandra.db.columniterator.IColumnIterator; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.db.commitlog.ReplayPosition; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.filter.*; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.BytesType; @@ -923,7 +924,7 @@ public class ColumnFamilyStore implement * Add up all the files sizes this is the worst case file * size for compaction of all the list of files given. */ - long getExpectedCompactedFileSize(Iterable<SSTableReader> sstables) + public long getExpectedCompactedFileSize(Iterable<SSTableReader> sstables) { long expectedFileSize = 0; for (SSTableReader sstable : sstables) @@ -937,7 +938,7 @@ public class ColumnFamilyStore implement /* * Find the maximum size file in the list . */ - SSTableReader getMaxSizeFile(Iterable<SSTableReader> sstables) + public SSTableReader getMaxSizeFile(Iterable<SSTableReader> sstables) { long maxSize = 0L; SSTableReader maxFile = null; @@ -963,7 +964,7 @@ public class ColumnFamilyStore implement CompactionManager.instance.performScrub(ColumnFamilyStore.this); } - void markCompacted(Collection<SSTableReader> sstables) + public void markCompacted(Collection<SSTableReader> sstables) { data.markCompacted(sstables); } @@ -973,7 +974,7 @@ public class ColumnFamilyStore implement return data.getSSTables().equals(sstables); } - void replaceCompactedSSTables(Collection<SSTableReader> sstables, Iterable<SSTableReader> replacements) + public void replaceCompactedSSTables(Collection<SSTableReader> sstables, Iterable<SSTableReader> replacements) { data.replaceCompactedSSTables(sstables, replacements); } @@ -1054,7 +1055,7 @@ public class ColumnFamilyStore implement /** * Package protected for access from the CompactionManager. */ - DataTracker getDataTracker() + public DataTracker getDataTracker() { return data; } Modified: cassandra/trunk/src/java/org/apache/cassandra/db/EchoedRow.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/EchoedRow.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/db/EchoedRow.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/db/EchoedRow.java Sun Jun 5 14:44:07 2011 @@ -4,7 +4,7 @@ import java.io.DataOutput; import java.io.IOException; import java.security.MessageDigest; -import org.apache.cassandra.io.AbstractCompactedRow; +import org.apache.cassandra.db.compaction.AbstractCompactedRow; import org.apache.cassandra.io.sstable.SSTableIdentityIterator; /** Modified: cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java Sun Jun 5 14:44:07 2011 @@ -40,6 +40,7 @@ import javax.management.MBeanServer; import javax.management.ObjectName; import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.db.filter.QueryPath; import org.apache.cassandra.dht.IPartitioner; Modified: cassandra/trunk/src/java/org/apache/cassandra/db/Table.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/db/Table.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/db/Table.java Sun Jun 5 14:44:07 2011 @@ -36,12 +36,11 @@ import org.apache.cassandra.config.Confi import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.commitlog.CommitLog; -import org.apache.cassandra.db.commitlog.ReplayPosition; +import org.apache.cassandra.db.compaction.CompactionInfo; +import org.apache.cassandra.db.compaction.CompactionType; import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.db.filter.QueryPath; import org.apache.cassandra.dht.LocalToken; -import org.apache.cassandra.io.CompactionInfo; -import org.apache.cassandra.io.CompactionType; import org.apache.cassandra.io.sstable.ReducingKeyIterator; import org.apache.cassandra.io.sstable.SSTableDeletingReference; import org.apache.cassandra.io.sstable.SSTableReader; Modified: cassandra/trunk/src/java/org/apache/cassandra/db/migration/DropColumnFamily.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/migration/DropColumnFamily.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/db/migration/DropColumnFamily.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/db/migration/DropColumnFamily.java Sun Jun 5 14:44:07 2011 @@ -9,7 +9,7 @@ import org.apache.cassandra.config.Confi import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.CompactionManager; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.Table; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.UUIDGen; Modified: cassandra/trunk/src/java/org/apache/cassandra/db/migration/DropKeyspace.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/migration/DropKeyspace.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/db/migration/DropKeyspace.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/db/migration/DropKeyspace.java Sun Jun 5 14:44:07 2011 @@ -25,7 +25,7 @@ import org.apache.cassandra.config.Confi import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.CompactionManager; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.HintedHandOffManager; import org.apache.cassandra.db.Table; import org.apache.cassandra.utils.FBUtilities; Modified: cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java Sun Jun 5 14:44:07 2011 @@ -29,7 +29,7 @@ import java.util.Set; import com.google.common.collect.Sets; import org.apache.cassandra.db.commitlog.ReplayPosition; -import org.apache.cassandra.io.*; +import org.apache.cassandra.db.compaction.*; import org.apache.cassandra.utils.ByteBufferUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: cassandra/trunk/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java Sun Jun 5 14:44:07 2011 @@ -39,7 +39,7 @@ import org.apache.cassandra.config.CFMet import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.CompactionManager; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.SystemTable; import org.apache.cassandra.db.Table; import org.apache.cassandra.db.commitlog.CommitLog; Modified: cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/service/AntiEntropyService.java Sun Jun 5 14:44:07 2011 @@ -27,6 +27,8 @@ import java.util.concurrent.ConcurrentMa import java.util.concurrent.atomic.AtomicInteger; import com.google.common.base.Objects; + +import org.apache.cassandra.db.compaction.AbstractCompactedRow; import org.apache.cassandra.gms.Gossiper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,14 +37,12 @@ import org.apache.cassandra.concurrent.S import org.apache.cassandra.concurrent.StageManager; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.CompactionManager; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.Table; import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Token; import org.apache.cassandra.gms.FailureDetector; -import org.apache.cassandra.io.AbstractCompactedRow; import org.apache.cassandra.io.ICompactSerializer; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.net.CompactEndpointSerializationHelper; Modified: cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInSession.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInSession.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInSession.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInSession.java Sun Jun 5 14:44:07 2011 @@ -30,7 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.CompactionManager; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.Table; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.net.MessagingService; 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=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/tools/NodeCmd.java Sun Jun 5 14:44:07 2011 @@ -31,6 +31,7 @@ import java.util.*; import java.util.Map.Entry; import java.util.concurrent.ExecutionException; +import org.apache.cassandra.db.compaction.CompactionInfo; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.config.ConfigurationException; @@ -39,9 +40,8 @@ import org.apache.commons.cli.*; import org.apache.cassandra.cache.InstrumentingCacheMBean; import org.apache.cassandra.concurrent.IExecutorMBean; import org.apache.cassandra.db.ColumnFamilyStoreMBean; -import org.apache.cassandra.db.CompactionManagerMBean; +import org.apache.cassandra.db.compaction.CompactionManagerMBean; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.io.CompactionInfo; import org.apache.cassandra.net.MessagingServiceMBean; import org.apache.cassandra.utils.EstimatedHistogram; Modified: cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/tools/NodeProbe.java Sun Jun 5 14:44:07 2011 @@ -45,8 +45,8 @@ import org.apache.cassandra.cache.Instru import org.apache.cassandra.concurrent.IExecutorMBean; import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.db.ColumnFamilyStoreMBean; -import org.apache.cassandra.db.CompactionManager; -import org.apache.cassandra.db.CompactionManagerMBean; +import org.apache.cassandra.db.compaction.CompactionManager; +import org.apache.cassandra.db.compaction.CompactionManagerMBean; import org.apache.cassandra.dht.Token; import org.apache.cassandra.locator.EndpointSnitchInfoMBean; import org.apache.cassandra.net.MessagingServiceMBean; Modified: cassandra/trunk/src/java/org/apache/cassandra/utils/StatusLogger.java URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/utils/StatusLogger.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/src/java/org/apache/cassandra/utils/StatusLogger.java (original) +++ cassandra/trunk/src/java/org/apache/cassandra/utils/StatusLogger.java Sun Jun 5 14:44:07 2011 @@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.concurrent.IExecutorMBean; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.CompactionManager; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.net.MessagingService; public class StatusLogger Modified: cassandra/trunk/test/unit/org/apache/cassandra/Util.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/Util.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/Util.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/Util.java Sun Jun 5 14:44:07 2011 @@ -31,6 +31,7 @@ import java.util.concurrent.ExecutionExc import java.util.concurrent.Future; import org.apache.cassandra.db.*; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.db.filter.QueryPath; Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/CleanupTest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/CleanupTest.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/db/CleanupTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/db/CleanupTest.java Sun Jun 5 14:44:07 2011 @@ -34,6 +34,7 @@ import org.junit.Test; import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.Util; import org.apache.cassandra.config.ConfigurationException; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.filter.IFilter; import org.apache.cassandra.db.filter.QueryPath; Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/KeyCacheTest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/KeyCacheTest.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/db/KeyCacheTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/db/KeyCacheTest.java Sun Jun 5 14:44:07 2011 @@ -31,6 +31,7 @@ import org.junit.Test; import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.Util; import org.apache.cassandra.db.filter.QueryPath; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Pair; Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java Sun Jun 5 14:44:07 2011 @@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory; import static org.apache.cassandra.Util.column; import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.Util; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.utils.ByteBufferUtil; Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java Sun Jun 5 14:44:07 2011 @@ -28,6 +28,7 @@ import static org.junit.Assert.assertNul import static org.junit.Assert.assertEquals; import org.apache.cassandra.Util; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.db.filter.QueryPath; import static org.apache.cassandra.Util.addMutation; Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/RowCacheTest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/RowCacheTest.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/db/RowCacheTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/db/RowCacheTest.java Sun Jun 5 14:44:07 2011 @@ -26,6 +26,7 @@ import org.junit.Test; import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.Util; import org.apache.cassandra.db.filter.QueryPath; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.utils.ByteBufferUtil; public class RowCacheTest extends CleanupHelper Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/ScrubTest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/ScrubTest.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/db/ScrubTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/db/ScrubTest.java Sun Jun 5 14:44:07 2011 @@ -33,6 +33,7 @@ import org.apache.cassandra.Util; import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.CLibrary; Modified: cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/db/TableTest.java Sun Jun 5 14:44:07 2011 @@ -33,6 +33,7 @@ import org.junit.Test; import static junit.framework.Assert.*; import org.apache.cassandra.CleanupHelper; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.utils.WrappedRunnable; import static org.apache.cassandra.Util.column; Modified: cassandra/trunk/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java Sun Jun 5 14:44:07 2011 @@ -35,7 +35,7 @@ import org.apache.cassandra.CleanupHelpe import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamily; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.CompactionManager; +import org.apache.cassandra.db.compaction.*; import org.apache.cassandra.db.IColumn; import org.apache.cassandra.db.RowMutation; import org.apache.cassandra.db.Table; 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=1132427&r1=1132426&r2=1132427&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 Sun Jun 5 14:44:07 2011 @@ -33,6 +33,7 @@ import org.junit.Test; import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.*; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.filter.QueryPath; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; Modified: cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableWriterCommutativeTest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableWriterCommutativeTest.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableWriterCommutativeTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableWriterCommutativeTest.java Sun Jun 5 14:44:07 2011 @@ -35,6 +35,7 @@ import java.util.concurrent.ExecutionExc import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.Util; import org.apache.cassandra.db.*; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.context.CounterContext; import org.apache.cassandra.db.marshal.CounterColumnType; import org.apache.cassandra.io.util.BufferedRandomAccessFile; Modified: cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTest.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTest.java Sun Jun 5 14:44:07 2011 @@ -33,6 +33,7 @@ import java.util.concurrent.ExecutionExc import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.db.*; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.filter.IFilter; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.filter.QueryPath; Modified: cassandra/trunk/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java Sun Jun 5 14:44:07 2011 @@ -26,21 +26,17 @@ import java.util.concurrent.ThreadPoolEx import org.junit.After; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.Util; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.concurrent.StageManager; -import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.*; -import org.apache.cassandra.db.filter.QueryPath; +import org.apache.cassandra.db.compaction.PrecompactedRow; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.io.PrecompactedRow; -import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.locator.AbstractReplicationStrategy; import org.apache.cassandra.locator.TokenMetadata; Modified: cassandra/trunk/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java URL: http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java?rev=1132427&r1=1132426&r2=1132427&view=diff ============================================================================== --- cassandra/trunk/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java (original) +++ cassandra/trunk/test/unit/org/apache/cassandra/streaming/StreamingTransferTest.java Sun Jun 5 14:44:07 2011 @@ -30,6 +30,7 @@ import org.apache.cassandra.CleanupHelpe import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.*; +import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.filter.IFilter; import org.apache.cassandra.db.filter.QueryFilter;