cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [1/3] git commit: Fix counters in supercolumns during live upgrades from 1.2
Date Fri, 10 Oct 2014 13:57:52 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 810c2d5fe -> 47863bc32


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/trunk
Commit: b7adf9810aa07a9b9eb2a58d9c53d298696b0403
Parents: cced4ba
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Fri Oct 10 16:34:23 2014 +0300
Committer: Aleksey Yeschenko <aleksey@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


Mime
View raw message