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/06/05 16:42:07 UTC
svn commit: r1132426 - in /cassandra/branches/cassandra-0.8:
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/io/ src/ja...
Author: jbellis
Date: Sun Jun 5 14:42:06 2011
New Revision: 1132426
URL: http://svn.apache.org/viewvc?rev=1132426&view=rev
Log:
move CompactionIterator, CompactionManager, and the CompactedRow classes into the new compaction package
Added:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java
- copied, changed from r1131292, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/AbstractCompactedRow.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionController.java
- copied, changed from r1131292, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionController.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java
- copied, changed from r1131292, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionInfo.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java
- copied, changed from r1132420, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionIterator.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionType.java
- copied, changed from r1131292, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionType.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
- copied, changed from r1131292, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/LazilyCompactedRow.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
- copied, changed from r1131292, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/PrecompactedRow.java
Removed:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/AbstractCompactedRow.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionController.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionInfo.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionIterator.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionType.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/LazilyCompactedRow.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/PrecompactedRow.java
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/AutoSavingCache.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/EchoedRow.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Table.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AntiEntropyService.java
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/NodeCmd.java
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java
Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/AutoSavingCache.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/AutoSavingCache.java?rev=1132426&r1=1132425&r2=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/AutoSavingCache.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cache/AutoSavingCache.java Sun Jun 5 14:42:06 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.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/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java?rev=1132426&r1=1132425&r2=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java Sun Jun 5 14:42:06 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.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/branches/cassandra-0.8/src/java/org/apache/cassandra/db/EchoedRow.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/EchoedRow.java?rev=1132426&r1=1132425&r2=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/EchoedRow.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/EchoedRow.java Sun Jun 5 14:42:06 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/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Table.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Table.java?rev=1132426&r1=1132425&r2=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Table.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/Table.java Sun Jun 5 14:42:06 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;
Copied: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java (from r1131292, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/AbstractCompactedRow.java)
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java?p2=cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java&p1=cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/AbstractCompactedRow.java&r1=1131292&r2=1132426&rev=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/AbstractCompactedRow.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java Sun Jun 5 14:42:06 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.io;
+package org.apache.cassandra.db.compaction;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionController.java (from r1131292, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionController.java)
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionController.java?p2=cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionController.java&p1=cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionController.java&r1=1131292&r2=1132426&rev=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionController.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionController.java Sun Jun 5 14:42:06 2011
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.cassandra.io;
+package org.apache.cassandra.db.compaction;
import java.util.*;
@@ -29,7 +29,6 @@ import org.apache.cassandra.db.ColumnFam
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.db.EchoedRow;
-import org.apache.cassandra.io.sstable.Descriptor;
import org.apache.cassandra.io.sstable.SSTableIdentityIterator;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.utils.ByteBufferUtil;
Copied: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java (from r1131292, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionInfo.java)
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java?p2=cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java&p1=cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionInfo.java&r1=1131292&r2=1132426&rev=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionInfo.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java Sun Jun 5 14:42:06 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cassandra.io;
+package org.apache.cassandra.db.compaction;
import java.io.Serializable;
Copied: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java (from r1132420, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionIterator.java)
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java?p2=cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java&p1=cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionIterator.java&r1=1132420&r2=1132426&rev=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionIterator.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionIterator.java Sun Jun 5 14:42:06 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.io;
+package org.apache.cassandra.db.compaction;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -33,7 +33,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.db.compaction.CompactionManager;
import org.apache.cassandra.io.sstable.SSTableIdentityIterator;
import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.sstable.SSTableScanner;
Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionManager.java?rev=1132426&r1=1132425&r2=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionManager.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionManager.java Sun Jun 5 14:42:06 2011
@@ -44,7 +44,6 @@ import org.apache.cassandra.concurrent.N
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.*;
import org.apache.cassandra.dht.Range;
-import org.apache.cassandra.io.*;
import org.apache.cassandra.io.sstable.*;
import org.apache.cassandra.io.util.BufferedRandomAccessFile;
import org.apache.cassandra.io.util.FileUtils;
@@ -516,7 +515,7 @@ public class CompactionManager implement
* For internal use and testing only. The rest of the system should go through the submit* methods,
* which are properly serialized.
*/
- public int doCompactionWithoutSizeEstimation(ColumnFamilyStore cfs, Collection<SSTableReader> sstables, int gcBefore, String compactionFileLocation) throws IOException
+ int doCompactionWithoutSizeEstimation(ColumnFamilyStore cfs, Collection<SSTableReader> sstables, int gcBefore, String compactionFileLocation) throws IOException
{
// The collection of sstables passed may be empty (but not null); even if
// it is not empty, it may compact down to nothing if all rows are deleted.
@@ -630,26 +629,31 @@ public class CompactionManager implement
private void doScrub(ColumnFamilyStore cfs, Collection<SSTableReader> sstables) throws IOException
{
assert !cfs.isIndex();
-
for (final SSTableReader sstable : sstables)
- {
- logger.info("Scrubbing " + sstable);
- CompactionController controller = new CompactionController(cfs, Collections.singletonList(sstable), getDefaultGcBefore(cfs), true);
+ scrubOne(cfs, sstable);
+ }
- // Calculate the expected compacted filesize
- String compactionFileLocation = cfs.table.getDataFileLocation(sstable.length());
- if (compactionFileLocation == null)
- throw new IOException("disk full");
- int expectedBloomFilterSize = Math.max(DatabaseDescriptor.getIndexInterval(),
- (int)(SSTableReader.getApproximateKeyCount(Arrays.asList(sstable))));
+ private void scrubOne(ColumnFamilyStore cfs, SSTableReader sstable) throws IOException
+ {
+ logger.info("Scrubbing " + sstable);
+ CompactionController controller = new CompactionController(cfs, Collections.singletonList(sstable), getDefaultGcBefore(cfs), true);
- // loop through each row, deserializing to check for damage.
- // we'll also loop through the index at the same time, using the position from the index to recover if the
- // row header (key or data size) is corrupt. (This means our position in the index file will be one row
- // "ahead" of the data file.)
- final BufferedRandomAccessFile dataFile = BufferedRandomAccessFile.getUncachingReader(sstable.getFilename());
- String indexFilename = sstable.descriptor.filenameFor(Component.PRIMARY_INDEX);
- BufferedRandomAccessFile indexFile = BufferedRandomAccessFile.getUncachingReader(indexFilename);
+ // Calculate the expected compacted filesize
+ String compactionFileLocation = cfs.table.getDataFileLocation(sstable.length());
+ if (compactionFileLocation == null)
+ throw new IOException("disk full");
+ int expectedBloomFilterSize = Math.max(DatabaseDescriptor.getIndexInterval(),
+ (int)(SSTableReader.getApproximateKeyCount(Arrays.asList(sstable))));
+
+ // loop through each row, deserializing to check for damage.
+ // we'll also loop through the index at the same time, using the position from the index to recover if the
+ // row header (key or data size) is corrupt. (This means our position in the index file will be one row
+ // "ahead" of the data file.)
+ final BufferedRandomAccessFile dataFile = BufferedRandomAccessFile.getUncachingReader(sstable.getFilename());
+ String indexFilename = sstable.descriptor.filenameFor(Component.PRIMARY_INDEX);
+ BufferedRandomAccessFile indexFile = BufferedRandomAccessFile.getUncachingReader(indexFilename);
+ try
+ {
ByteBuffer nextIndexKey = ByteBufferUtil.readWithShortLength(indexFile);
{
// throw away variable so we don't have a side effect in the assert
@@ -788,6 +792,11 @@ public class CompactionManager implement
logger.info("Scrub of " + sstable + " complete; looks like all " + emptyRows + " rows were tombstoned");
}
}
+ finally
+ {
+ FileUtils.closeQuietly(dataFile);
+ FileUtils.closeQuietly(indexFile);
+ }
}
private void throwIfFatal(Throwable th)
@@ -1136,6 +1145,30 @@ public class CompactionManager implement
return executor.submit(runnable);
}
+ public Future<?> submitTruncate(final ColumnFamilyStore main, final long truncatedAt)
+ {
+ Runnable runnable = new WrappedRunnable()
+ {
+ public void runMayThrow() throws InterruptedException, IOException
+ {
+ for (ColumnFamilyStore cfs : main.concatWithIndexes())
+ {
+ List<SSTableReader> truncatedSSTables = new ArrayList<SSTableReader>();
+ for (SSTableReader sstable : cfs.getSSTables())
+ {
+ if (!sstable.newSince(truncatedAt))
+ truncatedSSTables.add(sstable);
+ }
+ cfs.markCompacted(truncatedSSTables);
+ }
+
+ main.invalidateRowCache();
+ }
+ };
+
+ return executor.submit(runnable);
+ }
+
private static int getDefaultGcBefore(ColumnFamilyStore cfs)
{
return cfs.isIndex()
Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java?rev=1132426&r1=1132425&r2=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java Sun Jun 5 14:42:06 2011
@@ -20,8 +20,6 @@ package org.apache.cassandra.db.compacti
import java.util.List;
-import org.apache.cassandra.io.CompactionInfo;
-
public interface CompactionManagerMBean
{
/** List of running compaction objects. */
Copied: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionType.java (from r1131292, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionType.java)
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionType.java?p2=cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionType.java&p1=cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionType.java&r1=1131292&r2=1132426&rev=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/CompactionType.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/CompactionType.java Sun Jun 5 14:42:06 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.io;
+package org.apache.cassandra.db.compaction;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java (from r1131292, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/LazilyCompactedRow.java)
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java?p2=cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java&p1=cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/LazilyCompactedRow.java&r1=1131292&r2=1132426&rev=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/LazilyCompactedRow.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java Sun Jun 5 14:42:06 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.io;
+package org.apache.cassandra.db.compaction;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -37,7 +37,6 @@ import org.apache.cassandra.db.ColumnInd
import org.apache.cassandra.db.CounterColumn;
import org.apache.cassandra.db.IColumn;
import org.apache.cassandra.db.marshal.AbstractType;
-import org.apache.cassandra.io.sstable.SSTable;
import org.apache.cassandra.io.sstable.SSTableIdentityIterator;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.io.util.IIterableColumns;
Copied: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java (from r1131292, cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/PrecompactedRow.java)
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java?p2=cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java&p1=cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/PrecompactedRow.java&r1=1131292&r2=1132426&rev=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/PrecompactedRow.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java Sun Jun 5 14:42:06 2011
@@ -1,4 +1,4 @@
-package org.apache.cassandra.io;
+package org.apache.cassandra.db.compaction;
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,12 +22,9 @@ package org.apache.cassandra.io;
import java.io.DataOutput;
-import java.io.IOError;
import java.io.IOException;
import java.security.MessageDigest;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,7 +34,6 @@ import org.apache.cassandra.db.ColumnFam
import org.apache.cassandra.db.ColumnIndexer;
import org.apache.cassandra.db.CounterColumn;
import org.apache.cassandra.db.DecoratedKey;
-import org.apache.cassandra.io.sstable.SSTable;
import org.apache.cassandra.io.sstable.SSTableIdentityIterator;
import org.apache.cassandra.io.util.DataOutputBuffer;
Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java?rev=1132426&r1=1132425&r2=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java Sun Jun 5 14:42:06 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/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AntiEntropyService.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AntiEntropyService.java?rev=1132426&r1=1132425&r2=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AntiEntropyService.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/AntiEntropyService.java Sun Jun 5 14:42:06 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;
@@ -40,9 +42,7 @@ import org.apache.cassandra.db.Decorated
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/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/NodeCmd.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/NodeCmd.java?rev=1132426&r1=1132425&r2=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/NodeCmd.java (original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/tools/NodeCmd.java Sun Jun 5 14:42:06 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;
@@ -41,7 +42,6 @@ import org.apache.cassandra.concurrent.I
import org.apache.cassandra.db.ColumnFamilyStoreMBean;
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/branches/cassandra-0.8/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java?rev=1132426&r1=1132425&r2=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java (original)
+++ cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/io/LazilyCompactedRowTest.java Sun Jun 5 14:42:06 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.compaction.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/branches/cassandra-0.8/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java?rev=1132426&r1=1132425&r2=1132426&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java (original)
+++ cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java Sun Jun 5 14:42:06 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;