cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [6/7] git commit: Fix drop of sstables in certain circumstance
Date Fri, 08 Feb 2013 17:58:40 GMT
Fix drop of sstables in certain circumstance

patch by slebresne; reviewed by jbellis for CASSANDRA-5232


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

Branch: refs/heads/trunk
Commit: 5632a56c469ca49d43842a399de687e47f9be1db
Parents: 31e669a
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Feb 8 18:48:42 2013 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Feb 8 18:48:42 2013 +0100

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/5632a56c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f7afdf1..21e6092 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,7 @@
  * Binary protocol: avoid sending notification for 0.0.0.0 (CASSANDRA-5227)
  * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366)
  * CQL3 refactor to allow conversion function (CASSANDRA-5226)
+ * Fix drop of sstables in some circumstance (CASSANDRA-5232)
 
 
 1.2.1

http://git-wip-us.apache.org/repos/asf/cassandra/blob/5632a56c/src/java/org/apache/cassandra/db/DataTracker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DataTracker.java b/src/java/org/apache/cassandra/db/DataTracker.java
index 749b64e..b6bcebd 100644
--- a/src/java/org/apache/cassandra/db/DataTracker.java
+++ b/src/java/org/apache/cassandra/db/DataTracker.java
@@ -506,7 +506,7 @@ public class DataTracker
         {
             Set<Memtable> newPending = ImmutableSet.copyOf(Sets.difference(memtablesPendingFlush,
Collections.singleton(flushedMemtable)));
             Set<SSTableReader> newSSTables = newSSTable == null
-                                            ? Collections.<SSTableReader>emptySet()
+                                            ? sstables
                                             : newSSTables(newSSTable);
             SSTableIntervalTree intervalTree = buildIntervalTree(newSSTables);
             return new View(memtable, newPending, newSSTables, compacting, intervalTree);


Mime
View raw message