fix 2i updates with indentical values and timestamps

patch by Sam Tunnicliffe; reviewed by jbellis for CASSANDRA-5540
apache · May 9, 2013 · 95cf9a5 · 95cf9a5
1 parent 6db71b2
commit 95cf9a5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,4 +1,5 @@
 1.2.5
+ * fix 2i updates with indentical values and timestamps (CASSANDRA-5540)
  * fix compaction throttling bursty-ness (CASSANDRA-4316)
  * reduce memory consumption of IndexSummary (CASSANDRA-5506)
  * remove per-row column name bloom filters (CASSANDRA-5492)

diff --git a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java
@@ -256,7 +256,7 @@ public void reduce(OnDiskAtom current)
                 container.addColumn(column);
                 if (indexer != SecondaryIndexManager.nullUpdater
                     && !column.isMarkedForDelete()
-                    && container.getColumn(column.name()) != column)
+                    && !container.getColumn(column.name()).equals(column))
                 {
                     indexer.remove(column);
                 }

diff --git a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
@@ -141,7 +141,7 @@ public void reduce(IColumn column)
                 container.addColumn(column);
                 if (indexer != SecondaryIndexManager.nullUpdater
                     && !column.isMarkedForDelete()
-                    && container.getColumn(column.name()) != column)
+                    && !container.getColumn(column.name()).equals(column))
                 {
                     indexer.remove(column);
                 }

diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
@@ -616,15 +616,20 @@ public void insert(IColumn column)
 
         public void update(IColumn oldColumn, IColumn column)
         {
+            if (oldColumn.equals(column))
+                return;
+
             SecondaryIndex index = indexFor(column.name());
             if (index == null)
                 return;
 
             if (index instanceof PerColumnSecondaryIndex)
             {
-                ((PerColumnSecondaryIndex) index).delete(key.key, oldColumn);
+                // insert the new value before removing the old one, so we never have a period
+                // where the row is invisible to both queries (the opposite seems preferable); see CASSANDRA-5540
                 if (!column.isMarkedForDelete())
                     ((PerColumnSecondaryIndex) index).insert(key.key, column);
+                ((PerColumnSecondaryIndex) index).delete(key.key, oldColumn);
             }
         }