Permalink
Browse files

Fix trying to load deleted row into row cache on startup

patch by jbellis; reviewed by dbrosius for CASSANDRA-4463
  • Loading branch information...
1 parent 4a010ed commit feae9efa42a3395fce2447e97258ffdbe19d31cb @jbellis jbellis committed Apr 10, 2013
Showing with 3 additions and 1 deletion.
  1. +1 −0 CHANGES.txt
  2. +2 −1 src/java/org/apache/cassandra/db/ColumnFamilyStore.java
View
@@ -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
@@ -457,7 +457,8 @@ public void initRowCache()
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++;
}

0 comments on commit feae9ef

Please sign in to comment.