Updated Branches: refs/heads/trunk d9691e823 -> f6f50ddff
Fix previous merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6f50ddf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6f50ddf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6f50ddf Branch: refs/heads/trunk Commit: f6f50ddffe0821617fe29482f9ec918608560381 Parents: d9691e8 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Jan 14 15:43:57 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Jan 14 15:43:57 2014 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/AtomicBTreeColumns.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6f50ddf/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java index c6067fb..c475a0e 100644 --- a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java +++ b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java @@ -193,10 +193,7 @@ public class AtomicBTreeColumns extends ColumnFamily public Cell apply(Cell replaced, Cell update) { Cell reconciled = update.reconcile(replaced, allocator); - if (reconciled == update) - indexer.update(replaced, reconciled); - else - indexer.update(update, reconciled); + indexer.update(replaced, reconciled); delta += reconciled.dataSize() - replaced.dataSize(); return transform.apply(reconciled);
