natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-1.0' into cassandra-1.1 

Conflicts:
	CHANGES.txt
This commit is contained in:
Sylvain Lebresne 2012-04-26 16:34:54 +02:00
parent cc68c49f47 eb9f96146e
commit 698a2bbea0
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -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

4
src/java/org/apache/cassandra/db/ColumnFamily.java
View File

@ -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);
}