Return-Path: Delivered-To: apmail-incubator-cassandra-commits-archive@minotaur.apache.org Received: (qmail 44385 invoked from network); 21 Apr 2009 02:59:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Apr 2009 02:59:14 -0000 Received: (qmail 48992 invoked by uid 500); 21 Apr 2009 02:59:14 -0000 Delivered-To: apmail-incubator-cassandra-commits-archive@incubator.apache.org Received: (qmail 48964 invoked by uid 500); 21 Apr 2009 02:59:14 -0000 Mailing-List: contact cassandra-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cassandra-dev@incubator.apache.org Delivered-To: mailing list cassandra-commits@incubator.apache.org Received: (qmail 48954 invoked by uid 99); 21 Apr 2009 02:59:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Apr 2009 02:59:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Apr 2009 02:59:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1B599238898F; Tue, 21 Apr 2009 02:58:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r766960 - in /incubator/cassandra/trunk: src/org/apache/cassandra/db/ReadCommand.java test/org/apache/cassandra/db/ReadMessageTest.java Date: Tue, 21 Apr 2009 02:58:50 -0000 To: cassandra-commits@incubator.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090421025851.1B599238898F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jbellis Date: Tue Apr 21 02:58:49 2009 New Revision: 766960 URL: http://svn.apache.org/viewvc?rev=766960&view=rev Log: test and fix get_column regression. patch by Jun Rao; reviewed by jbellis for #90 Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/ReadCommand.java incubator/cassandra/trunk/test/org/apache/cassandra/db/ReadMessageTest.java Modified: incubator/cassandra/trunk/src/org/apache/cassandra/db/ReadCommand.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/org/apache/cassandra/db/ReadCommand.java?rev=766960&r1=766959&r2=766960&view=diff ============================================================================== --- incubator/cassandra/trunk/src/org/apache/cassandra/db/ReadCommand.java (original) +++ incubator/cassandra/trunk/src/org/apache/cassandra/db/ReadCommand.java Tue Apr 21 02:58:49 2009 @@ -128,7 +128,7 @@ public Row getRow(Table table) throws IOException, ColumnFamilyNotDefinedException { - if (columnNames != EMPTY_COLUMNS) + if (!columnNames.isEmpty()) { return table.getRow(key, columnFamilyColumn, columnNames); } Modified: 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=766960&r1=766959&r2=766960&view=diff ============================================================================== --- incubator/cassandra/trunk/test/org/apache/cassandra/db/ReadMessageTest.java (original) +++ incubator/cassandra/trunk/test/org/apache/cassandra/db/ReadMessageTest.java Tue Apr 21 02:58:49 2009 @@ -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 @@ } 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()); + } }