You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/02/14 18:38:45 UTC
git commit: Fix SecondaryIndexManager#deleteFromIndexes()
Updated Branches:
refs/heads/cassandra-1.2 c9ade9dc6 -> 7937ee38f
Fix SecondaryIndexManager#deleteFromIndexes()
patch by Sergio Bossa; reviewed by Sam Tunnicliffe for CASSANDRA-6711
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7937ee38
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7937ee38
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7937ee38
Branch: refs/heads/cassandra-1.2
Commit: 7937ee38f5f3ea0ee821441672cbb777814fa4fd
Parents: c9ade9d
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Feb 14 20:37:06 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Feb 14 20:37:06 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/7937ee38/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 492cc2d..964e10c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,7 @@
* 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)
1.2.15
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7937ee38/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 9cbbe8f..c4e4129 100644
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@ -464,7 +464,8 @@ public class SecondaryIndexManager
for (IColumn column : indexedColumnsInRow)
{
- SecondaryIndex index = indexesByColumn.get(column.name());
+ ColumnDefinition cDef = baseCfs.metadata.getColumnDefinitionFromColumnName(column.name());
+ SecondaryIndex index = indexesByColumn.get(cDef.name);
if (index == null)
continue;