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 2011/09/08 19:36:27 UTC
svn commit: r1166822 - in /cassandra/trunk: ./
src/java/org/apache/cassandra/cache/ src/java/org/apache/cassandra/cli/
src/java/org/apache/cassandra/db/
src/java/org/apache/cassandra/db/compaction/
src/java/org/apache/cassandra/db/index/ test/unit/org/...
Author: jbellis
Date: Thu Sep 8 17:36:26 2011
New Revision: 1166822
URL: http://svn.apache.org/viewvc?rev=1166822&view=rev
Log:
remove isMajor compaction designation
patch by jbellis; reviewed by Tupshin Harper and Ben Coverston for CASSANDRA-3154
Added:
cassandra/trunk/src/java/org/apache/cassandra/db/compaction/OperationType.java
- copied, changed from r1166816, cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionType.java
Modified:
cassandra/trunk/CHANGES.txt
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/compaction/AbstractCompactionIterable.java
cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionController.java
cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java
cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionType.java
cassandra/trunk/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
cassandra/trunk/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java
cassandra/trunk/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java
Modified: cassandra/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1166822&r1=1166821&r2=1166822&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Thu Sep 8 17:36:26 2011
@@ -44,7 +44,7 @@
Thrift<->Avro conversion methods (CASSANDRA-3032)
* Add timeouts to client request schedulers (CASSANDRA-3079, 3096)
* Cli to use hashes rather than array of hashes for strategy options (CASSANDRA-3081)
- * LeveledCompactionStrategy (CASSANDRA-1608, 3085, 3110, 3087, 3145)
+ * LeveledCompactionStrategy (CASSANDRA-1608, 3085, 3110, 3087, 3145, 3154)
* Improvements of the CLI `describe` command (CASSANDRA-2630)
* reduce window where dropped CF sstables may not be deleted (CASSANDRA-2942)
* Expose gossip/FD info to JMX (CASSANDRA-2806)
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=1166822&r1=1166821&r2=1166822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cache/AutoSavingCache.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cache/AutoSavingCache.java Thu Sep 8 17:36:26 2011
@@ -37,7 +37,7 @@ import org.apache.cassandra.db.ColumnFam
import org.apache.cassandra.db.compaction.CompactionInfo;
import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.db.DecoratedKey;
-import org.apache.cassandra.db.compaction.CompactionType;
+import org.apache.cassandra.db.compaction.OperationType;
import org.apache.cassandra.io.util.*;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -207,14 +207,14 @@ public abstract class AutoSavingCache<K,
bytes += translateKey(key).remaining();
// an approximation -- the keyset can change while saving
estimatedTotalBytes = bytes;
- CompactionType type;
+ OperationType type;
if (cacheType == ColumnFamilyStore.CacheType.KEY_CACHE_TYPE)
- type = CompactionType.KEY_CACHE_SAVE;
+ type = OperationType.KEY_CACHE_SAVE;
else if (cacheType == ColumnFamilyStore.CacheType.ROW_CACHE_TYPE)
- type = CompactionType.ROW_CACHE_SAVE;
+ type = OperationType.ROW_CACHE_SAVE;
else
- type = CompactionType.UNKNOWN;
+ type = OperationType.UNKNOWN;
info = new CompactionInfo(this.hashCode(),
ksname,
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=1166822&r1=1166821&r2=1166822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java Thu Sep 8 17:36:26 2011
@@ -25,8 +25,6 @@ import java.nio.ByteBuffer;
import java.nio.charset.CharacterCodingException;
import java.util.*;
-import antlr.Token;
-
import com.google.common.base.Predicate;
import com.google.common.collect.Collections2;
import org.apache.commons.lang.StringUtils;
@@ -39,7 +37,7 @@ import org.apache.cassandra.config.Confi
import org.apache.cassandra.db.ColumnFamilyStoreMBean;
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.compaction.OperationType;
import org.apache.cassandra.db.marshal.*;
import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.locator.SimpleSnitch;
@@ -1874,7 +1872,7 @@ public class CliClient
for (CompactionInfo info : compactionManagerMBean.getCompactions())
{
// if ongoing compaction type is index build
- if (info.getTaskType() != CompactionType.INDEX_BUILD)
+ if (info.getTaskType() != OperationType.INDEX_BUILD)
continue;
sessionState.out.printf("%nCurrently building index %s, completed %d of %d bytes.%n",
info.getColumnFamily(),
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=1166822&r1=1166821&r2=1166822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Thu Sep 8 17:36:26 2011
@@ -31,6 +31,8 @@ import java.util.regex.Pattern;
import javax.management.MBeanServer;
import javax.management.ObjectName;
+import com.google.common.base.Equivalence;
+import com.google.common.base.Equivalences;
import com.google.common.collect.Iterables;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -940,11 +942,6 @@ public class ColumnFamilyStore implement
data.markCompacted(sstables);
}
- public boolean isCompleteSSTables(Set<SSTableReader> sstables)
- {
- return data.getSSTables().equals(sstables);
- }
-
public void replaceCompactedSSTables(Collection<SSTableReader> sstables, Iterable<SSTableReader> replacements)
{
data.replaceCompactedSSTables(sstables, replacements);
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java?rev=1166822&r1=1166821&r2=1166822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java Thu Sep 8 17:36:26 2011
@@ -20,14 +20,14 @@ public abstract class AbstractCompaction
private static Logger logger = LoggerFactory.getLogger(CompactionIterable.class);
- protected final CompactionType type;
+ protected final OperationType type;
protected final CompactionController controller;
protected long totalBytes;
protected volatile long bytesRead;
protected final Throttle throttle;
- public AbstractCompactionIterable(CompactionController controller, CompactionType type)
+ public AbstractCompactionIterable(CompactionController controller, OperationType type)
{
this.controller = controller;
this.type = type;
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionController.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionController.java?rev=1166822&r1=1166821&r2=1166822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionController.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionController.java Thu Sep 8 17:36:26 2011
@@ -31,7 +31,6 @@ import org.apache.cassandra.db.Decorated
import org.apache.cassandra.db.EchoedRow;
import org.apache.cassandra.io.sstable.SSTableIdentityIterator;
import org.apache.cassandra.io.sstable.SSTableReader;
-import org.apache.cassandra.utils.ByteBufferUtil;
/**
* Manage compaction options.
@@ -44,7 +43,6 @@ public class CompactionController
private final Set<SSTableReader> sstables;
private final boolean forceDeserialize;
- public final boolean isMajor;
public final int gcBefore;
public CompactionController(ColumnFamilyStore cfs, Collection<SSTableReader> sstables, int gcBefore, boolean forceDeserialize)
@@ -54,7 +52,6 @@ public class CompactionController
this.sstables = new HashSet<SSTableReader>(sstables);
this.gcBefore = gcBefore;
this.forceDeserialize = forceDeserialize;
- isMajor = cfs.isCompleteSSTables(this.sstables);
}
public String getKeyspace()
@@ -69,7 +66,7 @@ public class CompactionController
public boolean shouldPurge(DecoratedKey key)
{
- return isMajor || !cfs.isKeyInRemainingSSTables(key, sstables);
+ return !cfs.isKeyInRemainingSSTables(key, sstables);
}
public boolean needDeserialize()
@@ -96,11 +93,6 @@ public class CompactionController
ColumnFamilyStore.removeDeleted(cachedRow, gcBefore);
}
- public boolean isMajor()
- {
- return isMajor;
- }
-
/**
* @return an AbstractCompactedRow implementation to write the merged rows in question.
*
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java?rev=1166822&r1=1166821&r2=1166822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java Thu Sep 8 17:36:26 2011
@@ -28,11 +28,11 @@ public final class CompactionInfo implem
private final int id;
private final String ksname;
private final String cfname;
- private final CompactionType tasktype;
+ private final OperationType tasktype;
private final long bytesComplete;
private final long totalBytes;
- public CompactionInfo(int id, String ksname, String cfname, CompactionType tasktype, long bytesComplete, long totalBytes)
+ public CompactionInfo(int id, String ksname, String cfname, OperationType tasktype, long bytesComplete, long totalBytes)
{
this.id = id;
this.ksname = ksname;
@@ -73,7 +73,7 @@ public final class CompactionInfo implem
return totalBytes;
}
- public CompactionType getTaskType()
+ public OperationType getTaskType()
{
return tasktype;
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java?rev=1166822&r1=1166821&r2=1166822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java Thu Sep 8 17:36:26 2011
@@ -51,12 +51,12 @@ public class CompactionIterable extends
}
};
- public CompactionIterable(CompactionType type, Iterable<SSTableReader> sstables, CompactionController controller) throws IOException
+ public CompactionIterable(OperationType type, Iterable<SSTableReader> sstables, CompactionController controller) throws IOException
{
this(type, getScanners(sstables), controller);
}
- protected CompactionIterable(CompactionType type, List<SSTableScanner> scanners, CompactionController controller)
+ protected CompactionIterable(OperationType type, List<SSTableScanner> scanners, CompactionController controller)
{
super(controller, type);
this.scanners = scanners;
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionManager.java?rev=1166822&r1=1166821&r2=1166822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionManager.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionManager.java Thu Sep 8 17:36:26 2011
@@ -940,7 +940,7 @@ public class CompactionManager implement
{
public ValidationCompactionIterable(ColumnFamilyStore cfs, Collection<SSTableReader> sstables, Range range) throws IOException
{
- super(CompactionType.VALIDATION,
+ super(OperationType.VALIDATION,
getScanners(sstables, range),
new CompactionController(cfs, sstables, getDefaultGcBefore(cfs), true));
}
@@ -1097,7 +1097,7 @@ public class CompactionManager implement
return new CompactionInfo(this.hashCode(),
sstable.descriptor.ksname,
sstable.descriptor.cfname,
- CompactionType.CLEANUP,
+ OperationType.CLEANUP,
scanner.getFilePointer(),
scanner.getFileLength());
}
@@ -1125,7 +1125,7 @@ public class CompactionManager implement
return new CompactionInfo(this.hashCode(),
sstable.descriptor.ksname,
sstable.descriptor.cfname,
- CompactionType.SCRUB,
+ OperationType.SCRUB,
dataFile.getFilePointer(),
dataFile.length());
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionTask.java?rev=1166822&r1=1166821&r2=1166822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionTask.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionTask.java Thu Sep 8 17:36:26 2011
@@ -28,6 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.commons.lang.StringUtils;
+import com.sun.corba.se.spi.orb.Operation;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.DecoratedKey;
@@ -115,10 +116,7 @@ public class CompactionTask extends Abst
// new sstables from flush can be added during a compaction, but only the compaction can remove them,
// so in our single-threaded compaction world this is a valid way of determining if we're compacting
// all the sstables (that existed when we started)
- CompactionType type = controller.isMajor()
- ? CompactionType.MAJOR
- : CompactionType.MINOR;
- logger.info("Compacting {}: {}", type, toCompact);
+ logger.info("Compacting {}", toCompact);
long startTime = System.currentTimeMillis();
long totalkeysWritten = 0;
@@ -129,8 +127,8 @@ public class CompactionTask extends Abst
logger.debug("Expected bloom filter size : " + expectedBloomFilterSize);
AbstractCompactionIterable ci = DatabaseDescriptor.isMultithreadedCompaction()
- ? new ParallelCompactionIterable(type, toCompact, controller)
- : new CompactionIterable(type, toCompact, controller);
+ ? new ParallelCompactionIterable(OperationType.COMPACTION, toCompact, controller)
+ : new CompactionIterable(OperationType.COMPACTION, toCompact, controller);
CloseableIterator<AbstractCompactedRow> iter = ci.iterator();
Iterator<AbstractCompactedRow> nni = Iterators.filter(iter, Predicates.notNull());
Map<DecoratedKey, Long> cachedKeys = new HashMap<DecoratedKey, Long>();
Copied: cassandra/trunk/src/java/org/apache/cassandra/db/compaction/OperationType.java (from r1166816, cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionType.java)
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/compaction/OperationType.java?p2=cassandra/trunk/src/java/org/apache/cassandra/db/compaction/OperationType.java&p1=cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionType.java&r1=1166816&r2=1166822&rev=1166822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/compaction/CompactionType.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/compaction/OperationType.java Thu Sep 8 17:36:26 2011
@@ -21,22 +21,20 @@ package org.apache.cassandra.db.compacti
*/
-public enum CompactionType
+public enum OperationType
{
- MAJOR("Major"),
- MINOR("Minor"),
+ COMPACTION("Compaction"),
VALIDATION("Validation"),
KEY_CACHE_SAVE("Key cache save"),
ROW_CACHE_SAVE("Row cache save"),
CLEANUP("Cleanup"),
SCRUB("Scrub"),
INDEX_BUILD("Secondary index build"),
- SSTABLE_BUILD("SSTable build"),
UNKNOWN("Unkown compaction type");
private final String type;
- CompactionType(String type)
+ OperationType(String type)
{
this.type = type;
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java?rev=1166822&r1=1166821&r2=1166822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java Thu Sep 8 17:36:26 2011
@@ -62,17 +62,17 @@ public class ParallelCompactionIterable
private final List<SSTableScanner> scanners;
private final int maxInMemorySize;
- public ParallelCompactionIterable(CompactionType type, Iterable<SSTableReader> sstables, CompactionController controller) throws IOException
+ public ParallelCompactionIterable(OperationType type, Iterable<SSTableReader> sstables, CompactionController controller) throws IOException
{
this(type, getScanners(sstables), controller, DatabaseDescriptor.getInMemoryCompactionLimit() / Iterables.size(sstables));
}
- public ParallelCompactionIterable(CompactionType type, Iterable<SSTableReader> sstables, CompactionController controller, int maxInMemorySize) throws IOException
+ public ParallelCompactionIterable(OperationType type, Iterable<SSTableReader> sstables, CompactionController controller, int maxInMemorySize) throws IOException
{
this(type, getScanners(sstables), controller, maxInMemorySize);
}
- protected ParallelCompactionIterable(CompactionType type, List<SSTableScanner> scanners, CompactionController controller, int maxInMemorySize)
+ protected ParallelCompactionIterable(OperationType type, List<SSTableScanner> scanners, CompactionController controller, int maxInMemorySize)
{
super(controller, type);
this.scanners = scanners;
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java?rev=1166822&r1=1166821&r2=1166822&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java Thu Sep 8 17:36:26 2011
@@ -25,7 +25,7 @@ import org.apache.cassandra.db.ColumnFam
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.db.compaction.CompactionInfo;
-import org.apache.cassandra.db.compaction.CompactionType;
+import org.apache.cassandra.db.compaction.OperationType;
import org.apache.cassandra.io.sstable.ReducingKeyIterator;
/**
@@ -51,7 +51,7 @@ public class SecondaryIndexBuilder imple
return new CompactionInfo(this.hashCode(),
cfs.table.name,
cfs.columnFamily,
- CompactionType.INDEX_BUILD,
+ OperationType.INDEX_BUILD,
iter.getBytesRead(),
iter.getTotalBytes());
}
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=1166822&r1=1166821&r2=1166822&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java Thu Sep 8 17:36:26 2011
@@ -60,19 +60,19 @@ public class LazilyCompactedRowTest exte
Collection<SSTableReader> sstables = cfs.getSSTables();
// compare eager and lazy compactions
- AbstractCompactionIterable eager = new CompactionIterable(CompactionType.UNKNOWN,
+ AbstractCompactionIterable eager = new CompactionIterable(OperationType.UNKNOWN,
sstables,
new PreCompactingController(cfs, sstables, gcBefore, false));
- AbstractCompactionIterable lazy = new CompactionIterable(CompactionType.UNKNOWN,
+ AbstractCompactionIterable lazy = new CompactionIterable(OperationType.UNKNOWN,
sstables,
new LazilyCompactingController(cfs, sstables, gcBefore, false));
assertBytes(sstables, eager, lazy);
// compare eager and parallel-lazy compactions
- eager = new CompactionIterable(CompactionType.UNKNOWN,
+ eager = new CompactionIterable(OperationType.UNKNOWN,
sstables,
new PreCompactingController(cfs, sstables, gcBefore, false));
- AbstractCompactionIterable parallel = new ParallelCompactionIterable(CompactionType.UNKNOWN,
+ AbstractCompactionIterable parallel = new ParallelCompactionIterable(OperationType.UNKNOWN,
sstables,
new CompactionController(cfs, sstables, gcBefore, false),
0);
@@ -156,8 +156,8 @@ public class LazilyCompactedRowTest exte
private void assertDigest(ColumnFamilyStore cfs, int gcBefore) throws IOException, NoSuchAlgorithmException
{
Collection<SSTableReader> sstables = cfs.getSSTables();
- AbstractCompactionIterable ci1 = new CompactionIterable(CompactionType.UNKNOWN, sstables, new PreCompactingController(cfs, sstables, gcBefore, false));
- AbstractCompactionIterable ci2 = new CompactionIterable(CompactionType.UNKNOWN, sstables, new LazilyCompactingController(cfs, sstables, gcBefore, false));
+ AbstractCompactionIterable ci1 = new CompactionIterable(OperationType.UNKNOWN, sstables, new PreCompactingController(cfs, sstables, gcBefore, false));
+ AbstractCompactionIterable ci2 = new CompactionIterable(OperationType.UNKNOWN, sstables, new LazilyCompactingController(cfs, sstables, gcBefore, false));
CloseableIterator<AbstractCompactedRow> iter1 = ci1.iterator();
CloseableIterator<AbstractCompactedRow> iter2 = ci2.iterator();