From 20748a879befa65c766ec06996d80e2ac962fb21 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Tue, 21 Apr 2009 03:06:01 +0000 Subject: [PATCH] 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 --- src/org/apache/cassandra/db/SuperColumn.java | 3 +-- .../apache/cassandra/db/SuperColumnTest.java | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 test/org/apache/cassandra/db/SuperColumnTest.java diff --git a/src/org/apache/cassandra/db/SuperColumn.java b/src/org/apache/cassandra/db/SuperColumn.java index 606e865686..cd522d0a70 100644 --- a/src/org/apache/cassandra/db/SuperColumn.java +++ b/src/org/apache/cassandra/db/SuperColumn.java @@ -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."); diff --git a/test/org/apache/cassandra/db/SuperColumnTest.java b/test/org/apache/cassandra/db/SuperColumnTest.java new file mode 100644 index 0000000000..11c0062c69 --- /dev/null +++ b/test/org/apache/cassandra/db/SuperColumnTest.java @@ -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")); + } +}