Author: jbellis
Date: Mon Nov 16 19:37:07 2009
New Revision: 880924
URL: http://svn.apache.org/viewvc?rev=880924&view=rev
Log:
r/m underscores. patch by jbellis
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumResponseHandler.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumSyncResponseHandler.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/QuorumResponseHandler.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumResponseHandler.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumResponseHandler.java?rev=880924&r1=880923&r2=880924&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumResponseHandler.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumResponseHandler.java
Mon Nov 16 19:37:07 2009
@@ -5,7 +5,6 @@
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 void response(Message message)
{
// IF done look no futher.
- if (condition_.isSignaled())
+ if (condition.isSignaled())
{
return;
}
@@ -52,13 +51,13 @@
{
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());
}
}
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumSyncResponseHandler.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumSyncResponseHandler.java?rev=880924&r1=880923&r2=880924&view=diff
==============================================================================
---
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumSyncResponseHandler.java
(original)
+++
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/DatacenterQuorumSyncResponseHandler.java
Mon Nov 16 19:37:07 2009
@@ -30,7 +30,7 @@
@Override
public void response(Message message)
{
- if (condition_.isSignaled())
+ if (condition.isSignaled())
{
return;
}
@@ -63,12 +63,12 @@
{
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();
}
}
}
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=880924&r1=880923&r2=880924&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
Mon Nov 16 19:37:07 2009
@@ -20,8 +20,6 @@
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.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<T> implements IAsyncCallback
{
- protected static Logger logger_ = Logger.getLogger(
QuorumResponseHandler.class );
- protected SimpleCondition condition_ = new SimpleCondition();
- private int responseCount_;
- protected List<Message> responses_ = new ArrayList<Message>();
- private IResponseResolver<T> 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<Message> responses;
+ private IResponseResolver<T> responseResolver;
+ private final long startTime;
public QuorumResponseHandler(int responseCount, IResponseResolver<T>
responseResolver)
{
assert 1 <= responseCount && responseCount <=
DatabaseDescriptor.getReplicationFactor()
: "invalid response count " + responseCount;
- responseCount_ = responseCount;
- responseResolver_ = responseResolver;
- startTime_ = System.currentTimeMillis();
+ this.responseCount = responseCount;
+ responses = new ArrayList<Message>(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 @@
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();
}
}
}
