You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2015/07/30 11:09:12 UTC
cassandra git commit: DTCS should not group sstables for
anticompaction
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 b334f519f -> 16bc74a67
DTCS should not group sstables for anticompaction
Patch by marcuse; reviewed by yukim for CASSANDRA-9900
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/16bc74a6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/16bc74a6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/16bc74a6
Branch: refs/heads/cassandra-2.2
Commit: 16bc74a679e50aa127c45e3e37dbe50ea0680ea8
Parents: b334f51
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jul 30 11:06:07 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jul 30 11:06:52 2015 +0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../db/compaction/DateTieredCompactionStrategy.java | 13 +++++++++++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16bc74a6/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2fe6a22..467b2d7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.1
+ * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
* UDF / UDA execution time in trace (CASSANDRA-9723)
* Fix broken internode SSL (CASSANDRA-9884)
Merged from 2.1:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/16bc74a6/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
index 0d06f67..54eeb68 100644
--- a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
@@ -400,6 +400,19 @@ public class DateTieredCompactionStrategy extends AbstractCompactionStrategy
return Long.MAX_VALUE;
}
+ /**
+ * DTCS should not group sstables for anticompaction - this can mix new and old data
+ */
+ @Override
+ public Collection<Collection<SSTableReader>> groupSSTablesForAntiCompaction(Collection<SSTableReader> sstablesToGroup)
+ {
+ Collection<Collection<SSTableReader>> groups = new ArrayList<>();
+ for (SSTableReader sstable : sstablesToGroup)
+ {
+ groups.add(Collections.singleton(sstable));
+ }
+ return groups;
+ }
public static Map<String, String> validateOptions(Map<String, String> options) throws ConfigurationException
{