diff --git a/CHANGES.txt b/CHANGES.txt index ad2e12e070..91a8fbe829 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -19,6 +19,8 @@ * Move CfDef and KsDef validation out of thrift (CASSANDRA-4037) * Expose repairing by a user provided range (CASSANDRA-3912) * Add way to force the cassandra-cli to refresh it's schema (CASSANDRA-4052) +Merged from 1.0: + * Fix super columns bug where cache is not updated (CASSANDRA-4190) 1.1.0-final diff --git a/src/java/org/apache/cassandra/db/ColumnFamily.java b/src/java/org/apache/cassandra/db/ColumnFamily.java index b094098f8a..7b01766662 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamily.java +++ b/src/java/org/apache/cassandra/db/ColumnFamily.java @@ -139,7 +139,7 @@ public class ColumnFamily extends AbstractColumnContainer implements IRowCacheEn } /** - * 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) @@ -148,7 +148,7 @@ public class ColumnFamily extends AbstractColumnContainer implements IRowCacheEn { for (IColumn c : cf) { - columns.addColumn(((SuperColumn)c).cloneMeShallow(), allocator); + columns.addColumn(((SuperColumn)c).cloneMe(), allocator); } delete(cf); }