You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/06/29 01:49:46 UTC
git commit: fix up logging contexts to match class
Updated Branches:
refs/heads/trunk ff339c58c -> 66f301457
fix up logging contexts to match class
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66f30145
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66f30145
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66f30145
Branch: refs/heads/trunk
Commit: 66f301457f90a49ffbd3cc4c0964f36c86871ff5
Parents: ff339c5
Author: Dave Brosius <db...@apache.org>
Authored: Fri Jun 28 19:49:16 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Fri Jun 28 19:49:16 2013 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/repair/Differencer.java | 4 +---
src/java/org/apache/cassandra/repair/NodePair.java | 1 -
src/java/org/apache/cassandra/repair/RepairJob.java | 3 +--
src/java/org/apache/cassandra/repair/RepairSession.java | 2 +-
src/java/org/apache/cassandra/repair/StreamingRepairTask.java | 4 ----
src/java/org/apache/cassandra/repair/Validator.java | 5 +----
.../org/apache/cassandra/repair/messages/RepairMessage.java | 1 -
src/java/org/apache/cassandra/repair/messages/SyncRequest.java | 2 --
.../org/apache/cassandra/repair/messages/ValidationRequest.java | 1 -
9 files changed, 4 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f30145/src/java/org/apache/cassandra/repair/Differencer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/Differencer.java b/src/java/org/apache/cassandra/repair/Differencer.java
index 82b331b..214d2c9 100644
--- a/src/java/org/apache/cassandra/repair/Differencer.java
+++ b/src/java/org/apache/cassandra/repair/Differencer.java
@@ -30,8 +30,6 @@ import org.apache.cassandra.dht.Token;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.repair.messages.SyncComplete;
import org.apache.cassandra.repair.messages.SyncRequest;
-import org.apache.cassandra.service.ActiveRepairService;
-import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.MerkleTree;
@@ -40,7 +38,7 @@ import org.apache.cassandra.utils.MerkleTree;
*/
public class Differencer implements Runnable
{
- private static Logger logger = LoggerFactory.getLogger(ActiveRepairService.class);
+ private static Logger logger = LoggerFactory.getLogger(Differencer.class);
private final RepairJobDesc desc;
public final TreeResponse r1;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f30145/src/java/org/apache/cassandra/repair/NodePair.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/NodePair.java b/src/java/org/apache/cassandra/repair/NodePair.java
index f510dc4..fb7a72a 100644
--- a/src/java/org/apache/cassandra/repair/NodePair.java
+++ b/src/java/org/apache/cassandra/repair/NodePair.java
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.net.InetAddress;
import com.google.common.base.Objects;
-import com.google.common.collect.Sets;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.net.CompactEndpointSerializationHelper;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f30145/src/java/org/apache/cassandra/repair/RepairJob.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/RepairJob.java b/src/java/org/apache/cassandra/repair/RepairJob.java
index 277075c..16daf4e 100644
--- a/src/java/org/apache/cassandra/repair/RepairJob.java
+++ b/src/java/org/apache/cassandra/repair/RepairJob.java
@@ -38,7 +38,6 @@ import org.apache.cassandra.net.IAsyncCallback;
import org.apache.cassandra.net.MessageIn;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.repair.messages.ValidationRequest;
-import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.MerkleTree;
import org.apache.cassandra.utils.SimpleCondition;
@@ -48,7 +47,7 @@ import org.apache.cassandra.utils.SimpleCondition;
*/
public class RepairJob
{
- private static Logger logger = LoggerFactory.getLogger(ActiveRepairService.class);
+ private static Logger logger = LoggerFactory.getLogger(RepairJob.class);
public final RepairJobDesc desc;
private final boolean isSequential;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f30145/src/java/org/apache/cassandra/repair/RepairSession.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/RepairSession.java b/src/java/org/apache/cassandra/repair/RepairSession.java
index 5761597..2e93104 100644
--- a/src/java/org/apache/cassandra/repair/RepairSession.java
+++ b/src/java/org/apache/cassandra/repair/RepairSession.java
@@ -71,7 +71,7 @@ import org.apache.cassandra.utils.*;
*/
public class RepairSession extends WrappedRunnable implements IEndpointStateChangeSubscriber, IFailureDetectionEventListener
{
- private static Logger logger = LoggerFactory.getLogger(ActiveRepairService.class);
+ private static Logger logger = LoggerFactory.getLogger(RepairSession.class);
/** Repair session ID */
private final UUID id;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f30145/src/java/org/apache/cassandra/repair/StreamingRepairTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/StreamingRepairTask.java b/src/java/org/apache/cassandra/repair/StreamingRepairTask.java
index 134894d..17587a5 100644
--- a/src/java/org/apache/cassandra/repair/StreamingRepairTask.java
+++ b/src/java/org/apache/cassandra/repair/StreamingRepairTask.java
@@ -17,15 +17,11 @@
*/
package org.apache.cassandra.repair;
-import java.util.Collection;
-import java.util.Collections;
import java.util.concurrent.atomic.AtomicInteger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.cassandra.db.ColumnFamilyStore;
-import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.repair.messages.SyncComplete;
import org.apache.cassandra.repair.messages.SyncRequest;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f30145/src/java/org/apache/cassandra/repair/Validator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/Validator.java b/src/java/org/apache/cassandra/repair/Validator.java
index 0a7f927..4e8e865 100644
--- a/src/java/org/apache/cassandra/repair/Validator.java
+++ b/src/java/org/apache/cassandra/repair/Validator.java
@@ -33,11 +33,8 @@ import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.DecoratedKey;
import org.apache.cassandra.db.compaction.AbstractCompactedRow;
-import org.apache.cassandra.dht.Range;
-import org.apache.cassandra.dht.Token;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.repair.messages.ValidationComplete;
-import org.apache.cassandra.service.ActiveRepairService;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.MerkleTree;
@@ -51,7 +48,7 @@ import org.apache.cassandra.utils.MerkleTree;
*/
public class Validator implements Runnable
{
- private static final Logger logger = LoggerFactory.getLogger(ActiveRepairService.class);
+ private static final Logger logger = LoggerFactory.getLogger(Validator.class);
public final RepairJobDesc desc;
public final InetAddress initiator;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f30145/src/java/org/apache/cassandra/repair/messages/RepairMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/messages/RepairMessage.java b/src/java/org/apache/cassandra/repair/messages/RepairMessage.java
index a0839f3..f546410 100644
--- a/src/java/org/apache/cassandra/repair/messages/RepairMessage.java
+++ b/src/java/org/apache/cassandra/repair/messages/RepairMessage.java
@@ -21,7 +21,6 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.cassandra.db.TypeSizes;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.net.MessageOut;
import org.apache.cassandra.net.MessagingService;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f30145/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/messages/SyncRequest.java b/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
index a06254b..042e35d 100644
--- a/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
+++ b/src/java/org/apache/cassandra/repair/messages/SyncRequest.java
@@ -29,10 +29,8 @@ import org.apache.cassandra.db.TypeSizes;
import org.apache.cassandra.dht.AbstractBounds;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.dht.Token;
-import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.net.CompactEndpointSerializationHelper;
import org.apache.cassandra.repair.RepairJobDesc;
-import org.apache.cassandra.utils.FBUtilities;
/**
* Body part of SYNC_REQUEST repair message.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66f30145/src/java/org/apache/cassandra/repair/messages/ValidationRequest.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/messages/ValidationRequest.java b/src/java/org/apache/cassandra/repair/messages/ValidationRequest.java
index 3b9f6dd..1ebbb1a 100644
--- a/src/java/org/apache/cassandra/repair/messages/ValidationRequest.java
+++ b/src/java/org/apache/cassandra/repair/messages/ValidationRequest.java
@@ -22,7 +22,6 @@ import java.io.DataOutput;
import java.io.IOException;
import org.apache.cassandra.db.TypeSizes;
-import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.repair.RepairJobDesc;
/**