cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [1/2] cassandra git commit: Partial backport of CASSANDRA-8739 - avoid LCS overlap in L1
Date Wed, 03 Jun 2015 11:58:23 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 a90c80dda -> 4bf807687


Partial backport of CASSANDRA-8739 - avoid LCS overlap in L1

Patch by Stefania Alborghetti; reviewed by marcuse for CASSANDRA-8656


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

Branch: refs/heads/cassandra-2.1
Commit: 8fcb620d95e913d58a8bf072be8b8a7f6630497e
Parents: b6a31fb
Author: Stefania Alborghetti <stefania.alborghetti@datastax.com>
Authored: Tue Jun 2 16:42:50 2015 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Wed Jun 3 13:48:37 2015 +0200

----------------------------------------------------------------------
 src/java/org/apache/cassandra/db/compaction/LeveledManifest.java | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8fcb620d/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
index 81c65e4..7839121 100644
--- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
@@ -547,6 +547,8 @@ public class LeveledManifest
                 Set<SSTableReader> l1overlapping = overlapping(candidates, generations[1]);
                 if (Sets.intersection(l1overlapping, compacting).size() > 0)
                     return Collections.emptyList();
+                if (!overlapping(candidates, compactingL0).isEmpty())
+                    return Collections.emptyList();
                 candidates = Sets.union(candidates, l1overlapping);
             }
             if (candidates.size() < 2)


Mime
View raw message