cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mish...@apache.org
Subject [03/10] git commit: Don't index tombstones.
Date Mon, 08 Sep 2014 19:22:44 GMT
Don't index tombstones.

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-7828


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6860d6fa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6860d6fa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6860d6fa

Branch: refs/heads/cassandra-2.1
Commit: 6860d6fad9e6af90ff7c2f4359a0bdc1226135b5
Parents: 8bef260
Author: Mikhail Stepura <mishail@apache.org>
Authored: Mon Sep 8 12:01:37 2014 -0700
Committer: Mikhail Stepura <mishail@apache.org>
Committed: Mon Sep 8 12:01:37 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6860d6fa/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6c601e5..435b124 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 1.2.19
+ * Don't index tombstones (CASSANDRA-7828)
  * Don't allow compacted sstables to be marked as compacting (CASSANDRA-7145)
  * Track expired tombstones (CASSANDRA-7810)
  * Validate empty cell names from counter updates (CASSANDRA-7798)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6860d6fa/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 7fefa13..8839228 100644
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@ -443,7 +443,7 @@ public class SecondaryIndexManager
             {
                 for (IColumn column : cf)
                 {
-                    if (index.indexes(column.name()))
+                    if (column.isLive() && index.indexes(column.name()))
                         ((PerColumnSecondaryIndex) index).insert(key, column);
                 }
             }


Mime
View raw message