Permalink
Browse files

merge from 1.1

  • Loading branch information...
jbellis committed Apr 10, 2013
2 parents c7eb146 + feae9ef commit 225cb0e7fac97c302783d2334b5b57926bbfa346
Showing with 4 additions and 1 deletion.
  1. +2 −0 CHANGES.txt
  2. +2 −1 src/java/org/apache/cassandra/service/CacheService.java
View
@@ -2,6 +2,8 @@
* Include fatal errors in trace events (CASSANDRA-5447)
* Ensure that PerRowSecondaryIndex is notified of row-level deletes
(CASSANDRA-5445)
+Merged from 1.1:
+ * Fix trying to load deleted row into row cache on startup (CASSANDRA-4463)
1.2.4
@@ -352,7 +352,8 @@ public void load(Set<ByteBuffer> buffers, ColumnFamilyStore cfs)
{
DecoratedKey dk = cfs.partitioner.decorateKey(key);
ColumnFamily data = cfs.getTopLevelColumns(QueryFilter.getIdentityFilter(dk, new QueryPath(cfs.columnFamily)), Integer.MIN_VALUE, true);
- rowCache.put(new RowCacheKey(cfs.metadata.cfId, dk), data);
+ if (data != null)
+ rowCache.put(new RowCacheKey(cfs.metadata.cfId, dk), data);
}
}
}

0 comments on commit 225cb0e

Please sign in to comment.