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/02/25 16:10:45 UTC
svn commit: r1074570 - in /cassandra/trunk/src/java/org/apache/cassandra:
client/ concurrent/ db/ db/context/ streaming/ thrift/ utils/ utils/obs/
Author: jbellis
Date: Fri Feb 25 15:10:44 2011
New Revision: 1074570
URL: http://svn.apache.org/viewvc?rev=1074570&view=rev
Log:
r/m unused imports and parameterize IPartitioner uses
patch by Norman Maurer; reviewed by jbellis for CASSANDRA-2247
Modified:
cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java
cassandra/trunk/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java
cassandra/trunk/src/java/org/apache/cassandra/concurrent/RetryingScheduledThreadPoolExecutor.java
cassandra/trunk/src/java/org/apache/cassandra/db/DeletedColumn.java
cassandra/trunk/src/java/org/apache/cassandra/db/ExpiringColumn.java
cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
cassandra/trunk/src/java/org/apache/cassandra/db/IMutation.java
cassandra/trunk/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java
cassandra/trunk/src/java/org/apache/cassandra/db/Row.java
cassandra/trunk/src/java/org/apache/cassandra/db/RowIterator.java
cassandra/trunk/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java
cassandra/trunk/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
cassandra/trunk/src/java/org/apache/cassandra/db/SliceFromReadCommand.java
cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java
cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
cassandra/trunk/src/java/org/apache/cassandra/db/context/CounterContext.java
cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInSession.java
cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOut.java
cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamingService.java
cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
cassandra/trunk/src/java/org/apache/cassandra/utils/BloomFilter.java
cassandra/trunk/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
cassandra/trunk/src/java/org/apache/cassandra/utils/ExpiringMap.java
cassandra/trunk/src/java/org/apache/cassandra/utils/GuidGenerator.java
cassandra/trunk/src/java/org/apache/cassandra/utils/LegacyBloomFilter.java
cassandra/trunk/src/java/org/apache/cassandra/utils/StatusLogger.java
cassandra/trunk/src/java/org/apache/cassandra/utils/obs/ArrayUtil.java
Modified: cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/client/RingCache.java Fri Feb 25 15:10:44 2011
@@ -52,12 +52,12 @@ public class RingCache
private final Set<String> seeds_ = new HashSet<String>();
private final int port_;
- private final IPartitioner partitioner_;
+ private final IPartitioner<?> partitioner_;
private final String keyspace;
private Multimap<Range, InetAddress> rangeMap;
- public RingCache(String keyspace, IPartitioner partitioner, String addresses, int port) throws IOException
+ public RingCache(String keyspace, IPartitioner<?> partitioner, String addresses, int port) throws IOException
{
for (String seed : addresses.split(","))
seeds_.add(seed);
@@ -113,7 +113,6 @@ public class RingCache
}
/** ListMultimap promises to return a List for get(K) */
- @SuppressWarnings(value="unchecked")
public List<InetAddress> getEndpoint(Range range)
{
return (List<InetAddress>) rangeMap.get(range);
Modified: cassandra/trunk/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java Fri Feb 25 15:10:44 2011
@@ -80,11 +80,11 @@ public class DebuggableThreadPoolExecuto
super.afterExecute(r,t);
// exceptions wrapped by FutureTask
- if (r instanceof FutureTask)
+ if (r instanceof FutureTask<?>)
{
try
{
- ((FutureTask) r).get();
+ ((FutureTask<?>) r).get();
}
catch (InterruptedException e)
{
Modified: cassandra/trunk/src/java/org/apache/cassandra/concurrent/RetryingScheduledThreadPoolExecutor.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/concurrent/RetryingScheduledThreadPoolExecutor.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/concurrent/RetryingScheduledThreadPoolExecutor.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/concurrent/RetryingScheduledThreadPoolExecutor.java Fri Feb 25 15:10:44 2011
@@ -23,8 +23,6 @@ package org.apache.cassandra.concurrent;
import java.util.concurrent.*;
-import org.apache.log4j.Logger;
-
public class RetryingScheduledThreadPoolExecutor extends ScheduledThreadPoolExecutor
{
public RetryingScheduledThreadPoolExecutor(String threadPoolName, int priority)
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/DeletedColumn.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/DeletedColumn.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/DeletedColumn.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/DeletedColumn.java Fri Feb 25 15:10:44 2011
@@ -20,15 +20,10 @@ package org.apache.cassandra.db;
import java.nio.ByteBuffer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.cassandra.utils.ByteBufferUtil;
public class DeletedColumn extends Column
-{
- private static Logger logger = LoggerFactory.getLogger(DeletedColumn.class);
-
+{
public DeletedColumn(ByteBuffer name, int localDeletionTime, long timestamp)
{
this(name, ByteBufferUtil.bytes(localDeletionTime), timestamp);
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/ExpiringColumn.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ExpiringColumn.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ExpiringColumn.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ExpiringColumn.java Fri Feb 25 15:10:44 2011
@@ -22,8 +22,6 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.security.MessageDigest;
-import org.apache.log4j.Logger;
-
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -40,8 +38,6 @@ import org.apache.cassandra.utils.ByteBu
*/
public class ExpiringColumn extends Column
{
- private static Logger logger = Logger.getLogger(ExpiringColumn.class);
-
private final int localExpirationTime;
private final int timeToLive;
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java Fri Feb 25 15:10:44 2011
@@ -46,7 +46,6 @@ import org.apache.cassandra.dht.Range;
import org.apache.cassandra.gms.FailureDetector;
import org.apache.cassandra.gms.Gossiper;
import org.apache.cassandra.gms.ApplicationState;
-import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.service.*;
import org.apache.cassandra.thrift.*;
@@ -129,7 +128,7 @@ public class HintedHandOffManager implem
}
Table table = Table.open(tableName);
- DecoratedKey dkey = StorageService.getPartitioner().decorateKey(key);
+ DecoratedKey<?> dkey = StorageService.getPartitioner().decorateKey(key);
ColumnFamilyStore cfs = table.getColumnFamilyStore(cfName);
ByteBuffer startColumn = ByteBufferUtil.EMPTY_BYTE_BUFFER;
while (true)
@@ -308,7 +307,7 @@ public class HintedHandOffManager implem
// 4. Force a flush
// 5. Do major compaction to clean up all deletes etc.
ByteBuffer endpointAsUTF8 = ByteBuffer.wrap(endpoint.getHostAddress().getBytes(UTF_8)); // keys have to be UTF8 to make OPP happy
- DecoratedKey epkey = StorageService.getPartitioner().decorateKey(endpointAsUTF8);
+ DecoratedKey<?> epkey = StorageService.getPartitioner().decorateKey(endpointAsUTF8);
int rowsReplayed = 0;
ColumnFamilyStore hintStore = Table.open(Table.SYSTEM_TABLE).getColumnFamilyStore(HINTS_CF);
ByteBuffer startColumn = ByteBufferUtil.EMPTY_BYTE_BUFFER;
@@ -363,7 +362,7 @@ public class HintedHandOffManager implem
/** called when a keyspace is dropped or rename. newTable==null in the case of a drop. */
public static void renameHints(String oldTable, String newTable) throws IOException
{
- DecoratedKey oldTableKey = StorageService.getPartitioner().decorateKey(ByteBuffer.wrap(oldTable.getBytes(UTF_8)));
+ DecoratedKey<?> oldTableKey = StorageService.getPartitioner().decorateKey(ByteBuffer.wrap(oldTable.getBytes(UTF_8)));
// we're basically going to fetch, drop and add the scf for the old and new table. we need to do it piecemeal
// though since there could be GB of data.
ColumnFamilyStore hintStore = Table.open(Table.SYSTEM_TABLE).getColumnFamilyStore(HINTS_CF);
@@ -456,7 +455,7 @@ public class HintedHandOffManager implem
predicate.setSlice_range(sliceRange);
// From keys "" to ""...
- IPartitioner partitioner = StorageService.getPartitioner();
+ IPartitioner<?> partitioner = StorageService.getPartitioner();
ByteBuffer empty = ByteBufferUtil.EMPTY_BYTE_BUFFER;
Range range = new Range(partitioner.getToken(empty), partitioner.getToken(empty));
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/IMutation.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/IMutation.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/IMutation.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/IMutation.java Fri Feb 25 15:10:44 2011
@@ -19,9 +19,7 @@
package org.apache.cassandra.db;
import java.nio.ByteBuffer;
-import java.io.IOException;
-import org.apache.cassandra.net.Message;
public interface IMutation
{
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java Fri Feb 25 15:10:44 2011
@@ -23,16 +23,11 @@ import java.io.DataInputStream;
import java.io.IOError;
import java.io.IOException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
public class ReadRepairVerbHandler implements IVerbHandler
-{
- private static Logger logger_ = LoggerFactory.getLogger(ReadRepairVerbHandler.class);
-
+{
public void doVerb(Message message, String id)
{
byte[] body = message.getMessageBody();
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/Row.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/Row.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/Row.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/Row.java Fri Feb 25 15:10:44 2011
@@ -22,16 +22,12 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
public class Row
{
- private static Logger logger_ = LoggerFactory.getLogger(Row.class);
private static RowSerializer serializer = new RowSerializer();
static RowSerializer serializer()
@@ -39,10 +35,10 @@ public class Row
return serializer;
}
- public final DecoratedKey key;
+ public final DecoratedKey<?> key;
public final ColumnFamily cf;
- public Row(DecoratedKey key, ColumnFamily cf)
+ public Row(DecoratedKey<?> key, ColumnFamily cf)
{
assert key != null;
// cf may be null, indicating no data
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/RowIterator.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/RowIterator.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/RowIterator.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/RowIterator.java Fri Feb 25 15:10:44 2011
@@ -61,7 +61,7 @@ public class RowIterator implements Clos
public void close() throws IOException
{
- for (Iterator iter : iterators)
+ for (Iterator<IColumnIterator> iter : iterators)
{
if (iter instanceof Closeable)
{
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java Fri Feb 25 15:10:44 2011
@@ -29,8 +29,6 @@ import com.google.common.base.Charsets;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.cassandra.concurrent.Stage;
-import org.apache.cassandra.concurrent.StageManager;
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/SliceByNamesReadCommand.java Fri Feb 25 15:10:44 2011
@@ -56,7 +56,7 @@ public class SliceByNamesReadCommand ext
@Override
public Row getRow(Table table) throws IOException
{
- DecoratedKey dk = StorageService.getPartitioner().decorateKey(key);
+ DecoratedKey<?> dk = StorageService.getPartitioner().decorateKey(key);
return table.getRow(QueryFilter.getNamesFilter(dk, queryPath, columnNames));
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/SliceFromReadCommand.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/SliceFromReadCommand.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/SliceFromReadCommand.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/SliceFromReadCommand.java Fri Feb 25 15:10:44 2011
@@ -59,7 +59,7 @@ public class SliceFromReadCommand extend
@Override
public Row getRow(Table table) throws IOException
{
- DecoratedKey dk = StorageService.getPartitioner().decorateKey(key);
+ DecoratedKey<?> dk = StorageService.getPartitioner().decorateKey(key);
return table.getRow(QueryFilter.getSliceFilter(dk, queryPath, start, finish, reversed, count));
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/SuperColumn.java Fri Feb 25 15:10:44 2011
@@ -29,9 +29,6 @@ import java.util.concurrent.ConcurrentSk
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.io.IColumnSerializer;
import org.apache.cassandra.io.util.ColumnSortedMap;
@@ -42,8 +39,6 @@ import org.apache.cassandra.utils.FBUtil
public class SuperColumn implements IColumn, IColumnContainer
{
- private static Logger logger_ = LoggerFactory.getLogger(SuperColumn.class);
-
public static SuperColumnSerializer serializer(AbstractType comparator)
{
return new SuperColumnSerializer(comparator);
@@ -333,8 +328,6 @@ public class SuperColumn implements ICol
class SuperColumnSerializer implements IColumnSerializer
{
- private static Logger logger = LoggerFactory.getLogger(SuperColumnSerializer.class);
-
private AbstractType comparator;
public SuperColumnSerializer(AbstractType comparator)
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/Table.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/Table.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/Table.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/Table.java Fri Feb 25 15:10:44 2011
@@ -363,7 +363,7 @@ public class Table
if (writeCommitLog)
CommitLog.instance.add(mutation);
- DecoratedKey key = StorageService.getPartitioner().decorateKey(mutation.key());
+ DecoratedKey<?> key = StorageService.getPartitioner().decorateKey(mutation.key());
for (ColumnFamily cf : mutation.getColumnFamilies())
{
ColumnFamilyStore cfs = columnFamilyStores.get(cf.id());
@@ -464,7 +464,7 @@ public class Table
}
}
- private static ColumnFamily readCurrentIndexedColumns(DecoratedKey key, ColumnFamilyStore cfs, SortedSet<ByteBuffer> mutatedIndexedColumns)
+ private static ColumnFamily readCurrentIndexedColumns(DecoratedKey<?> key, ColumnFamilyStore cfs, SortedSet<ByteBuffer> mutatedIndexedColumns)
{
QueryFilter filter = QueryFilter.getNamesFilter(key, new QueryPath(cfs.getColumnFamilyName()), mutatedIndexedColumns);
return cfs.getColumnFamily(filter);
@@ -573,7 +573,7 @@ public class Table
{
while (iter.hasNext())
{
- DecoratedKey key = iter.next();
+ DecoratedKey<?> key = iter.next();
logger.debug("Indexing row {} ", key);
List<Memtable> memtablesToFlush = Collections.emptyList();
flusherLock.readLock().lock();
@@ -642,7 +642,7 @@ public class Table
// for binary load path. skips commitlog.
void load(RowMutation rowMutation) throws IOException
{
- DecoratedKey key = StorageService.getPartitioner().decorateKey(rowMutation.key());
+ DecoratedKey<?> key = StorageService.getPartitioner().decorateKey(rowMutation.key());
for (ColumnFamily columnFamily : rowMutation.getColumnFamilies())
{
Collection<IColumn> columns = columnFamily.getSortedColumns();
Modified: cassandra/trunk/src/java/org/apache/cassandra/db/context/CounterContext.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/db/context/CounterContext.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/db/context/CounterContext.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/db/context/CounterContext.java Fri Feb 25 15:10:44 2011
@@ -20,7 +20,6 @@ package org.apache.cassandra.db.context;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
-import java.util.*;
import org.apache.commons.lang.ArrayUtils;
Modified: cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInSession.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInSession.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInSession.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInSession.java Fri Feb 25 15:10:44 2011
@@ -105,7 +105,7 @@ public class StreamInSession
if (logger.isDebugEnabled())
logger.debug("Finished {}. Sending ack to {}", remoteFile, this);
- Future future = CompactionManager.instance.submitSSTableBuild(localFile.desc, remoteFile.type);
+ Future<SSTableReader> future = CompactionManager.instance.submitSSTableBuild(localFile.desc, remoteFile.type);
buildFutures.add(future);
files.remove(remoteFile);
Modified: cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOut.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOut.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOut.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOut.java Fri Feb 25 15:10:44 2011
@@ -98,7 +98,7 @@ public class StreamOut
{
Table table = Table.open(tableName);
logger.info("Flushing memtables for {}...", tableName);
- for (Future f : table.flush())
+ for (Future<?> f : table.flush())
{
try
{
Modified: cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamingService.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamingService.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamingService.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamingService.java Fri Feb 25 15:10:44 2011
@@ -27,12 +27,9 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class StreamingService implements StreamingServiceMBean
{
- private static final Logger logger = LoggerFactory.getLogger(StreamingService.class);
public static final String MBEAN_OBJECT_NAME = "org.apache.cassandra.net:type=StreamingService";
public static final StreamingService instance = new StreamingService();
Modified: cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java Fri Feb 25 15:10:44 2011
@@ -55,7 +55,6 @@ import org.apache.cassandra.service.Clie
import org.apache.cassandra.service.StorageProxy;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.FBUtilities;
import org.apache.thrift.TException;
public class CassandraServer implements Cassandra.Iface
Modified: cassandra/trunk/src/java/org/apache/cassandra/utils/BloomFilter.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/utils/BloomFilter.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/utils/BloomFilter.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/utils/BloomFilter.java Fri Feb 25 15:10:44 2011
@@ -24,7 +24,6 @@ import org.apache.cassandra.io.ICompactS
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.utils.obs.OpenBitSet;
public class BloomFilter extends Filter
Modified: cassandra/trunk/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/utils/EstimatedHistogram.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/utils/EstimatedHistogram.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/utils/EstimatedHistogram.java Fri Feb 25 15:10:44 2011
@@ -19,14 +19,11 @@
package org.apache.cassandra.utils;
import java.io.DataInput;
-import java.io.DataInputStream;
import java.io.DataOutput;
-import java.io.DataOutputStream;
import java.io.IOException;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicLongArray;
-import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.io.ICompactSerializer2;
public class EstimatedHistogram
Modified: cassandra/trunk/src/java/org/apache/cassandra/utils/ExpiringMap.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/utils/ExpiringMap.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/utils/ExpiringMap.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/utils/ExpiringMap.java Fri Feb 25 15:10:44 2011
@@ -19,17 +19,13 @@
package org.apache.cassandra.utils;
import java.util.*;
-import java.util.concurrent.Callable;
import com.google.common.base.Function;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.cliffc.high_scale_lib.NonBlockingHashMap;
public class ExpiringMap<K, V>
{
- private static final Logger logger = LoggerFactory.getLogger(ExpiringMap.class);
private final Function<Pair<K,V>, ?> postExpireHook;
private static class CacheableObject<T>
Modified: cassandra/trunk/src/java/org/apache/cassandra/utils/GuidGenerator.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/utils/GuidGenerator.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/utils/GuidGenerator.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/utils/GuidGenerator.java Fri Feb 25 15:10:44 2011
@@ -21,15 +21,10 @@ package org.apache.cassandra.utils;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
-import java.security.MessageDigest;
import java.security.SecureRandom;
import java.util.Random;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class GuidGenerator {
- private static Logger logger_ = LoggerFactory.getLogger(GuidGenerator.class);
private static Random myRand;
private static SecureRandom mySecureRand;
private static String s_id;
Modified: cassandra/trunk/src/java/org/apache/cassandra/utils/LegacyBloomFilter.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/utils/LegacyBloomFilter.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/utils/LegacyBloomFilter.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/utils/LegacyBloomFilter.java Fri Feb 25 15:10:44 2011
@@ -18,7 +18,6 @@
package org.apache.cassandra.utils;
-import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.BitSet;
@@ -122,7 +121,7 @@ public class LegacyBloomFilter extends F
return filter_.toString();
}
- ICompactSerializer tserializer()
+ ICompactSerializer<LegacyBloomFilter> tserializer()
{
return serializer_;
}
Modified: cassandra/trunk/src/java/org/apache/cassandra/utils/StatusLogger.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/utils/StatusLogger.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/utils/StatusLogger.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/utils/StatusLogger.java Fri Feb 25 15:10:44 2011
@@ -37,7 +37,6 @@ import org.apache.cassandra.concurrent.I
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.CompactionManager;
import org.apache.cassandra.net.MessagingService;
-import org.apache.cassandra.service.GCInspector;
public class StatusLogger
{
Modified: cassandra/trunk/src/java/org/apache/cassandra/utils/obs/ArrayUtil.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/utils/obs/ArrayUtil.java?rev=1074570&r1=1074569&r2=1074570&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/utils/obs/ArrayUtil.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/utils/obs/ArrayUtil.java Fri Feb 25 15:10:44 2011
@@ -17,8 +17,6 @@
package org.apache.cassandra.utils.obs;
-import java.util.Collection;
-
/**
* Methods for manipulating arrays.
*