You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2009/10/12 21:57:52 UTC
svn commit: r824476 - in
/incubator/cassandra/trunk/src/java/org/apache/cassandra:
dht/BootStrapper.java net/IAsyncCallback.java net/IMessagingService.java
net/MessagingService.java service/ConsistencyManager.java
service/QuorumResponseHandler.java
Author: jbellis
Date: Mon Oct 12 19:57:52 2009
New Revision: 824476
URL: http://svn.apache.org/viewvc?rev=824476&view=rev
Log:
r/m unused attachContext.
patch by jbellis for CASSANDRA-478
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/BootStrapper.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/IAsyncCallback.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/IMessagingService.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java
incubator/cassandra/trunk/src/java/org/apache/cassandra/service/QuorumResponseHandler.java
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/BootStrapper.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/BootStrapper.java?rev=824476&r1=824475&r2=824476&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/BootStrapper.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/dht/BootStrapper.java Mon Oct 12 19:57:52 2009
@@ -282,11 +282,6 @@
}
condition.signalAll();
}
-
- public void attachContext(Object o)
- {
- throw new UnsupportedOperationException();
- }
}
public static class BootStrapInitiateVerbHandler implements IVerbHandler
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/IAsyncCallback.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/IAsyncCallback.java?rev=824476&r1=824475&r2=824476&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/IAsyncCallback.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/IAsyncCallback.java Mon Oct 12 19:57:52 2009
@@ -21,14 +21,8 @@
public interface IAsyncCallback
{
/**
- * @param msg responses to be returned
+ * @param msg response received.
+ * Calls to response() are serialized by ResponseVerbHandler.
*/
public void response(Message msg);
-
- /**
- * Attach some application specific context to the
- * callback.
- * @param o application specific context
- */
- public void attachContext(Object o);
}
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/IMessagingService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/IMessagingService.java?rev=824476&r1=824475&r2=824476&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/IMessagingService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/IMessagingService.java Mon Oct 12 19:57:52 2009
@@ -113,21 +113,6 @@
* @return an reference to message id used to match with the result
*/
public String sendRR(Message[] messages, EndPoint[] to, IAsyncCallback cb);
-
- /**
- * Send a message to a given endpoint. The ith element in the <code>messages</code>
- * array is sent to the ith element in the <code>to</code> array.This method assumes
- * there is a one-one mapping between the <code>messages</code> array and
- * the <code>to</code> array. Otherwise an IllegalArgumentException will be thrown.
- * The idea is that multi-groups of messages are grouped as one logical message
- * whose results are harnessed via the <i>IAsyncResult</i>
- * @param messages groups of grouped messages.
- * @param to destination for the groups of messages
- * @param cb the callback handler to be invoked for the responses
- * @return the group id which is basically useless - it is only returned for API's
- * to look compatible.
- */
- public String sendRR(Message[][] messages, EndPoint[][] to, IAsyncCallback cb);
/**
* Send a message to a given endpoint. This method adheres to the fire and forget
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java?rev=824476&r1=824475&r2=824476&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/net/MessagingService.java Mon Oct 12 19:57:52 2009
@@ -318,34 +318,6 @@
return groupId;
}
- public String sendRR(Message[][] messages, EndPoint[][] to, IAsyncCallback cb)
- {
- if ( messages.length != to.length )
- {
- throw new IllegalArgumentException("Number of messages and the number of endpoints need to be same.");
- }
-
- int length = messages.length;
- String[] gids = new String[length];
- /* Generate the requisite GUID's */
- for ( int i = 0; i < length; ++i )
- {
- gids[i] = GuidGenerator.guid();
- }
- /* attach this context to the callback */
- cb.attachContext(gids);
- for ( int i = 0; i < length; ++i )
- {
- callbackMap_.put(gids[i], cb);
- for ( int j = 0; j < messages[i].length; ++j )
- {
- messages[i][j].setMessageId(gids[i]);
- sendOneWay(messages[i][j], to[i][j]);
- }
- }
- return gids[0];
- }
-
/*
Use this version for fire and forget style messaging.
*/
Modified: incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java?rev=824476&r1=824475&r2=824476&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java (original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/service/ConsistencyManager.java Mon Oct 12 19:57:52 2009
@@ -53,11 +53,6 @@
if (responses_.size() == ConsistencyManager.this.replicas_.size())
handleDigestResponses();
}
-
- public void attachContext(Object o)
- {
- throw new UnsupportedOperationException("This operation is not currently supported.");
- }
private void handleDigestResponses()
{
@@ -120,12 +115,7 @@
readRepairTable_.put(messageId, messageId, this);
}
}
-
- public void attachContext(Object o)
- {
- throw new UnsupportedOperationException("This operation is not currently supported.");
- }
-
+
public void callMe(String key, String value)
{
try
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=824476&r1=824475&r2=824476&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 Oct 12 19:57:52 2009
@@ -124,9 +124,4 @@
lock_.unlock();
}
}
-
- public void attachContext(Object o)
- {
- throw new UnsupportedOperationException("This operation is not supported in this version of the callback handler");
- }
}