Merge branch 'cassandra-2.0' into trunk Conflicts: src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7fddc09b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fddc09b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7fddc09b Branch: refs/heads/trunk Commit: 7fddc09b2529f085314a1efedaaca1d14be736d3 Parents: 0b42b0e 15fd82c Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Feb 14 20:55:29 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Feb 14 20:55:29 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fddc09b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c306b43,571b8dd..5a3d7a9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -58,8 -22,8 +58,9 @@@ Merged from 1.2 * Don't exchange schema between nodes with different versions (CASSANDRA-6695) * Use real node messaging versions for schema exchange decisions (CASSANDRA-6700) * IN on the last clustering columns + ORDER BY DESC yield no results (CASSANDRA-6701) + * Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711) + 2.0.5 * Reduce garbage generated by bloom filter lookups (CASSANDRA-6609) * Add ks.cf names to tombstone logging (CASSANDRA-6597) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7fddc09b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java index 946e3be,7bfed33..2ac342f --- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java +++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java @@@ -440,10 -436,10 +440,11 @@@ public class SecondaryIndexManage // Update entire row only once per row level index Set<Class<? extends SecondaryIndex>> cleanedRowLevelIndexes = null; - for (Column column : indexedColumnsInRow) + for (Cell cell : indexedColumnsInRow) { - ColumnDefinition cDef = baseCfs.metadata.getColumnDefinitionFromColumnName(column.name()); + // TODO: this is probably incorrect, we should pull all indexes - SecondaryIndex index = indexesByColumn.get(cell.name().toByteBuffer()); ++ baseCfs.metadata.getColumnDefinition(cell.name()); + SecondaryIndex index = indexesByColumn.get(cDef.name); if (index == null) continue;