Updated Branches: refs/heads/trunk 7fddc09b2 -> 4b08be49a
Fix bad merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b08be49 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b08be49 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b08be49 Branch: refs/heads/trunk Commit: 4b08be49a3ee18a4d02db7c52a56dd37e3a187ea Parents: 7fddc09 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Feb 14 21:24:02 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Feb 14 21:24:02 2014 +0300 ---------------------------------------------------------------------- .../org/apache/cassandra/db/index/SecondaryIndexManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b08be49/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java index 2ac342f..3fba451 100644 --- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java +++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java @@ -443,8 +443,8 @@ public class SecondaryIndexManager for (Cell cell : indexedColumnsInRow) { // TODO: this is probably incorrect, we should pull all indexes - baseCfs.metadata.getColumnDefinition(cell.name()); - SecondaryIndex index = indexesByColumn.get(cDef.name); + ColumnDefinition cDef = baseCfs.metadata.getColumnDefinition(cell.name()); + SecondaryIndex index = indexesByColumn.get(cDef.name.bytes); if (index == null) continue;