From eb9f96146efb2611ce75739ecf5e2c2607650d7b Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Thu, 26 Apr 2012 16:32:06 +0200 Subject: [PATCH] Fix bug with super columns where row cache is not updated patch by slebresne; reviewed by jbellis for CASSANDRA-4190 --- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamily.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 544d393522..5b58681e9e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,7 @@ * (CLI) properly handle quotes in create/update keyspace commands (CASSANDRA-4129) * Avoids possible deadlock during bootstrap (CASSANDRA-4159) * fix stress tool that hangs forever on timeout or error (CASSANDRA-4128) + * Fix super columns bug where cache is not updated (CASSANDRA-4190) 1.0.9 diff --git a/src/java/org/apache/cassandra/db/ColumnFamily.java b/src/java/org/apache/cassandra/db/ColumnFamily.java index d27a963d9b..0b1e399da4 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamily.java +++ b/src/java/org/apache/cassandra/db/ColumnFamily.java @@ -141,7 +141,7 @@ public class ColumnFamily extends AbstractColumnContainer } /** - * Same as addAll() but do a cloneMeShallow of SuperColumn if necessary to + * Same as addAll() but do a cloneMe of SuperColumn if necessary to * avoid keeping references to the structure (see #3957). */ public void addAllWithSCCopy(ColumnFamily cf, Allocator allocator) @@ -150,7 +150,7 @@ public class ColumnFamily extends AbstractColumnContainer { for (IColumn c : cf) { - columns.addColumn(((SuperColumn)c).cloneMeShallow(), allocator); + columns.addColumn(((SuperColumn)c).cloneMe(), allocator); } delete(cf); }