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/03/30 17:24:41 UTC
svn commit: r760006 - in /incubator/cassandra/trunk:
src/org/apache/cassandra/db/ReadMessage.java
test/org/apache/cassandra/db/ReadMessageTest.java
Author: jbellis
Date: Mon Mar 30 15:24:40 2009
New Revision: 760006
URL: http://svn.apache.org/viewvc?rev=760006&view=rev
Log:
clean up patch and test from Sandeep Tata fixing #21
Added:
incubator/cassandra/trunk/test/org/apache/cassandra/db/ReadMessageTest.java
Modified:
incubator/cassandra/trunk/src/org/apache/cassandra/db/ReadMessage.java
Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/ReadMessage.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/ReadMessage.java?rev=760006&r1=760005&r2=760006&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/org/apache/cassandra/db/ReadMessage.java (original)
+++ incubator/cassandra/trunk/src/org/apache/cassandra/db/ReadMessage.java Mon Mar 30 15:24:40 2009
@@ -25,6 +25,9 @@
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+
import org.apache.cassandra.continuations.Suspendable;
import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.net.Message;
@@ -154,6 +157,20 @@
{
return columns_;
}
+
+ public String toString()
+ {
+ return "ReadMessage(" +
+ "table='" + table_ + '\'' +
+ ", key='" + key_ + '\'' +
+ ", columnFamily_column='" + columnFamily_column_ + '\'' +
+ ", start=" + start_ +
+ ", count=" + count_ +
+ ", sinceTimestamp=" + sinceTimestamp_ +
+ ", columns=[" + StringUtils.join(columns_, ", ") + "]" +
+ ", isDigestQuery=" + isDigestQuery_ +
+ ')';
+ }
}
class ReadMessageSerializer implements ICompactSerializer<ReadMessage>
@@ -202,7 +219,7 @@
{
rm = new ReadMessage(table, key, columnFamily_column, columns);
}
- if( sinceTimestamp > 0 )
+ else if( sinceTimestamp > 0 )
{
rm = new ReadMessage(table, key, columnFamily_column, sinceTimestamp);
}
Added: incubator/cassandra/trunk/test/org/apache/cassandra/db/ReadMessageTest.java
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/org/apache/cassandra/db/ReadMessageTest.java?rev=760006&view=auto
==============================================================================
--- incubator/cassandra/trunk/test/org/apache/cassandra/db/ReadMessageTest.java (added)
+++ incubator/cassandra/trunk/test/org/apache/cassandra/db/ReadMessageTest.java Mon Mar 30 15:24:40 2009
@@ -0,0 +1,44 @@
+package org.apache.cassandra.db;
+
+import java.io.IOException;
+import java.util.ArrayList;
+
+import org.apache.cassandra.io.DataInputBuffer;
+import org.apache.cassandra.io.DataOutputBuffer;
+import org.testng.annotations.Test;
+
+public class ReadMessageTest
+{
+ @Test
+ public void testMakeReadMessage()
+ {
+ ArrayList<String> colList = new ArrayList<String>();
+ colList.add("col1");
+ colList.add("col2");
+
+ ReadMessage rm = new ReadMessage("Table1", "row1", "foo", colList);
+ ReadMessage rm2 = serializeAndDeserializeReadMessage(rm);
+
+ assert rm2.toString().equals(rm.toString());
+ }
+
+ private ReadMessage serializeAndDeserializeReadMessage(ReadMessage rm)
+ {
+ ReadMessage rm2 = null;
+ ReadMessageSerializer rms = (ReadMessageSerializer) ReadMessage.serializer();
+ DataOutputBuffer dos = new DataOutputBuffer();
+ DataInputBuffer dis = new DataInputBuffer();
+
+ try
+ {
+ rms.serialize(rm, dos);
+ dis.reset(dos.getData(), dos.getLength());
+ rm2 = rms.deserialize(dis);
+ }
+ catch (IOException e)
+ {
+ throw new RuntimeException(e);
+ }
+ return rm2;
+ }
+}