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

Fix trying to load deleted row into row cache on startup 

patch by jbellis; reviewed by dbrosius for CASSANDRA-4463
This commit is contained in:
Jonathan Ellis 2013-04-09 21:23:21 -05:00
parent 4a010ed912
commit feae9efa42
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
1.1.11
* Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
* Update offline scrub for 1.0 -> 1.1 directory structure (CASSANDRA-5195)
* add tmp flag to Descriptor hashcode (CASSANDRA-4021)
* fix logging of "Found table data in data directories" when only system tables

3
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
View File

@ -457,7 +457,8 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
ColumnFamily data = getTopLevelColumns(QueryFilter.getIdentityFilter(key, new QueryPath(columnFamily)),
Integer.MIN_VALUE,
true);
CacheService.instance.rowCache.put(new RowCacheKey(metadata.cfId, key), data);
if (data != null)
CacheService.instance.rowCache.put(new RowCacheKey(metadata.cfId, key), data);
cachedRowsRead++;
}