Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 1bae25ace -> e711929e7
Fix counters in supercolumns during live upgrades from 1.2 patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for CASSANDRA-7188 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b7adf981 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b7adf981 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b7adf981 Branch: refs/heads/cassandra-2.1 Commit: b7adf9810aa07a9b9eb2a58d9c53d298696b0403 Parents: cced4ba Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Oct 10 16:34:23 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Oct 10 16:34:23 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/CounterUpdateColumn.java | 6 ++++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7adf981/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 1c2231d..bc12402 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.11: + * Fix counters in supercolumns during live upgrades from 1.2 (CASSANDRA-7188) * Notify DT subscribers when a column family is truncated (CASSANDRA-8088) * Add sanity check of $JAVA on startup (CASSANDRA-7676) * Schedule fat client schema pull on join (CASSANDRA-7993) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b7adf981/src/java/org/apache/cassandra/db/CounterUpdateColumn.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/CounterUpdateColumn.java b/src/java/org/apache/cassandra/db/CounterUpdateColumn.java index 422beee..df90625 100644 --- a/src/java/org/apache/cassandra/db/CounterUpdateColumn.java +++ b/src/java/org/apache/cassandra/db/CounterUpdateColumn.java @@ -56,6 +56,12 @@ public class CounterUpdateColumn extends Column } @Override + public CounterUpdateColumn withUpdatedName(ByteBuffer newName) + { + return new CounterUpdateColumn(newName, value, timestamp); + } + + @Override public Column reconcile(Column column, Allocator allocator) { // The only time this could happen is if a batchAdd ships two
