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 2011/01/22 07:37:07 UTC
svn commit: r1062106 - in
/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra:
db/BinaryVerbHandler.java db/ReadRepairVerbHandler.java
db/RowMutationMessage.java service/ReadResponseResolver.java
Author: jbellis
Date: Sat Jan 22 06:37:07 2011
New Revision: 1062106
URL: http://svn.apache.org/viewvc?rev=1062106&view=rev
Log:
r/m unnecessary RowMutationMessage class
patch by jbellis
Removed:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/RowMutationMessage.java
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/BinaryVerbHandler.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/ReadResponseResolver.java
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/BinaryVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/BinaryVerbHandler.java?rev=1062106&r1=1062105&r2=1062106&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/BinaryVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/BinaryVerbHandler.java Sat Jan 22 06:37:07 2011
@@ -39,8 +39,7 @@ public class BinaryVerbHandler implement
try
{
- RowMutationMessage rmMsg = RowMutationMessage.serializer().deserialize(new DataInputStream(buffer));
- RowMutation rm = rmMsg.getRowMutation();
+ RowMutation rm = RowMutation.serializer().deserialize(new DataInputStream(buffer));
rm.applyBinary();
WriteResponse response = new WriteResponse(rm.getTable(), rm.key(), true);
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java?rev=1062106&r1=1062105&r2=1062106&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ReadRepairVerbHandler.java Sat Jan 22 06:37:07 2011
@@ -40,9 +40,8 @@ public class ReadRepairVerbHandler imple
try
{
- RowMutationMessage rmMsg = RowMutationMessage.serializer().deserialize(new DataInputStream(buffer));
- RowMutation rm = rmMsg.getRowMutation();
- rm.apply();
+ RowMutation rm = RowMutation.serializer().deserialize(new DataInputStream(buffer));
+ rm.apply();
}
catch (IOException e)
{
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/ReadResponseResolver.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/ReadResponseResolver.java?rev=1062106&r1=1062105&r2=1062106&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/ReadResponseResolver.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/ReadResponseResolver.java Sat Jan 22 06:37:07 2011
@@ -173,11 +173,10 @@ public class ReadResponseResolver implem
// create and send the row mutation message based on the diff
RowMutation rowMutation = new RowMutation(table, key.key);
rowMutation.add(diffCf);
- RowMutationMessage rowMutationMessage = new RowMutationMessage(rowMutation);
Message repairMessage;
try
{
- repairMessage = rowMutationMessage.makeRowMutationMessage(StorageService.Verb.READ_REPAIR);
+ repairMessage = rowMutation.makeRowMutationMessage(StorageService.Verb.READ_REPAIR);
}
catch (IOException e)
{