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 2012/08/24 05:54:58 UTC
git commit: Add missing String.format call to log string contents
patch by Julien Lambert reviewed by dbrosius for CASSANDRA-4574
Updated Branches:
refs/heads/cassandra-1.0 197511f0b -> ec76baf0d
Add missing String.format call to log string contents
patch by Julien Lambert reviewed by dbrosius for CASSANDRA-4574
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ec76baf0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ec76baf0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ec76baf0
Branch: refs/heads/cassandra-1.0
Commit: ec76baf0dd2a976542106cd5e58652c3d36ffd23
Parents: 197511f
Author: Dave Brosius <db...@apache.org>
Authored: Thu Aug 23 23:51:41 2012 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Thu Aug 23 23:51:41 2012 -0400
----------------------------------------------------------------------
.../cassandra/service/AntiEntropyService.java | 22 +++++++-------
1 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ec76baf0/src/java/org/apache/cassandra/service/AntiEntropyService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/AntiEntropyService.java b/src/java/org/apache/cassandra/service/AntiEntropyService.java
index 0ded3cd..7bdeb20 100644
--- a/src/java/org/apache/cassandra/service/AntiEntropyService.java
+++ b/src/java/org/apache/cassandra/service/AntiEntropyService.java
@@ -259,7 +259,7 @@ public class AntiEntropyService
private transient DecoratedKey lastKey;
public final static MerkleTree.RowHash EMPTY_ROW = new MerkleTree.RowHash(null, new byte[0]);
-
+
Validator(TreeRequest request)
{
this(request,
@@ -451,9 +451,9 @@ public class AntiEntropyService
* Trigger a validation compaction which will return the tree upon completion.
*/
public void doVerb(Message message, String id)
- {
+ {
byte[] bytes = message.getMessageBody();
-
+
DataInputStream buffer = new DataInputStream(new FastByteArrayInputStream(bytes));
try
{
@@ -468,7 +468,7 @@ public class AntiEntropyService
}
catch (IOException e)
{
- throw new IOError(e);
+ throw new IOError(e);
}
}
}
@@ -487,9 +487,9 @@ public class AntiEntropyService
FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
SERIALIZER.serialize(validator, dos, Gossiper.instance.getVersion(validator.request.endpoint));
- return new Message(local,
- StorageService.Verb.TREE_RESPONSE,
- bos.toByteArray(),
+ return new Message(local,
+ StorageService.Verb.TREE_RESPONSE,
+ bos.toByteArray(),
Gossiper.instance.getVersion(validator.request.endpoint));
}
catch(IOException e)
@@ -519,7 +519,7 @@ public class AntiEntropyService
}
public void doVerb(Message message, String id)
- {
+ {
byte[] bytes = message.getMessageBody();
DataInputStream buffer = new DataInputStream(new FastByteArrayInputStream(bytes));
@@ -572,7 +572,7 @@ public class AntiEntropyService
{
return Objects.hashCode(sessionid, endpoint, cf, range);
}
-
+
@Override
public final boolean equals(Object o)
{
@@ -582,7 +582,7 @@ public class AntiEntropyService
// handles nulls properly
return Objects.equal(sessionid, that.sessionid) && Objects.equal(endpoint, that.endpoint) && Objects.equal(cf, that.cf) && Objects.equal(range, that.range);
}
-
+
@Override
public String toString()
{
@@ -660,7 +660,7 @@ public class AntiEntropyService
if (endpoints.isEmpty())
{
differencingDone.signalAll();
- logger.info("[repair #%s] No neighbors to repair with on range %s: session completed", getName(), range);
+ logger.info(String.format("[repair #%s] No neighbors to repair with on range %s: session completed", getName(), range));
return;
}