cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [05/15] cassandra git commit: Allow L0 compactions to reduce scope with LCS
Date Mon, 01 Aug 2016 08:52:18 GMT
Allow L0 compactions to reduce scope with LCS

Patch by marcuse; reviewed by sankalp kohli for CASSANDRA-12040


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

Branch: refs/heads/cassandra-3.9
Commit: bc0d1da0ce2d1ddc766ba99110470c50e7fd8bbe
Parents: 48a45ed
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Thu Jul 14 12:10:26 2016 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon Aug 1 10:40:19 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                        | 1 +
 .../org/apache/cassandra/db/compaction/LeveledCompactionTask.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc0d1da0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index cecf78e..8ecc787 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.16
+ * Allow STCS-in-L0 compactions to reduce scope with LCS (CASSANDRA-12040)
  * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
  * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
  * Improve digest calculation in the presence of overlapping tombstones (CASSANDRA-11349)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc0d1da0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java
index 2731b6d..902be75 100644
--- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java
@@ -44,7 +44,7 @@ public class LeveledCompactionTask extends CompactionTask
     @Override
     protected boolean partialCompactionsAcceptable()
     {
-        return false;
+        return level == 0;
     }
 
     protected int getLevel()


Mime
View raw message