You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by gd...@apache.org on 2010/03/12 21:01:09 UTC
svn commit: r922409 [2/2] - in /incubator/cassandra/trunk: ./
contrib/mutex/src/org/apache/cassandra/mutex/
contrib/property_snitch/src/java/org/apache/cassandra/locator/
contrib/word_count/src/ src/java/org/apache/cassandra/avro/
src/java/org/apache/c...
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/QuorumResponseHandler.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/QuorumResponseHandler.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/QuorumResponseHandler.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/QuorumResponseHandler.java Fri Mar 12 20:01:07 2010
@@ -33,11 +33,12 @@ import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.SimpleCondition;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class QuorumResponseHandler<T> implements IAsyncCallback
{
- protected static final Logger logger = Logger.getLogger( QuorumResponseHandler.class );
+ protected static final Logger logger = LoggerFactory.getLogger( QuorumResponseHandler.class );
protected final SimpleCondition condition = new SimpleCondition();
protected final Collection<Message> responses;
private IResponseResolver<T> responseResolver;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java Fri Mar 12 20:01:07 2010
@@ -22,7 +22,8 @@ import java.io.IOException;
import java.net.InetAddress;
import java.util.*;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.commons.collections.iterators.CollatingIterator;
@@ -40,7 +41,7 @@ import org.apache.cassandra.utils.Reduci
*/
public class RangeSliceResponseResolver implements IResponseResolver<List<Row>>
{
- private static final Logger logger_ = Logger.getLogger(RangeSliceResponseResolver.class);
+ private static final Logger logger_ = LoggerFactory.getLogger(RangeSliceResponseResolver.class);
private final String table;
private final List<InetAddress> sources;
@@ -121,4 +122,4 @@ public class RangeSliceResponseResolver
return iter.hasNext() ? new Pair<Row, InetAddress>(iter.next(), source) : endOfData();
}
}
-}
\ No newline at end of file
+}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java Fri Mar 12 20:01:07 2010
@@ -25,12 +25,13 @@ 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;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class RangeSliceVerbHandler implements IVerbHandler
{
- private static final Logger logger = Logger.getLogger(RangeSliceVerbHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(RangeSliceVerbHandler.class);
public void doVerb(Message message)
{
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadRepairManager.java Fri Mar 12 20:01:07 2010
@@ -31,7 +31,8 @@ import org.apache.cassandra.utils.Expiri
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.cache.ICacheExpungeHook;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/*
@@ -45,7 +46,7 @@ import org.apache.log4j.Logger;
*/
class ReadRepairManager
{
- private static final Logger logger_ = Logger.getLogger(ReadRepairManager.class);
+ private static final Logger logger_ = LoggerFactory.getLogger(ReadRepairManager.class);
private static final long expirationTimeInMillis = 2000;
public static final ReadRepairManager instance = new ReadRepairManager();
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ReadResponseResolver.java Fri Mar 12 20:01:07 2010
@@ -36,7 +36,8 @@ import org.apache.cassandra.net.Message;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.config.DatabaseDescriptor;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Turns ReadResponse messages into Row objects, resolving to the most recent
@@ -44,7 +45,7 @@ import org.apache.log4j.Logger;
*/
public class ReadResponseResolver implements IResponseResolver<Row>
{
- private static Logger logger_ = Logger.getLogger(ReadResponseResolver.class);
+ private static Logger logger_ = LoggerFactory.getLogger(ReadResponseResolver.class);
private final String table;
private final int responseCount;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageLoadBalancer.java Fri Mar 12 20:01:07 2010
@@ -22,7 +22,8 @@ import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
import org.apache.cassandra.dht.Token;
@@ -70,14 +71,14 @@ public class StorageLoadBalancer impleme
int myLoad = localLoad();
InetAddress predecessor = StorageService.instance.getPredecessor(StorageService.getLocalStorageEndPoint());
if (logger_.isDebugEnabled())
- logger_.debug("Trying to relocate the predecessor " + predecessor);
+ logger_.debug("Trying to relocate the predecessor {}", predecessor);
boolean value = tryThisNode(myLoad, threshold, predecessor);
if ( !value )
{
loadInfo2_.remove(predecessor);
InetAddress successor = StorageService.instance.getSuccessor(StorageService.getLocalStorageEndPoint());
if (logger_.isDebugEnabled())
- logger_.debug("Trying to relocate the successor " + successor);
+ logger_.debug("Trying to relocate the successor {}", successor);
value = tryThisNode(myLoad, threshold, successor);
if ( !value )
{
@@ -88,7 +89,7 @@ public class StorageLoadBalancer impleme
if ( target != null )
{
if (logger_.isDebugEnabled())
- logger_.debug("Trying to relocate the random node " + target);
+ logger_.debug("Trying to relocate the random node {}", target);
value = tryThisNode(myLoad, threshold, target);
if ( !value )
{
@@ -137,7 +138,7 @@ public class StorageLoadBalancer impleme
MoveMessage moveMessage = new MoveMessage(targetToken);
Message message = new Message(StorageService.getLocalStorageEndPoint(), StorageLoadBalancer.lbStage_, StorageLoadBalancer.moveMessageVerbHandler_, new Object[]{moveMessage});
if (logger_.isDebugEnabled())
- logger_.debug("Sending a move message to " + target);
+ logger_.debug("Sending a move message to {}", target);
IAsyncResult result = MessagingService.getMessagingInstance().sendRR(message, target);
value = (Boolean)result.get()[0];
if (logger_.isDebugEnabled())
@@ -167,7 +168,7 @@ public class StorageLoadBalancer impleme
public static final StorageLoadBalancer instance = new StorageLoadBalancer();
- private static final Logger logger_ = Logger.getLogger(StorageLoadBalancer.class);
+ private static final Logger logger_ = LoggerFactory.getLogger(StorageLoadBalancer.class);
/* time to delay in minutes the actual load balance procedure if heavily loaded */
private static final int delay_ = 5;
/* If a node's load is this factor more than the average, it is considered Heavy */
@@ -262,7 +263,7 @@ public class StorageLoadBalancer impleme
}
double averageLoad = (nodeCount > 0) ? (systemLoad / nodeCount) : 0;
if (logger_.isDebugEnabled())
- logger_.debug("Average system load is " + averageLoad);
+ logger_.debug("Average system load is {}", averageLoad);
return averageLoad;
}
@@ -362,7 +363,7 @@ public class StorageLoadBalancer impleme
int duration = BROADCAST_INTERVAL + StorageService.RING_DELAY;
try
{
- logger_.info("Sleeping " + duration + " ms to wait for load information...");
+ logger_.info("Sleeping {} ms to wait for load information...", duration);
Thread.sleep(duration);
}
catch (InterruptedException e)
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java Fri Mar 12 20:01:07 2010
@@ -30,7 +30,8 @@ import java.util.concurrent.TimeoutExcep
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
@@ -58,7 +59,7 @@ import org.apache.cassandra.utils.Wrappe
public class StorageProxy implements StorageProxyMBean
{
- private static final Logger logger = Logger.getLogger(StorageProxy.class);
+ private static final Logger logger = LoggerFactory.getLogger(StorageProxy.class);
// mbean stuff
private static final LatencyTracker readStats = new LatencyTracker();
@@ -550,7 +551,7 @@ public class StorageProxy implements Sto
throws IOException, UnavailableException, TimeoutException
{
if (logger.isDebugEnabled())
- logger.debug(command);
+ logger.debug(command.toString());
long startTime = System.nanoTime();
final String table = command.keyspace;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java Fri Mar 12 20:01:07 2010
@@ -51,7 +51,9 @@ import org.apache.cassandra.utils.FBUtil
import org.apache.cassandra.utils.WrappedRunnable;
import org.apache.cassandra.io.util.FileUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.log4j.Level;
import org.apache.commons.lang.StringUtils;
@@ -66,7 +68,7 @@ import com.google.common.collect.HashMul
*/
public class StorageService implements IEndPointStateChangeSubscriber, StorageServiceMBean
{
- private static Logger logger_ = Logger.getLogger(StorageService.class);
+ private static Logger logger_ = LoggerFactory.getLogger(StorageService.class);
public static final int RING_DELAY = 30 * 1000; // delay after which we assume ring has stablized
@@ -185,7 +187,7 @@ public class StorageService implements I
public void setToken(Token token)
{
if (logger_.isDebugEnabled())
- logger_.debug("Setting token to " + token);
+ logger_.debug("Setting token to {}", token);
SystemTable.updateToken(token);
tokenMetadata_.updateNormalToken(token, FBUtilities.getLocalAddress());
}
@@ -673,7 +675,7 @@ public class StorageService implements I
if (bootstrapTokens.isEmpty() && leavingEndPoints.isEmpty())
{
if (logger_.isDebugEnabled())
- logger_.debug("No bootstrapping or leaving nodes -> empty pending ranges for " + table);
+ logger_.debug("No bootstrapping or leaving nodes -> empty pending ranges for {}", table);
tm.setPendingRanges(table, pendingRanges);
return;
}
@@ -1205,7 +1207,7 @@ public class StorageService implements I
public void setLog4jLevel(String classQualifier, String rawLevel)
{
Level level = Level.toLevel(rawLevel);
- Logger.getLogger(classQualifier).setLevel(level);
+ org.apache.log4j.Logger.getLogger(classQualifier).setLevel(level);
logger_.info("set log level to " + level + " for classes under '" + classQualifier + "' (if the level doesn't look like '" + rawLevel + "' then log4j couldn't parse '" + rawLevel + "')");
}
@@ -1418,7 +1420,7 @@ public class StorageService implements I
StorageLoadBalancer.instance.waitForLoadInfo();
bootstrapToken = BootStrapper.getBalancedToken(tokenMetadata_, StorageLoadBalancer.instance.getLoadInfo());
}
- logger_.info("re-bootstrapping to new token " + bootstrapToken);
+ logger_.info("re-bootstrapping to new token {}", bootstrapToken);
startBootstrap(bootstrapToken);
}
};
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/WriteResponseHandler.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/WriteResponseHandler.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/WriteResponseHandler.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/WriteResponseHandler.java Fri Mar 12 20:01:07 2010
@@ -34,11 +34,12 @@ import org.apache.cassandra.net.Message;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.utils.SimpleCondition;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class WriteResponseHandler implements IAsyncCallback
{
- protected static final Logger logger = Logger.getLogger( WriteResponseHandler.class );
+ protected static final Logger logger = LoggerFactory.getLogger( WriteResponseHandler.class );
protected final SimpleCondition condition = new SimpleCondition();
private final int responseCount;
protected final Collection<Message> responses;
@@ -105,4 +106,4 @@ public class WriteResponseHandler implem
condition.signal();
}
}
-}
\ No newline at end of file
+}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/IncomingStreamReader.java Fri Mar 12 20:01:07 2010
@@ -24,13 +24,14 @@ import java.nio.channels.FileChannel;
import java.nio.channels.SocketChannel;
import java.io.*;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.cassandra.net.FileStreamTask;
public class IncomingStreamReader
{
- private static Logger logger = Logger.getLogger(IncomingStreamReader.class);
+ private static Logger logger = LoggerFactory.getLogger(IncomingStreamReader.class);
private PendingFile pendingFile;
private CompletedFileStatus streamStatus;
private SocketChannel socketChannel;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamCompletionHandler.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamCompletionHandler.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamCompletionHandler.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamCompletionHandler.java Fri Mar 12 20:01:07 2010
@@ -23,7 +23,8 @@ import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.cassandra.db.Table;
import org.apache.cassandra.io.sstable.SSTableReader;
@@ -41,7 +42,7 @@ import org.apache.cassandra.service.Stor
*/
class StreamCompletionHandler implements IStreamComplete
{
- private static Logger logger = Logger.getLogger(StreamCompletionHandler.class);
+ private static Logger logger = LoggerFactory.getLogger(StreamCompletionHandler.class);
public void onStreamCompletion(InetAddress host, PendingFile pendingFile, CompletedFileStatus streamStatus) throws IOException
{
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamFinishedVerbHandler.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamFinishedVerbHandler.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamFinishedVerbHandler.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamFinishedVerbHandler.java Fri Mar 12 20:01:07 2010
@@ -26,7 +26,8 @@ import java.io.DataInputStream;
import java.io.IOError;
import java.io.IOException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
@@ -34,7 +35,7 @@ import org.apache.cassandra.streaming.St
public class StreamFinishedVerbHandler implements IVerbHandler
{
- private static Logger logger = Logger.getLogger(StreamFinishedVerbHandler.class);
+ private static Logger logger = LoggerFactory.getLogger(StreamFinishedVerbHandler.class);
public void doVerb(Message message)
{
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamIn.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamIn.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamIn.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamIn.java Fri Mar 12 20:01:07 2010
@@ -24,7 +24,8 @@ package org.apache.cassandra.streaming;
import java.net.InetAddress;
import java.util.Collection;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.commons.lang.StringUtils;
import org.apache.cassandra.dht.Range;
@@ -35,7 +36,7 @@ import org.apache.cassandra.utils.FBUtil
/** for streaming data from other nodes in to this one */
public class StreamIn
{
- private static Logger logger = Logger.getLogger(StreamOut.class);
+ private static Logger logger = LoggerFactory.getLogger(StreamOut.class);
/**
* Request ranges to be transferred from source to local node
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInManager.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInManager.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInManager.java Fri Mar 12 20:01:07 2010
@@ -26,11 +26,12 @@ import com.google.common.collect.Multima
import com.google.common.collect.Multimaps;
import org.apache.cassandra.streaming.IStreamComplete;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
class StreamInManager
{
- private static final Logger logger = Logger.getLogger(StreamInManager.class);
+ private static final Logger logger = LoggerFactory.getLogger(StreamInManager.class);
/* Maintain a stream context per host that is the source of the stream */
public static final Map<InetAddress, List<PendingFile>> ctxBag_ = new Hashtable<InetAddress, List<PendingFile>>();
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInitiateDoneVerbHandler.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInitiateDoneVerbHandler.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInitiateDoneVerbHandler.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInitiateDoneVerbHandler.java Fri Mar 12 20:01:07 2010
@@ -21,7 +21,8 @@ package org.apache.cassandra.streaming;
*/
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
@@ -29,7 +30,7 @@ import org.apache.cassandra.streaming.St
public class StreamInitiateDoneVerbHandler implements IVerbHandler
{
- private static Logger logger = Logger.getLogger(StreamInitiateDoneVerbHandler.class);
+ private static Logger logger = LoggerFactory.getLogger(StreamInitiateDoneVerbHandler.class);
public void doVerb(Message message)
{
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInitiateVerbHandler.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInitiateVerbHandler.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInitiateVerbHandler.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInitiateVerbHandler.java Fri Mar 12 20:01:07 2010
@@ -23,7 +23,8 @@ import java.io.*;
import java.net.InetAddress;
import java.util.*;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ColumnFamilyStore;
@@ -39,7 +40,7 @@ import org.apache.cassandra.utils.FBUtil
public class StreamInitiateVerbHandler implements IVerbHandler
{
- private static Logger logger = Logger.getLogger(StreamInitiateVerbHandler.class);
+ private static Logger logger = LoggerFactory.getLogger(StreamInitiateVerbHandler.class);
/*
* Here we handle the StreamInitiateMessage. Here we get the
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOut.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOut.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOut.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOut.java Fri Mar 12 20:01:07 2010
@@ -27,7 +27,8 @@ import java.io.IOError;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.commons.lang.StringUtils;
import org.apache.cassandra.dht.Range;
@@ -53,7 +54,7 @@ import org.apache.cassandra.net.Messagin
*/
public class StreamOut
{
- private static Logger logger = Logger.getLogger(StreamOut.class);
+ private static Logger logger = LoggerFactory.getLogger(StreamOut.class);
static String TABLE_NAME = "STREAMING-TABLE-NAME";
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOutManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOutManager.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOutManager.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamOutManager.java Fri Mar 12 20:01:07 2010
@@ -37,14 +37,15 @@ import org.apache.cassandra.utils.FBUtil
import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.utils.SimpleCondition;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class manages the streaming of multiple files one after the other.
*/
public class StreamOutManager
{
- private static Logger logger = Logger.getLogger( StreamOutManager.class );
+ private static Logger logger = LoggerFactory.getLogger( StreamOutManager.class );
private static ConcurrentMap<InetAddress, StreamOutManager> streamManagers = new ConcurrentHashMap<InetAddress, StreamOutManager>();
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamRequestVerbHandler.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamRequestVerbHandler.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamRequestVerbHandler.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamRequestVerbHandler.java Fri Mar 12 20:01:07 2010
@@ -26,7 +26,8 @@ import java.io.IOError;
import org.apache.cassandra.net.IVerbHandler;
import org.apache.cassandra.net.Message;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This verb handler handles the StreamRequestMessage that is sent by
@@ -34,7 +35,7 @@ import org.apache.log4j.Logger;
*/
public class StreamRequestVerbHandler implements IVerbHandler
{
- private static Logger logger_ = Logger.getLogger(StreamRequestVerbHandler.class);
+ private static Logger logger_ = LoggerFactory.getLogger(StreamRequestVerbHandler.class);
public void doVerb(Message message)
{
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamingService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamingService.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamingService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamingService.java Fri Mar 12 20:01:07 2010
@@ -18,7 +18,8 @@
package org.apache.cassandra.streaming;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -31,7 +32,7 @@ import java.util.Set;
public class StreamingService implements StreamingServiceMBean
{
- private static final Logger logger = Logger.getLogger(StreamingService.class);
+ private static final Logger logger = LoggerFactory.getLogger(StreamingService.class);
public static final String MBEAN_OBJECT_NAME = "org.apache.cassandra.streaming:type=StreamingService";
public static final StreamingService instance = new StreamingService();
static final String NOTHING = "Nothing is happening";
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraDaemon.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraDaemon.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraDaemon.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraDaemon.java Fri Mar 12 20:01:07 2010
@@ -23,7 +23,9 @@ import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.InetAddress;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import org.apache.log4j.PropertyConfigurator;
import org.apache.cassandra.db.commitlog.CommitLog;
@@ -52,7 +54,7 @@ import org.apache.cassandra.db.Compactio
public class CassandraDaemon
{
- private static Logger logger = Logger.getLogger(CassandraDaemon.class);
+ private static Logger logger = LoggerFactory.getLogger(CassandraDaemon.class);
private TThreadPoolServer serverEngine;
private void setup() throws IOException, TTransportException
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/thrift/CassandraServer.java Fri Mar 12 20:01:07 2010
@@ -24,7 +24,8 @@ import java.io.IOException;
import java.util.*;
import java.util.concurrent.TimeoutException;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.commons.lang.ArrayUtils;
import org.apache.cassandra.auth.AllowAllAuthenticator;
@@ -46,7 +47,7 @@ import org.json.simple.JSONValue;
public class CassandraServer implements Cassandra.Iface
{
public static String TOKEN_MAP = "token map";
- private static Logger logger = Logger.getLogger(CassandraServer.class);
+ private static Logger logger = LoggerFactory.getLogger(CassandraServer.class);
private final static List<ColumnOrSuperColumn> EMPTY_COLUMNS = Collections.emptyList();
private final static List<Column> EMPTY_SUBCOLUMNS = Collections.emptyList();
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/BloomFilter.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/BloomFilter.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/BloomFilter.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/BloomFilter.java Fri Mar 12 20:01:07 2010
@@ -25,11 +25,12 @@ import java.util.BitSet;
import org.apache.cassandra.io.ICompactSerializer;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class BloomFilter extends Filter
{
- private static final Logger logger = Logger.getLogger(BloomFilter.class);
+ private static final Logger logger = LoggerFactory.getLogger(BloomFilter.class);
static ICompactSerializer<BloomFilter> serializer_ = new BloomFilterSerializer();
private static final int EXCESS = 20;
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/ExpiringMap.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/ExpiringMap.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/ExpiringMap.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/ExpiringMap.java Fri Mar 12 20:01:07 2010
@@ -21,7 +21,8 @@ package org.apache.cassandra.utils;
import java.util.*;
import java.util.Map.Entry;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.cassandra.cache.ICacheExpungeHook;
@@ -118,7 +119,7 @@ public class ExpiringMap<K, V>
private Map<K, ICacheExpungeHook<K, V>> hooks_;
private Timer timer_;
private static int counter_ = 0;
- private static final Logger LOGGER = Logger.getLogger(ExpiringMap.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(ExpiringMap.class);
private void init(long expiration)
{
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FBUtilities.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FBUtilities.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FBUtilities.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/FBUtilities.java Fri Mar 12 20:01:07 2010
@@ -30,7 +30,8 @@ import java.util.zip.DataFormatException
import java.util.zip.Deflater;
import java.util.zip.Inflater;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.commons.collections.iterators.CollatingIterator;
@@ -46,7 +47,7 @@ import org.apache.thrift.TSerializer;
public class FBUtilities
{
- private static Logger logger_ = Logger.getLogger(FBUtilities.class);
+ private static Logger logger_ = LoggerFactory.getLogger(FBUtilities.class);
public static final BigInteger TWO = new BigInteger("2");
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/GuidGenerator.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/GuidGenerator.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/GuidGenerator.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/utils/GuidGenerator.java Fri Mar 12 20:01:07 2010
@@ -18,14 +18,15 @@
package org.apache.cassandra.utils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.*;
import java.net.*;
import java.security.*;
public class GuidGenerator {
- private static Logger logger_ = Logger.getLogger(GuidGenerator.class);
+ private static Logger logger_ = LoggerFactory.getLogger(GuidGenerator.class);
private static Random myRand;
private static SecureRandom mySecureRand;
private static String s_id;
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/CleanupHelper.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/CleanupHelper.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/CleanupHelper.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/CleanupHelper.java Fri Mar 12 20:01:07 2010
@@ -26,11 +26,12 @@ import org.junit.BeforeClass;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.io.util.FileUtils;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class CleanupHelper
{
- private static Logger logger = Logger.getLogger(CleanupHelper.class);
+ private static Logger logger = LoggerFactory.getLogger(CleanupHelper.class);
@BeforeClass
public static void cleanupAndLeaveDirs() throws IOException
Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java?rev=922409&r1=922408&r2=922409&view=diff
==============================================================================
--- incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java (original)
+++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java Fri Mar 12 20:01:07 2010
@@ -25,7 +25,8 @@ import java.math.BigInteger;
import org.apache.cassandra.dht.*;
import static org.apache.cassandra.utils.MerkleTree.*;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.AbstractIterator;
@@ -35,7 +36,7 @@ import static org.junit.Assert.*;
public class MerkleTreeTest
{
- private static final Logger logger = Logger.getLogger(MerkleTreeTest.class);
+ private static final Logger logger = LoggerFactory.getLogger(MerkleTreeTest.class);
public static byte[] DUMMY = "blah".getBytes();