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 2010/12/23 20:09:47 UTC
svn commit: r1052357 [2/3] - in
/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra: auth/ cli/
client/ concurrent/ config/ db/ db/commitlog/ db/filter/ db/marshal/ dht/
gms/ hadoop/ io/ io/util/ locator/ net/ net/sink/ service/ streaming/ ...
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java Thu Dec 23 19:09:43 2010
@@ -21,11 +21,6 @@ package org.apache.cassandra.gms;
*/
-import org.apache.cassandra.net.IVerbHandler;
-import org.apache.cassandra.net.Message;
-import org.apache.cassandra.net.MessagingService;
-import org.apache.log4j.Logger;
-
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
@@ -34,6 +29,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.log4j.Logger;
+
+import org.apache.cassandra.net.IVerbHandler;
+import org.apache.cassandra.net.Message;
+import org.apache.cassandra.net.MessagingService;
+
public class GossipDigestAckVerbHandler implements IVerbHandler
{
private static Logger logger_ = Logger.getLogger(GossipDigestAckVerbHandler.class);
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java Thu Dec 23 19:09:43 2010
@@ -21,13 +21,17 @@ package org.apache.cassandra.gms;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.util.*;
+import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.Map.Entry;
+import org.apache.log4j.Logger;
+
import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.net.CompactEndPointSerializationHelper;
-import java.net.InetAddress;
-import org.apache.log4j.Logger;
/**
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java Thu Dec 23 19:09:43 2010
@@ -21,18 +21,19 @@ package org.apache.cassandra.gms;
*/
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.net.IVerbHandler;
-import org.apache.cassandra.net.Message;
-import org.apache.cassandra.net.MessagingService;
-import org.apache.log4j.Logger;
-
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
import java.net.InetAddress;
import java.util.*;
+import org.apache.log4j.Logger;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.net.IVerbHandler;
+import org.apache.cassandra.net.Message;
+import org.apache.cassandra.net.MessagingService;
+
public class GossipDigestSynVerbHandler implements IVerbHandler
{
private static Logger logger_ = Logger.getLogger( GossipDigestSynVerbHandler.class);
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/Gossiper.java Thu Dec 23 19:09:43 2010
@@ -18,10 +18,14 @@
package org.apache.cassandra.gms;
-import java.io.*;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.InetAddress;
import java.util.*;
import java.util.Map.Entry;
-import java.net.InetAddress;
+
+import org.apache.log4j.Logger;
import org.apache.cassandra.concurrent.StageManager;
import org.apache.cassandra.config.DatabaseDescriptor;
@@ -29,8 +33,6 @@ import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.service.StorageService;
-import org.apache.log4j.Logger;
-
/**
* This module is responsible for Gossiping information for the local endpoint. This abstraction
* maintains the list of live and dead endpoints. Periodically i.e. every 1 second this module
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossiperJoinVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossiperJoinVerbHandler.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossiperJoinVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/GossiperJoinVerbHandler.java Thu Dec 23 19:09:43 2010
@@ -21,16 +21,17 @@ package org.apache.cassandra.gms;
*/
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.net.IVerbHandler;
-import org.apache.cassandra.net.Message;
-import org.apache.log4j.Logger;
-
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOException;
import java.net.InetAddress;
+import org.apache.log4j.Logger;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.net.IVerbHandler;
+import org.apache.cassandra.net.Message;
+
public class GossiperJoinVerbHandler implements IVerbHandler
{
private static Logger logger_ = Logger.getLogger( GossiperJoinVerbHandler.class);
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/JoinMessage.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/JoinMessage.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/JoinMessage.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/JoinMessage.java Thu Dec 23 19:09:43 2010
@@ -21,7 +21,6 @@ package org.apache.cassandra.gms;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.util.List;
import org.apache.cassandra.io.ICompactSerializer;
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/PureRandom.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/PureRandom.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/PureRandom.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/gms/PureRandom.java Thu Dec 23 19:09:43 2010
@@ -18,8 +18,8 @@
package org.apache.cassandra.gms;
-import java.util.Random;
import java.util.BitSet;
+import java.util.Random;
/**
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java Thu Dec 23 19:09:43 2010
@@ -31,12 +31,10 @@ import java.util.TreeMap;
import com.google.common.collect.AbstractIterator;
-import org.apache.cassandra.db.*;
+import org.apache.cassandra.db.IColumn;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.thrift.*;
-import org.apache.cassandra.thrift.Column;
-import org.apache.cassandra.thrift.SuperColumn;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Pair;
import org.apache.hadoop.conf.Configuration;
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/hadoop/ColumnFamilySplit.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/hadoop/ColumnFamilySplit.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/hadoop/ColumnFamilySplit.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/hadoop/ColumnFamilySplit.java Thu Dec 23 19:09:43 2010
@@ -26,14 +26,8 @@ import java.io.DataOutput;
import java.io.IOException;
import java.util.Arrays;
-import org.apache.cassandra.dht.Token;
-import org.apache.cassandra.thrift.SlicePredicate;
-import org.apache.cassandra.utils.FBUtilities;
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.mapreduce.InputSplit;
-import org.apache.thrift.TDeserializer;
-import org.apache.thrift.TSerializer;
-import org.apache.thrift.protocol.TBinaryProtocol;
public class ColumnFamilySplit extends InputSplit implements Writable
{
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/CompactionIterator.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/CompactionIterator.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/CompactionIterator.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/CompactionIterator.java Thu Dec 23 19:09:43 2010
@@ -22,23 +22,19 @@ package org.apache.cassandra.io;
import java.io.Closeable;
-import java.io.IOException;
import java.io.IOError;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Iterator;
+import java.io.IOException;
+import java.util.*;
import org.apache.log4j.Logger;
import org.apache.commons.collections.iterators.CollatingIterator;
-import org.apache.cassandra.utils.ReducingIterator;
-import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.db.ColumnFamily;
-import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.db.ColumnFamilyStore;
+import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.io.util.DataOutputBuffer;
+import org.apache.cassandra.utils.FBUtilities;
+import org.apache.cassandra.utils.ReducingIterator;
public class CompactionIterator extends ReducingIterator<IteratingRow, CompactionIterator.CompactedRow> implements Closeable
{
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/ICompactSerializer.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/ICompactSerializer.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/ICompactSerializer.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/ICompactSerializer.java Thu Dec 23 19:09:43 2010
@@ -18,10 +18,9 @@
package org.apache.cassandra.io;
-import java.io.DataOutput;
+import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.DataInputStream;
/**
* Allows for the controlled serialization/deserialization of a given type.
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/ICompactSerializer2.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/ICompactSerializer2.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/ICompactSerializer2.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/ICompactSerializer2.java Thu Dec 23 19:09:43 2010
@@ -18,7 +18,9 @@
package org.apache.cassandra.io;
-import java.io.*;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
public interface ICompactSerializer2<T>
{
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/IndexHelper.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/IndexHelper.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/IndexHelper.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/IndexHelper.java Thu Dec 23 19:09:43 2010
@@ -19,12 +19,15 @@
package org.apache.cassandra.io;
import java.io.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
import org.apache.cassandra.db.ColumnSerializer;
import org.apache.cassandra.db.marshal.AbstractType;
-import org.apache.cassandra.utils.BloomFilter;
import org.apache.cassandra.io.util.FileDataInput;
+import org.apache.cassandra.utils.BloomFilter;
/**
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/IteratingRow.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/IteratingRow.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/IteratingRow.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/IteratingRow.java Thu Dec 23 19:09:43 2010
@@ -21,16 +21,16 @@ package org.apache.cassandra.io;
*/
-import java.io.*;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import com.google.common.collect.AbstractIterator;
import org.apache.cassandra.db.ColumnFamily;
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.db.IColumn;
-import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.io.util.BufferedRandomAccessFile;
import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.io.util.FileDataInput;
-import com.google.common.collect.AbstractIterator;
public class IteratingRow extends AbstractIterator<IColumn> implements Comparable<IteratingRow>
{
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTable.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTable.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTable.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTable.java Thu Dec 23 19:09:43 2010
@@ -23,16 +23,15 @@ package org.apache.cassandra.io;
import java.io.File;
import java.io.IOException;
-import java.util.List;
import java.util.Arrays;
+import java.util.List;
import org.apache.log4j.Logger;
import org.apache.commons.lang.StringUtils;
import org.apache.cassandra.dht.IPartitioner;
-import org.apache.cassandra.utils.BloomFilter;
import org.apache.cassandra.io.util.FileUtils;
-import org.apache.cassandra.db.DecoratedKey;
+import org.apache.cassandra.utils.BloomFilter;
/**
* This class is built on top of the SequenceFile. It stores
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTableReader.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTableReader.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTableReader.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTableReader.java Thu Dec 23 19:09:43 2010
@@ -25,6 +25,8 @@ import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel;
import java.util.*;
+import org.apache.log4j.Logger;
+
import org.apache.cassandra.cache.InstrumentedCache;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.*;
@@ -37,7 +39,6 @@ import org.apache.cassandra.service.Stor
import org.apache.cassandra.utils.BloomFilter;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.Pair;
-import org.apache.log4j.Logger;
/**
* SSTableReaders are open()ed by Table.onStart; after that they are created by SSTableWriter.renameAndOpen.
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTableScanner.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTableScanner.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTableScanner.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTableScanner.java Thu Dec 23 19:09:43 2010
@@ -18,17 +18,16 @@
package org.apache.cassandra.io;
-import java.io.IOException;
import java.io.Closeable;
import java.io.IOError;
-import java.util.Iterator;
+import java.io.IOException;
import java.util.Arrays;
+import java.util.Iterator;
+
+import org.apache.log4j.Logger;
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.io.util.BufferedRandomAccessFile;
-import org.apache.cassandra.io.util.FileDataInput;
-
-import org.apache.log4j.Logger;
public class SSTableScanner implements Iterator<IteratingRow>, Closeable
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTableTracker.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTableTracker.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTableTracker.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTableTracker.java Thu Dec 23 19:09:43 2010
@@ -27,13 +27,13 @@ import java.util.*;
import java.util.concurrent.atomic.AtomicLong;
import com.google.common.base.Function;
+import org.apache.log4j.Logger;
import org.apache.cassandra.cache.JMXInstrumentedCache;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ColumnFamily;
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.utils.Pair;
-import org.apache.log4j.Logger;
public class SSTableTracker implements Iterable<SSTableReader>
{
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTableWriter.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTableWriter.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTableWriter.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/SSTableWriter.java Thu Dec 23 19:09:43 2010
@@ -25,8 +25,6 @@ import java.io.DataOutputStream;
import java.io.FileOutputStream;
import java.io.IOError;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
import org.apache.log4j.Logger;
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/BufferedRandomAccessFile.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/BufferedRandomAccessFile.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/BufferedRandomAccessFile.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/BufferedRandomAccessFile.java Thu Dec 23 19:09:43 2010
@@ -19,7 +19,6 @@
package org.apache.cassandra.io.util;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.util.Arrays;
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/FileDataInput.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/FileDataInput.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/FileDataInput.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/FileDataInput.java Thu Dec 23 19:09:43 2010
@@ -21,9 +21,9 @@ package org.apache.cassandra.io.util;
*/
+import java.io.Closeable;
import java.io.DataInput;
import java.io.IOException;
-import java.io.Closeable;
public interface FileDataInput extends DataInput, Closeable
{
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/FileUtils.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/FileUtils.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/FileUtils.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/FileUtils.java Thu Dec 23 19:09:43 2010
@@ -18,19 +18,14 @@
package org.apache.cassandra.io.util;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
import java.text.DecimalFormat;
-import java.util.*;
-import java.util.concurrent.ExecutorService;
-
-import com.sun.jna.LastErrorException;
-import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
+import java.util.Comparator;
+import java.util.List;
import org.apache.log4j.Logger;
-import com.sun.jna.Native;
-import org.apache.cassandra.utils.CLibrary;
-
public class FileUtils
{
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/MappedFileDataInput.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/MappedFileDataInput.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/MappedFileDataInput.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/io/util/MappedFileDataInput.java Thu Dec 23 19:09:43 2010
@@ -21,8 +21,8 @@ package org.apache.cassandra.io.util;
*/
-import java.nio.MappedByteBuffer;
import java.io.*;
+import java.nio.MappedByteBuffer;
public class MappedFileDataInput extends InputStream implements FileDataInput
{
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/AbstractReplicationStrategy.java Thu Dec 23 19:09:43 2010
@@ -19,13 +19,16 @@
package org.apache.cassandra.locator;
import java.net.InetAddress;
-import java.util.*;
-
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.log4j.Logger;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
+import org.apache.log4j.Logger;
+
+import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.gms.FailureDetector;
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java Thu Dec 23 19:09:43 2010
@@ -18,27 +18,19 @@
package org.apache.cassandra.locator;
+import java.lang.management.ManagementFactory;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.*;
-import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.atomic.AtomicInteger;
-
-import java.lang.management.ManagementFactory;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.MessagingService;
-import org.apache.cassandra.net.ResponseVerbHandler;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.AbstractStatsDeque;
-import org.apache.cassandra.locator.IEndPointSnitch;
-import org.apache.cassandra.locator.ILatencyPublisher;
-import org.apache.cassandra.locator.ILatencySubscriber;
-import org.apache.cassandra.locator.AbstractEndpointSnitch;
-import org.apache.cassandra.locator.DynamicEndpointSnitchMBean;
import org.apache.cassandra.utils.FBUtilities;
/**
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/EndPointSnitch.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/EndPointSnitch.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/EndPointSnitch.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/EndPointSnitch.java Thu Dec 23 19:09:43 2010
@@ -20,7 +20,6 @@ package org.apache.cassandra.locator;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.util.*;
/**
* A simple endpoint snitch implementation that assumes rack and dc information is encoded
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/IEndPointSnitch.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/IEndPointSnitch.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/IEndPointSnitch.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/IEndPointSnitch.java Thu Dec 23 19:09:43 2010
@@ -18,12 +18,10 @@
package org.apache.cassandra.locator;
-import java.net.UnknownHostException;
-
import java.net.InetAddress;
-import java.util.Set;
-import java.util.List;
+import java.net.UnknownHostException;
import java.util.Collection;
+import java.util.List;
/**
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/ILatencyPublisher.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/ILatencyPublisher.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/ILatencyPublisher.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/ILatencyPublisher.java Thu Dec 23 19:09:43 2010
@@ -18,8 +18,6 @@
package org.apache.cassandra.locator;
-import org.apache.cassandra.locator.ILatencySubscriber;
-
public interface ILatencyPublisher
{
public void register(ILatencySubscriber subcriber);
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/RackAwareStrategy.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/RackAwareStrategy.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/RackAwareStrategy.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/RackAwareStrategy.java Thu Dec 23 19:09:43 2010
@@ -18,16 +18,14 @@
*/
package org.apache.cassandra.locator;
+import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.dht.Token;
-import java.net.InetAddress;
-import org.apache.cassandra.service.StorageService;
/*
* This class returns the nodes responsible for a given
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/RackUnawareStrategy.java Thu Dec 23 19:09:43 2010
@@ -18,14 +18,13 @@
*/
package org.apache.cassandra.locator;
+import java.net.InetAddress;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.dht.Token;
-import java.net.InetAddress;
/**
* This class returns the nodes responsible for a given
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/TokenMetadata.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/TokenMetadata.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/TokenMetadata.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/locator/TokenMetadata.java Thu Dec 23 19:09:43 2010
@@ -18,6 +18,7 @@
package org.apache.cassandra.locator;
+import java.net.InetAddress;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -25,14 +26,12 @@ import java.util.concurrent.locks.ReadWr
import java.util.concurrent.locks.ReentrantReadWriteLock;
import com.google.common.collect.*;
-import org.apache.cassandra.dht.Token;
+import org.apache.commons.lang.StringUtils;
+
import org.apache.cassandra.dht.Range;
+import org.apache.cassandra.dht.Token;
import org.apache.cassandra.service.StorageService;
-import java.net.InetAddress;
-
-import org.apache.commons.lang.StringUtils;
-
public class TokenMetadata
{
/* Maintains token to endpoint map of every node in the cluster. */
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/CompactEndPointSerializationHelper.java Thu Dec 23 19:09:43 2010
@@ -18,7 +18,9 @@
package org.apache.cassandra.net;
-import java.io.*;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
import java.net.InetAddress;
public class CompactEndPointSerializationHelper
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/FileStreamTask.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/FileStreamTask.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/FileStreamTask.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/FileStreamTask.java Thu Dec 23 19:09:43 2010
@@ -18,18 +18,20 @@
package org.apache.cassandra.net;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.RandomAccessFile;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.nio.channels.SocketChannel;
-import org.apache.cassandra.streaming.StreamOutManager;
-import org.apache.cassandra.utils.FBUtilities;
import org.apache.log4j.Logger;
import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.streaming.StreamOutManager;
+import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.WrappedRunnable;
public class FileStreamTask extends WrappedRunnable
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/Header.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/Header.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/Header.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/Header.java Thu Dec 23 19:09:43 2010
@@ -21,13 +21,14 @@ package org.apache.cassandra.net;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicInteger;
import java.net.InetAddress;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.utils.GuidGenerator;
public class Header
{
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/IAsyncResult.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/IAsyncResult.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/IAsyncResult.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/IAsyncResult.java Thu Dec 23 19:09:43 2010
@@ -19,7 +19,6 @@
package org.apache.cassandra.net;
import java.net.InetAddress;
-import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/IncomingTcpConnection.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/IncomingTcpConnection.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/IncomingTcpConnection.java Thu Dec 23 19:09:43 2010
@@ -26,7 +26,6 @@ import java.net.Socket;
import org.apache.log4j.Logger;
-import org.apache.cassandra.net.sink.SinkManager;
import org.apache.cassandra.streaming.IncomingStreamReader;
public class IncomingTcpConnection extends Thread
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/OutboundTcpConnection.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/OutboundTcpConnection.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/OutboundTcpConnection.java Thu Dec 23 19:09:43 2010
@@ -29,10 +29,10 @@ import java.nio.ByteBuffer;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
-import org.apache.cassandra.utils.FBUtilities;
import org.apache.log4j.Logger;
import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.utils.FBUtilities;
public class OutboundTcpConnection extends Thread
{
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/ResponseVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/ResponseVerbHandler.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/ResponseVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/ResponseVerbHandler.java Thu Dec 23 19:09:43 2010
@@ -18,14 +18,15 @@
package org.apache.cassandra.net;
-import java.util.*;
import java.net.InetAddress;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
import org.apache.cassandra.locator.ILatencyPublisher;
import org.apache.cassandra.locator.ILatencySubscriber;
-import org.apache.log4j.Logger;
-
public class ResponseVerbHandler implements IVerbHandler, ILatencyPublisher
{
private static final Logger logger_ = Logger.getLogger( ResponseVerbHandler.class );
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/sink/IMessageSink.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/sink/IMessageSink.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/sink/IMessageSink.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/sink/IMessageSink.java Thu Dec 23 19:09:43 2010
@@ -18,7 +18,6 @@
package org.apache.cassandra.net.sink;
-import java.net.InetAddress;
import org.apache.cassandra.net.Message;
public interface IMessageSink
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/sink/SinkManager.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/sink/SinkManager.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/sink/SinkManager.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/net/sink/SinkManager.java Thu Dec 23 19:09:43 2010
@@ -18,10 +18,9 @@
package org.apache.cassandra.net.sink;
-import java.util.*;
-import java.io.IOException;
+import java.util.LinkedList;
+import java.util.ListIterator;
-import java.net.InetAddress;
import org.apache.cassandra.net.Message;
public class SinkManager
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/AntiEntropyService.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/AntiEntropyService.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/AntiEntropyService.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/AntiEntropyService.java Thu Dec 23 19:09:43 2010
@@ -22,12 +22,15 @@ import java.io.*;
import java.net.InetAddress;
import java.security.MessageDigest;
import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
+
+import org.apache.log4j.Logger;
import org.apache.cassandra.concurrent.StageManager;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.db.CompactionManager;
import org.apache.cassandra.db.ColumnFamilyStore;
+import org.apache.cassandra.db.CompactionManager;
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.dht.Range;
@@ -35,16 +38,13 @@ import org.apache.cassandra.dht.Token;
import org.apache.cassandra.io.CompactionIterator.CompactedRow;
import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.io.IndexSummary;
-import org.apache.cassandra.io.SSTableReader;
-import org.apache.cassandra.streaming.StreamOut;
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
+import org.apache.cassandra.streaming.StreamOut;
import org.apache.cassandra.streaming.StreamOutManager;
import org.apache.cassandra.utils.*;
-import org.apache.log4j.Logger;
-
/**
* AntiEntropyService encapsulates "validating" (hashing) individual column families,
* exchanging MerkleTrees with remote nodes via a TreeRequest/Response conversation,
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/ConsistencyChecker.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/ConsistencyChecker.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/ConsistencyChecker.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/ConsistencyChecker.java Thu Dec 23 19:09:43 2010
@@ -42,7 +42,6 @@ import org.apache.cassandra.net.IAsyncCa
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.ExpiringMap;
-import org.apache.cassandra.utils.FBUtilities;
/**
* ConsistencyChecker does the following:
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/EmbeddedCassandraService.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/EmbeddedCassandraService.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/EmbeddedCassandraService.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/EmbeddedCassandraService.java Thu Dec 23 19:09:43 2010
@@ -21,18 +21,10 @@ package org.apache.cassandra.service;
*/
-import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.thrift.CassandraDaemon;
import org.apache.thrift.transport.TTransportException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* An embedded, in-memory cassandra storage service that listens
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/GCInspector.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/GCInspector.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/GCInspector.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/GCInspector.java Thu Dec 23 19:09:43 2010
@@ -21,22 +21,22 @@ package org.apache.cassandra.service;
*/
-import org.apache.log4j.Logger;
-
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryUsage;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.*;
-import org.apache.cassandra.concurrent.IExecutorMBean;
-import org.apache.cassandra.db.ColumnFamilyStore;
-import org.apache.cassandra.db.CompactionManager;
-
-import java.lang.management.MemoryUsage;
-import java.lang.management.ManagementFactory;
import javax.management.JMX;
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
+import org.apache.log4j.Logger;
+
+import org.apache.cassandra.concurrent.IExecutorMBean;
+import org.apache.cassandra.db.ColumnFamilyStore;
+import org.apache.cassandra.db.CompactionManager;
+
public class GCInspector
{
public static final GCInspector instance = new GCInspector();
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/IResponseResolver.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/IResponseResolver.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/IResponseResolver.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/IResponseResolver.java Thu Dec 23 19:09:43 2010
@@ -18,9 +18,8 @@
package org.apache.cassandra.service;
-import java.util.Collection;
-import java.util.List;
import java.io.IOException;
+import java.util.Collection;
import org.apache.cassandra.net.Message;
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/LoadDisseminator.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/LoadDisseminator.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/LoadDisseminator.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/LoadDisseminator.java Thu Dec 23 19:09:43 2010
@@ -19,11 +19,11 @@ package org.apache.cassandra.service;
import java.util.TimerTask;
+import org.apache.log4j.Logger;
+
import org.apache.cassandra.gms.ApplicationState;
import org.apache.cassandra.gms.Gossiper;
-import org.apache.log4j.Logger;
-
class LoadDisseminator extends TimerTask
{
private final static Logger logger_ = Logger.getLogger(LoadDisseminator.class);
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/QuorumResponseHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/QuorumResponseHandler.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/QuorumResponseHandler.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/QuorumResponseHandler.java Thu Dec 23 19:09:43 2010
@@ -18,14 +18,13 @@
package org.apache.cassandra.service;
+import java.io.IOException;
import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ArrayList;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import java.io.IOException;
+
+import org.apache.log4j.Logger;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.net.IAsyncCallback;
@@ -33,8 +32,6 @@ import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.SimpleCondition;
-import org.apache.log4j.Logger;
-
public class QuorumResponseHandler<T> implements IAsyncCallback
{
protected static final Logger logger = Logger.getLogger( QuorumResponseHandler.class );
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java Thu Dec 23 19:09:43 2010
@@ -18,6 +18,8 @@
package org.apache.cassandra.service;
+import org.apache.log4j.Logger;
+
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.RangeSliceCommand;
import org.apache.cassandra.db.RangeSliceReply;
@@ -25,7 +27,6 @@ import org.apache.cassandra.db.Table;
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
-import org.apache.log4j.Logger;
public class RangeSliceVerbHandler implements IVerbHandler
{
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/ReadResponseResolver.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/ReadResponseResolver.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/ReadResponseResolver.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/ReadResponseResolver.java Thu Dec 23 19:09:43 2010
@@ -22,19 +22,17 @@ import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.IOError;
import java.io.IOException;
+import java.net.InetAddress;
import java.util.*;
-import org.apache.cassandra.db.*;
+import org.apache.log4j.Logger;
-import java.net.InetAddress;
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.db.*;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
-import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.config.DatabaseDescriptor;
import org.cliffc.high_scale_lib.NonBlockingHashMap;
-import org.apache.log4j.Logger;
-
/**
* Turns ReadResponse messages into Row objects, resolving to the most recent
* version and setting up read repairs as necessary.
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageLoadBalancer.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageLoadBalancer.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageLoadBalancer.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageLoadBalancer.java Thu Dec 23 19:09:43 2010
@@ -18,6 +18,7 @@
package org.apache.cassandra.service;
+import java.net.InetAddress;
import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -30,7 +31,6 @@ import org.apache.cassandra.gms.Applicat
import org.apache.cassandra.gms.EndPointState;
import org.apache.cassandra.gms.Gossiper;
import org.apache.cassandra.gms.IEndPointStateChangeSubscriber;
-import java.net.InetAddress;
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageProxy.java Thu Dec 23 19:09:43 2010
@@ -31,12 +31,16 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import com.google.common.collect.Multimap;
+import org.apache.log4j.Logger;
import org.apache.commons.lang.ArrayUtils;
import org.apache.cassandra.concurrent.StageManager;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.*;
-import org.apache.cassandra.dht.*;
+import org.apache.cassandra.dht.AbstractBounds;
+import org.apache.cassandra.dht.Bounds;
+import org.apache.cassandra.dht.IPartitioner;
+import org.apache.cassandra.dht.Token;
import org.apache.cassandra.locator.AbstractReplicationStrategy;
import org.apache.cassandra.locator.TokenMetadata;
import org.apache.cassandra.net.IAsyncResult;
@@ -49,7 +53,6 @@ import org.apache.cassandra.utils.FBUtil
import org.apache.cassandra.utils.LatencyTracker;
import org.apache.cassandra.utils.Pair;
import org.apache.cassandra.utils.WrappedRunnable;
-import org.apache.log4j.Logger;
public class StorageProxy implements StorageProxyMBean
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/StorageService.java Thu Dec 23 19:09:43 2010
@@ -32,6 +32,8 @@ import javax.management.ObjectName;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
import org.apache.commons.lang.StringUtils;
import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
@@ -60,8 +62,6 @@ import org.apache.cassandra.thrift.Consi
import org.apache.cassandra.thrift.UnavailableException;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.WrappedRunnable;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
/*
* This abstraction contains the token/identifier of this node
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/WriteResponseHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/WriteResponseHandler.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/WriteResponseHandler.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/service/WriteResponseHandler.java Thu Dec 23 19:09:43 2010
@@ -19,23 +19,19 @@
package org.apache.cassandra.service;
import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ArrayList;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import java.io.IOException;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.log4j.Logger;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.net.IAsyncCallback;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.SimpleCondition;
-import org.apache.log4j.Logger;
-
public class WriteResponseHandler implements IAsyncCallback
{
protected static final Logger logger = Logger.getLogger( WriteResponseHandler.class );
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/IStreamComplete.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/IStreamComplete.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/IStreamComplete.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/IStreamComplete.java Thu Dec 23 19:09:43 2010
@@ -19,7 +19,6 @@
package org.apache.cassandra.streaming;
import java.io.IOException;
-
import java.net.InetAddress;
interface IStreamComplete
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java Thu Dec 23 19:09:43 2010
@@ -18,11 +18,13 @@
package org.apache.cassandra.streaming;
-import java.net.InetSocketAddress;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.nio.channels.FileChannel;
import java.nio.channels.SocketChannel;
-import java.io.*;
import org.apache.log4j.Logger;
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamCompletionHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamCompletionHandler.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamCompletionHandler.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamCompletionHandler.java Thu Dec 23 19:09:43 2010
@@ -31,8 +31,6 @@ import org.apache.cassandra.db.Table;
import org.apache.cassandra.io.SSTableReader;
import org.apache.cassandra.io.SSTableWriter;
import org.apache.cassandra.net.MessagingService;
-import org.apache.cassandra.streaming.IStreamComplete;
-import org.apache.cassandra.streaming.StreamInManager;
import org.apache.cassandra.service.StorageService;
/**
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamFinishedVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamFinishedVerbHandler.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamFinishedVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamFinishedVerbHandler.java Thu Dec 23 19:09:43 2010
@@ -30,7 +30,6 @@ import org.apache.log4j.Logger;
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
-import org.apache.cassandra.streaming.StreamOutManager;
public class StreamFinishedVerbHandler implements IVerbHandler
{
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamInManager.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamInManager.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamInManager.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamInManager.java Thu Dec 23 19:09:43 2010
@@ -18,14 +18,12 @@
package org.apache.cassandra.streaming;
-import java.util.*;
import java.net.InetAddress;
+import java.util.*;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
-import org.apache.cassandra.streaming.IStreamComplete;
-
import org.apache.log4j.Logger;
class StreamInManager
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamInitiateDoneVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamInitiateDoneVerbHandler.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamInitiateDoneVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamInitiateDoneVerbHandler.java Thu Dec 23 19:09:43 2010
@@ -25,7 +25,6 @@ import org.apache.log4j.Logger;
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
-import org.apache.cassandra.streaming.StreamOutManager;
public class StreamInitiateDoneVerbHandler implements IVerbHandler
{
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamInitiateMessage.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamInitiateMessage.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamInitiateMessage.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamInitiateMessage.java Thu Dec 23 19:09:43 2010
@@ -25,7 +25,6 @@ import java.io.IOException;
import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.net.Message;
-import org.apache.cassandra.streaming.PendingFile;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.FBUtilities;
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamInitiateVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamInitiateVerbHandler.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamInitiateVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamInitiateVerbHandler.java Thu Dec 23 19:09:43 2010
@@ -28,17 +28,15 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
+import org.apache.commons.lang.StringUtils;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Table;
-import org.apache.cassandra.streaming.StreamInitiateMessage;
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
-import org.apache.cassandra.streaming.StreamInManager;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.FBUtilities;
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamOut.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamOut.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamOut.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamOut.java Thu Dec 23 19:09:43 2010
@@ -21,21 +21,20 @@ package org.apache.cassandra.streaming;
*/
-import java.net.InetAddress;
-import java.util.*;
-import java.io.IOException;
import java.io.File;
import java.io.IOError;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.util.Collection;
+import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import org.apache.log4j.Logger;
import org.apache.commons.lang.StringUtils;
-import org.apache.cassandra.dht.Range;
import org.apache.cassandra.db.Table;
-import org.apache.cassandra.io.SSTable;
-import org.apache.cassandra.io.SSTableReader;
+import org.apache.cassandra.dht.Range;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamOutManager.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamOutManager.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamOutManager.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamOutManager.java Thu Dec 23 19:09:43 2010
@@ -20,25 +20,18 @@ package org.apache.cassandra.streaming;
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.net.InetAddress;
+import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import java.net.InetAddress;
+import org.apache.log4j.Logger;
+import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.utils.SimpleCondition;
-import org.apache.log4j.Logger;
-
/**
* This class manages the streaming of multiple files one after the other.
*/
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamRequestVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamRequestVerbHandler.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamRequestVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamRequestVerbHandler.java Thu Dec 23 19:09:43 2010
@@ -18,15 +18,15 @@
package org.apache.cassandra.streaming;
-import java.io.ByteArrayInputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.IOError;
+ import java.io.ByteArrayInputStream;
+ import java.io.DataInputStream;
+ import java.io.IOError;
+ import java.io.IOException;
-import org.apache.cassandra.net.IVerbHandler;
-import org.apache.cassandra.net.Message;
+ import org.apache.log4j.Logger;
-import org.apache.log4j.Logger;
+ import org.apache.cassandra.net.IVerbHandler;
+ import org.apache.cassandra.net.Message;
/**
* This verb handler handles the StreamRequestMessage that is sent by
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamingService.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamingService.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamingService.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/streaming/StreamingService.java Thu Dec 23 19:09:43 2010
@@ -18,16 +18,16 @@
package org.apache.cassandra.streaming;
-import org.apache.log4j.Logger;
-
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.net.InetAddress;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.apache.log4j.Logger;
public class StreamingService implements StreamingServiceMBean
{
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraDaemon.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraDaemon.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraDaemon.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraDaemon.java Thu Dec 23 19:09:43 2010
@@ -20,33 +20,33 @@ package org.apache.cassandra.thrift;
import java.io.File;
import java.io.IOException;
-import java.net.InetSocketAddress;
import java.net.InetAddress;
+import java.net.InetSocketAddress;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import org.apache.cassandra.config.ConfigurationException;
-import org.apache.cassandra.db.SystemTable;
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
+import org.apache.cassandra.config.ConfigurationException;
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.db.CompactionManager;
+import org.apache.cassandra.db.SystemTable;
+import org.apache.cassandra.db.Table;
import org.apache.cassandra.db.commitlog.CommitLog;
+import org.apache.cassandra.service.StorageService;
+import org.apache.cassandra.utils.CLibrary;
+import org.apache.cassandra.utils.FBUtilities;
+import org.apache.thrift.TProcessorFactory;
import org.apache.thrift.protocol.TBinaryProtocol;
import org.apache.thrift.protocol.TProtocolFactory;
import org.apache.thrift.server.TServer;
+import org.apache.thrift.transport.TFramedTransport;
import org.apache.thrift.transport.TServerSocket;
import org.apache.thrift.transport.TTransportException;
import org.apache.thrift.transport.TTransportFactory;
-import org.apache.thrift.transport.TFramedTransport;
-import org.apache.thrift.TProcessorFactory;
-import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.utils.CLibrary;
-import org.apache.cassandra.utils.FBUtilities;
-import org.apache.cassandra.db.Table;
-import org.apache.cassandra.db.CompactionManager;
/**
* This class supports two methods for creating a Cassandra node daemon,
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraServer.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraServer.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraServer.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CassandraServer.java Thu Dec 23 19:09:43 2010
@@ -33,14 +33,9 @@ import org.apache.cassandra.config.Datab
import org.apache.cassandra.db.*;
import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.db.marshal.MarshalException;
-import org.apache.cassandra.dht.AbstractBounds;
-import org.apache.cassandra.dht.Bounds;
-import org.apache.cassandra.dht.IPartitioner;
-import org.apache.cassandra.dht.Range;
-import org.apache.cassandra.dht.Token;
+import org.apache.cassandra.dht.*;
import org.apache.cassandra.service.StorageProxy;
import org.apache.cassandra.service.StorageService;
-import org.apache.cassandra.utils.Pair;
import org.apache.thrift.TException;
import org.json.simple.JSONValue;
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java Thu Dec 23 19:09:43 2010
@@ -19,6 +19,12 @@
package org.apache.cassandra.thrift;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.thrift.TException;
import org.apache.thrift.TProcessor;
import org.apache.thrift.TProcessorFactory;
@@ -30,12 +36,6 @@ import org.apache.thrift.transport.TTran
import org.apache.thrift.transport.TTransportException;
import org.apache.thrift.transport.TTransportFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-
/**
* Slightly modified version of the Apache Thrift TThreadPoolServer.
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/ThriftValidation.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/ThriftValidation.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/ThriftValidation.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/thrift/ThriftValidation.java Thu Dec 23 19:09:43 2010
@@ -20,24 +20,24 @@ package org.apache.cassandra.thrift;
*
*/
-import java.util.Comparator;
import java.util.Arrays;
+import java.util.Comparator;
-import org.apache.cassandra.db.KeyspaceNotDefinedException;
+import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ColumnFamily;
import org.apache.cassandra.db.IColumn;
+import org.apache.cassandra.db.KeyspaceNotDefinedException;
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.db.marshal.MarshalException;
-
-import static org.apache.cassandra.thrift.ThriftGlue.*;
-
-import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.dht.IPartitioner;
import org.apache.cassandra.dht.RandomPartitioner;
import org.apache.cassandra.dht.Token;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.FBUtilities;
+import static org.apache.cassandra.thrift.ThriftGlue.createColumnParent;
+import static org.apache.cassandra.thrift.ThriftGlue.createColumnPath;
+
public class ThriftValidation
{
static void validateKey(String key) throws InvalidRequestException
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/ClusterCmd.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/ClusterCmd.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/ClusterCmd.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/ClusterCmd.java Thu Dec 23 19:09:43 2010
@@ -18,16 +18,11 @@
package org.apache.cassandra.tools;
import java.io.IOException;
+import java.net.InetAddress;
import java.util.List;
import java.util.Set;
-import java.net.InetAddress;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
-import org.apache.commons.cli.PosixParser;
+
+import org.apache.commons.cli.*;
/**
* JMX cluster wide operations for Cassandra.
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeCmd.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeCmd.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeCmd.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeCmd.java Thu Dec 23 19:09:43 2010
@@ -21,15 +21,6 @@ package org.apache.cassandra.tools;
*/
-import org.apache.cassandra.cache.JMXInstrumentedCacheMBean;
-import org.apache.cassandra.concurrent.IExecutorMBean;
-import org.apache.cassandra.db.ColumnFamilyStoreMBean;
-import org.apache.cassandra.db.CompactionManager;
-import org.apache.cassandra.dht.Range;
-import org.apache.cassandra.dht.Token;
-import org.apache.cassandra.utils.EstimatedHistogram;
-import org.apache.commons.cli.*;
-
import java.io.IOException;
import java.io.PrintStream;
import java.lang.management.MemoryUsage;
@@ -39,6 +30,16 @@ import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.ExecutionException;
+import org.apache.commons.cli.*;
+
+import org.apache.cassandra.cache.JMXInstrumentedCacheMBean;
+import org.apache.cassandra.concurrent.IExecutorMBean;
+import org.apache.cassandra.db.ColumnFamilyStoreMBean;
+import org.apache.cassandra.db.CompactionManager;
+import org.apache.cassandra.dht.Range;
+import org.apache.cassandra.dht.Token;
+import org.apache.cassandra.utils.EstimatedHistogram;
+
public class NodeCmd {
private static final String HOST_OPT_LONG = "host";
private static final String HOST_OPT_SHORT = "h";
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeProbe.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeProbe.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeProbe.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/NodeProbe.java Thu Dec 23 19:09:43 2010
@@ -24,19 +24,14 @@ import java.lang.management.ManagementFa
import java.lang.management.MemoryMXBean;
import java.lang.management.MemoryUsage;
import java.lang.management.RuntimeMXBean;
-import java.lang.reflect.Constructor;
import java.net.InetAddress;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.ExecutionException;
-
-import javax.management.*;
+import javax.management.JMX;
+import javax.management.MBeanServerConnection;
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
import javax.management.remote.JMXConnector;
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/SSTableExport.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/SSTableExport.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/SSTableExport.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/SSTableExport.java Thu Dec 23 19:09:43 2010
@@ -23,6 +23,8 @@ import java.io.IOException;
import java.io.PrintStream;
import java.util.*;
+import org.apache.commons.cli.*;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ColumnFamily;
import org.apache.cassandra.db.DecoratedKey;
@@ -37,7 +39,6 @@ import org.apache.cassandra.io.util.Buff
import org.apache.cassandra.service.StorageService;
import static org.apache.cassandra.utils.FBUtilities.bytesToHex;
-import org.apache.commons.cli.*;
/**
* Export SSTables to JSON format.
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/SSTableImport.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/SSTableImport.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/SSTableImport.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/tools/SSTableImport.java Thu Dec 23 19:09:43 2010
@@ -21,21 +21,24 @@ package org.apache.cassandra.tools;
import java.io.FileReader;
import java.io.IOException;
import java.util.*;
+
+import org.apache.commons.cli.*;
+
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ColumnFamily;
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.db.SuperColumn;
import org.apache.cassandra.db.filter.QueryPath;
import org.apache.cassandra.dht.IPartitioner;
-import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.io.SSTableWriter;
-import static org.apache.cassandra.utils.FBUtilities.hexToBytes;
-import org.apache.commons.cli.*;
+import org.apache.cassandra.io.util.DataOutputBuffer;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.JSONValue;
import org.json.simple.parser.ParseException;
+import static org.apache.cassandra.utils.FBUtilities.hexToBytes;
+
/**
* Create SSTables from JSON input
*/
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/AbstractStatsDeque.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/AbstractStatsDeque.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/AbstractStatsDeque.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/AbstractStatsDeque.java Thu Dec 23 19:09:43 2010
@@ -19,7 +19,6 @@
package org.apache.cassandra.utils;
import java.util.Iterator;
-import java.util.ArrayDeque;
public abstract class AbstractStatsDeque implements Iterable<Double>
{
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/BitSetSerializer.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/BitSetSerializer.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/BitSetSerializer.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/BitSetSerializer.java Thu Dec 23 19:09:43 2010
@@ -18,15 +18,9 @@
*/
package org.apache.cassandra.utils;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.DataInputStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
+import java.io.*;
import java.util.BitSet;
-import org.apache.cassandra.io.ICompactSerializer;
-
public class BitSetSerializer
{
public static void serialize(BitSet bs, DataOutputStream dos) throws IOException
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/BloomFilter.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/BloomFilter.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/BloomFilter.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/BloomFilter.java Thu Dec 23 19:09:43 2010
@@ -23,10 +23,10 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.util.BitSet;
-import org.apache.cassandra.io.ICompactSerializer;
-
import org.apache.log4j.Logger;
+import org.apache.cassandra.io.ICompactSerializer;
+
public class BloomFilter extends Filter
{
private static final Logger logger = Logger.getLogger(BloomFilter.class);
Modified: cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/EstimatedHistogram.java?rev=1052357&r1=1052356&r2=1052357&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/EstimatedHistogram.java (original)
+++ cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/utils/EstimatedHistogram.java Thu Dec 23 19:09:43 2010
@@ -18,8 +18,8 @@
*/
package org.apache.cassandra.utils;
-import java.util.concurrent.atomic.AtomicLongArray;
import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicLongArray;
public class EstimatedHistogram
{