test and fix get_column regression. patch by Jun Rao; reviewed by jbe…

…llis for #90
mzsay · Apr 21, 2009 · 0155291 · 0155291
1 parent 4cda995
commit 0155291
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/org/apache/cassandra/db/ReadCommand.java b/src/org/apache/cassandra/db/ReadCommand.java
@@ -128,7 +128,7 @@ public ReadCommand copy()
 
     public Row getRow(Table table) throws IOException, ColumnFamilyNotDefinedException
     {
-        if (columnNames != EMPTY_COLUMNS)
+        if (!columnNames.isEmpty())
         {
             return table.getRow(key, columnFamilyColumn, columnNames);
         }

diff --git a/test/org/apache/cassandra/db/ReadMessageTest.java b/test/org/apache/cassandra/db/ReadMessageTest.java
@@ -1,7 +1,10 @@
 package org.apache.cassandra.db;
 
+import static org.testng.Assert.assertNull;
+
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 
 import org.apache.cassandra.io.DataInputBuffer;
 import org.apache.cassandra.io.DataOutputBuffer;
@@ -41,4 +44,22 @@ private ReadCommand serializeAndDeserializeReadMessage(ReadCommand rm)
         }
         return rm2;
     }
+
+    @Test
+    public void testGetColumn() throws IOException, ColumnFamilyNotDefinedException
+    {
+        Table table = Table.open("Table1");
+        RowMutation rm;
+
+        // add data
+        rm = new RowMutation("Table1", "key1");
+        rm.add("Standard1:Column1", "abcd".getBytes(), 0);
+        rm.apply();
+
+        ReadCommand command = new ReadCommand("Table1", "key1", "Standard1:Column1", -1, Integer.MAX_VALUE);
+        Row row = command.getRow(table);
+        ColumnFamily cf = row.getColumnFamily("Standard1");
+        IColumn col = cf.getColumn("Column1");
+        assert Arrays.equals(((Column)col).value(), "abcd".getBytes());  
+    }
 }