From b7a1c44333e32d765c47ded53f761fb746e4b4a6 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Mon, 16 Nov 2009 19:37:07 +0000 Subject: [PATCH] r/m underscores. patch by jbellis git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@880924 13f79535-47bb-0310-9956-ffa450edef68 --- .../DatacenterQuorumResponseHandler.java | 11 +++-- .../DatacenterQuorumSyncResponseHandler.java | 6 +-- .../service/QuorumResponseHandler.java | 42 +++++++++---------- 3 files changed, 28 insertions(+), 31 deletions(-) diff --git a/src/java/org/apache/cassandra/service/DatacenterQuorumResponseHandler.java b/src/java/org/apache/cassandra/service/DatacenterQuorumResponseHandler.java index 0e6a9e8a12..7ab4e62643 100644 --- a/src/java/org/apache/cassandra/service/DatacenterQuorumResponseHandler.java +++ b/src/java/org/apache/cassandra/service/DatacenterQuorumResponseHandler.java @@ -5,7 +5,6 @@ package org.apache.cassandra.service; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.List; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.locator.IEndPointSnitch; @@ -36,7 +35,7 @@ public class DatacenterQuorumResponseHandler extends QuorumResponseHandler public void response(Message message) { // IF done look no futher. - if (condition_.isSignaled()) + if (condition.isSignaled()) { return; } @@ -52,13 +51,13 @@ public class DatacenterQuorumResponseHandler extends QuorumResponseHandler { throw new RuntimeException(e); } - responses_.add(message); + responses.add(message); if (blockFor <= 0) { //Singnal when Quorum is recived. - condition_.signal(); + condition.signal(); } - if (logger_.isDebugEnabled()) - logger_.debug("Processed Message: " + message.toString()); + if (logger.isDebugEnabled()) + logger.debug("Processed Message: " + message.toString()); } } diff --git a/src/java/org/apache/cassandra/service/DatacenterQuorumSyncResponseHandler.java b/src/java/org/apache/cassandra/service/DatacenterQuorumSyncResponseHandler.java index fe80b00098..ac9c61cffe 100644 --- a/src/java/org/apache/cassandra/service/DatacenterQuorumSyncResponseHandler.java +++ b/src/java/org/apache/cassandra/service/DatacenterQuorumSyncResponseHandler.java @@ -30,7 +30,7 @@ public class DatacenterQuorumSyncResponseHandler extends QuorumResponseHandle @Override public void response(Message message) { - if (condition_.isSignaled()) + if (condition.isSignaled()) { return; } @@ -63,12 +63,12 @@ public class DatacenterQuorumSyncResponseHandler extends QuorumResponseHandle { throw new RuntimeException(e); } - responses_.add(message); + responses.add(message); // If done then the response count will be empty after removing // everything. if (responseCounts.isEmpty()) { - condition_.signal(); + condition.signal(); } } } diff --git a/src/java/org/apache/cassandra/service/QuorumResponseHandler.java b/src/java/org/apache/cassandra/service/QuorumResponseHandler.java index 9b68b7b100..7fcdbbab1d 100644 --- a/src/java/org/apache/cassandra/service/QuorumResponseHandler.java +++ b/src/java/org/apache/cassandra/service/QuorumResponseHandler.java @@ -20,8 +20,6 @@ package org.apache.cassandra.service; import java.util.List; import java.util.ArrayList; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.locks.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.io.IOException; @@ -30,39 +28,39 @@ 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.LogUtil; import org.apache.cassandra.utils.SimpleCondition; import org.apache.log4j.Logger; public class QuorumResponseHandler implements IAsyncCallback { - protected static Logger logger_ = Logger.getLogger( QuorumResponseHandler.class ); - protected SimpleCondition condition_ = new SimpleCondition(); - private int responseCount_; - protected List responses_ = new ArrayList(); - private IResponseResolver responseResolver_; - private long startTime_; + protected static final Logger logger = Logger.getLogger( QuorumResponseHandler.class ); + protected final SimpleCondition condition = new SimpleCondition(); + private final int responseCount; + protected final List responses; + private IResponseResolver responseResolver; + private final long startTime; public QuorumResponseHandler(int responseCount, IResponseResolver responseResolver) { assert 1 <= responseCount && responseCount <= DatabaseDescriptor.getReplicationFactor() : "invalid response count " + responseCount; - responseCount_ = responseCount; - responseResolver_ = responseResolver; - startTime_ = System.currentTimeMillis(); + this.responseCount = responseCount; + responses = new ArrayList(responseCount); + this.responseResolver = responseResolver; + startTime = System.currentTimeMillis(); } public T get() throws TimeoutException, DigestMismatchException, IOException { try { - long timeout = System.currentTimeMillis() - startTime_ + DatabaseDescriptor.getRpcTimeout(); + long timeout = System.currentTimeMillis() - startTime + DatabaseDescriptor.getRpcTimeout(); boolean success; try { - success = condition_.await(timeout, TimeUnit.MILLISECONDS); + success = condition.await(timeout, TimeUnit.MILLISECONDS); } catch (InterruptedException ex) { @@ -72,33 +70,33 @@ public class QuorumResponseHandler implements IAsyncCallback if (!success) { StringBuilder sb = new StringBuilder(""); - for (Message message : responses_) + for (Message message : responses) { sb.append(message.getFrom()); } - throw new TimeoutException("Operation timed out - received only " + responses_.size() + " responses from " + sb.toString() + " ."); + throw new TimeoutException("Operation timed out - received only " + responses.size() + " responses from " + sb.toString() + " ."); } } finally { - for (Message response : responses_) + for (Message response : responses) { MessagingService.removeRegisteredCallback(response.getMessageId()); } } - return responseResolver_.resolve(responses_); + return responseResolver.resolve(responses); } public void response(Message message) { - if (condition_.isSignaled()) + if (condition.isSignaled()) return; - responses_.add(message); - if (responses_.size() >= responseCount_ && responseResolver_.isDataPresent(responses_)) + responses.add(message); + if (responses.size() >= responseCount && responseResolver.isDataPresent(responses)) { - condition_.signal(); + condition.signal(); } } }