natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow SuperColumn.getSubColumn to return null. patch by Sandeep Tata; reviewed by jbellis for #91 

git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@766961 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2009-04-21 03:06:01 +00:00
parent d14f814667
commit 20748a879b
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/apache/cassandra/db/SuperColumn.java
View File

@ -80,7 +80,7 @@ public final class SuperColumn implements IColumn, Serializable
public IColumn getSubColumn(String columnName)
{
IColumn column = columns_.get(columnName);
assert column instanceof Column;
assert column == null || column instanceof Column;
return column;
}
@ -169,7 +169,6 @@ public final class SuperColumn implements IColumn, Serializable
public byte[] value(String key)
{
IColumn column = columns_.get(key);
assert column instanceof Column;
if ( column != null )
return column.value();
throw new IllegalArgumentException("Value was requested for a column that does not exist.");

17
test/org/apache/cassandra/db/SuperColumnTest.java Normal file
View File

@ -0,0 +1,17 @@
package org.apache.cassandra.db;
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import org.testng.annotations.Test;
public class SuperColumnTest
{
@Test
public void testMissingSubcolumn() {
byte[] val = "sample value".getBytes();
SuperColumn sc = new SuperColumn("sc1");
sc.addColumn("col1", new Column("col1",val,1L));
assertNotNull(sc.getSubColumn("col1"));
assertNull(sc.getSubColumn("col2"));
}
}