cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/6] git commit: Fix trying to load deleted row into row cache on startup patch by jbellis; reviewed by dbrosius for CASSANDRA-4463
Date Wed, 10 Apr 2013 02:25:56 GMT
Fix trying to load deleted row into row cache on startup
patch by jbellis; reviewed by dbrosius for CASSANDRA-4463


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/feae9efa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/feae9efa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/feae9efa

Branch: refs/heads/trunk
Commit: feae9efa42a3395fce2447e97258ffdbe19d31cb
Parents: 4a010ed
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Apr 9 21:23:21 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Apr 9 21:23:21 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                        |    1 +
 .../org/apache/cassandra/db/ColumnFamilyStore.java |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/feae9efa/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index fa407b5..59a7443 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/feae9efa/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 8d239e3..02a782f 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -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++;
         }
 


Mime
View raw message