Author: gdusbabek
Date: Wed Feb 9 19:11:17 2011
New Revision: 1069036
URL: http://svn.apache.org/viewvc?rev=1069036&view=rev
Log:
fix misspeeling. patch by gdusbabek, reviewed by jbellis. CASSANDRA-2140
Added:
cassandra/trunk/src/java/org/apache/cassandra/net/CachingMessageProducer.java
- copied, changed from r1069035,
cassandra/trunk/src/java/org/apache/cassandra/net/CacheingMessageProducer.java
Removed:
cassandra/trunk/src/java/org/apache/cassandra/net/CacheingMessageProducer.java
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java
cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
Copied:
cassandra/trunk/src/java/org/apache/cassandra/net/CachingMessageProducer.java
(from r1069035,
cassandra/trunk/src/java/org/apache/cassandra/net/CacheingMessageProducer.java)
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/net/CachingMessageProducer.java?p2=cassandra/trunk/src/java/org/apache/cassandra/net/CachingMessageProducer.java&p1=cassandra/trunk/src/java/org/apache/cassandra/net/CacheingMessageProducer.java&r1=1069035&r2=1069036&rev=1069036&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/net/CacheingMessageProducer.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/net/CachingMessageProducer.java
Wed Feb 9 19:11:17 2011
@@ -4,12 +4,12 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-public class CacheingMessageProducer implements MessageProducer
+public class CachingMessageProducer implements MessageProducer
{
private final MessageProducer prod;
private final Map<Integer, Message> messages = new HashMap<Integer,
Message>();
- public CacheingMessageProducer(MessageProducer prod)
+ public CachingMessageProducer(MessageProducer prod)
{
this.prod = prod;
}
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java?rev=1069036&r1=1069035&r2=1069036&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/MigrationManager.java
Wed Feb 9 19:11:17 2011
@@ -25,7 +25,7 @@ import java.util.*;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import org.apache.cassandra.net.CacheingMessageProducer;
+import org.apache.cassandra.net.CachingMessageProducer;
import org.apache.cassandra.net.MessageProducer;
import org.apache.cassandra.utils.ByteBufferUtil;
import org.slf4j.Logger;
@@ -94,7 +94,7 @@ public class MigrationManager implements
/** actively announce my version to a set of hosts via rpc. They may
culminate with them sending me migrations. */
public static void announce(final UUID version, Set<InetAddress> hosts)
{
- MessageProducer prod = new CacheingMessageProducer(new
MessageProducer() {
+ MessageProducer prod = new CachingMessageProducer(new
MessageProducer() {
public Message getMessage(int protocolVersion) throws IOException
{
return makeVersionMessage(version, protocolVersion);
Modified:
cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java?rev=1069036&r1=1069035&r2=1069036&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
(original)
+++ cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java Wed
Feb 9 19:11:17 2011
@@ -30,7 +30,7 @@ import javax.management.ObjectName;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Iterables;
import com.google.common.collect.Multimap;
-import org.apache.cassandra.net.CacheingMessageProducer;
+import org.apache.cassandra.net.CachingMessageProducer;
import org.apache.cassandra.net.MessageProducer;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
@@ -208,7 +208,7 @@ public class StorageProxy implements Sto
{
// Multimap that holds onto all the messages and addresses meant for a
specific datacenter
Map<String, Multimap<Message, InetAddress>> dcMessages = new
HashMap<String, Multimap<Message, InetAddress>>(hintedEndpoints.size());
- MessageProducer prod = new CacheingMessageProducer(rm);
+ MessageProducer prod = new CachingMessageProducer(rm);
for (Map.Entry<InetAddress, Collection<InetAddress>> entry :
hintedEndpoints.asMap().entrySet())
{
@@ -558,7 +558,7 @@ public class StorageProxy implements Sto
// We lazy-construct the digest Message object since it may not be
necessary if we
// are doing a local digest read, or no digest reads at all.
- MessageProducer prod = new CacheingMessageProducer(digestCommand);
+ MessageProducer prod = new CachingMessageProducer(digestCommand);
for (InetAddress digestPoint : endpoints.subList(1,
endpoints.size()))
{
if (digestPoint.equals(FBUtilities.getLocalAddress()))
@@ -670,7 +670,7 @@ public class StorageProxy implements Sto
{
ReadResponseResolver resolver = new
ReadResponseResolver(command.table, command.key);
RepairCallback<Row> handler = new RepairCallback<Row>(resolver,
endpoints);
- MessageProducer prod = new CacheingMessageProducer(command);
+ MessageProducer prod = new CachingMessageProducer(command);
for (InetAddress endpoint : endpoints)
MessagingService.instance().sendRR(prod, endpoint, handler);
return handler;
@@ -725,7 +725,7 @@ public class StorageProxy implements Sto
// collect replies and resolve according to consistency
level
RangeSliceResponseResolver resolver = new
RangeSliceResponseResolver(command.keyspace, liveEndpoints);
ReadCallback<List<Row>> handler =
getReadCallback(resolver, command.keyspace, consistency_level);
- MessageProducer prod = new CacheingMessageProducer(c2);
+ MessageProducer prod = new CachingMessageProducer(c2);
// TODO bail early if live endpoints can't satisfy
requested consistency level
for (InetAddress endpoint : liveEndpoints)
{
@@ -1011,7 +1011,7 @@ public class StorageProxy implements Sto
throw new UnavailableException();
IndexScanCommand command = new IndexScanCommand(keyspace,
column_family, index_clause, column_predicate, range);
- MessageProducer prod = new CacheingMessageProducer(command);
+ MessageProducer prod = new CachingMessageProducer(command);
for (InetAddress endpoint : liveEndpoints)
{
MessagingService.instance().sendRR(prod, endpoint, handler);
@@ -1099,7 +1099,7 @@ public class StorageProxy implements Sto
// Send out the truncate calls and track the responses with the
callbacks.
logger.debug("Starting to send truncate messages to hosts {}",
allEndpoints);
final Truncation truncation = new Truncation(keyspace, cfname);
- MessageProducer prod = new CacheingMessageProducer(truncation);
+ MessageProducer prod = new CachingMessageProducer(truncation);
for (InetAddress endpoint : allEndpoints)
{
MessagingService.instance().sendRR(prod, endpoint,
responseHandler);
