Updated Branches: refs/heads/trunk 2fd2d8978 -> d9691e823
Remove dead code patch by slebresne; reviewed by jbellis for CASSANDRA-6580 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0e55e9ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0e55e9ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0e55e9ff Branch: refs/heads/trunk Commit: 0e55e9ff6695504c4698115d8856620b752cf713 Parents: 8b8c159 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Jan 14 15:34:53 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Jan 14 15:35:34 2014 +0100 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/AtomicSortedColumns.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0e55e9ff/src/java/org/apache/cassandra/db/AtomicSortedColumns.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/AtomicSortedColumns.java b/src/java/org/apache/cassandra/db/AtomicSortedColumns.java index b44d8bf..1c0bf1b 100644 --- a/src/java/org/apache/cassandra/db/AtomicSortedColumns.java +++ b/src/java/org/apache/cassandra/db/AtomicSortedColumns.java @@ -330,12 +330,7 @@ public class AtomicSortedColumns extends ColumnFamily Column reconciledColumn = column.reconcile(oldColumn, allocator); if (map.replace(name, oldColumn, reconciledColumn)) { - // for memtable updates we only care about oldcolumn, reconciledcolumn, but when compacting - // we need to make sure we update indexes no matter the order we merge - if (reconciledColumn == column) - indexer.update(oldColumn, reconciledColumn); - else - indexer.update(column, reconciledColumn); + indexer.update(oldColumn, reconciledColumn); return reconciledColumn.dataSize() - oldColumn.dataSize(); } // We failed to replace column due to a concurrent update or a concurrent removal. Keep trying.
