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:24 UTC
[1/2] cassandra git commit: DTCS should not group sstables for
anticompaction
Repository: cassandra
Updated Branches:
refs/heads/trunk b44a773b9 -> 51b92f82d
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/trunk
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
{
[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by ma...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51b92f82
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51b92f82
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51b92f82
Branch: refs/heads/trunk
Commit: 51b92f82d09e0b977b07a850824199272220b121
Parents: b44a773 16bc74a
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jul 30 11:08:40 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Thu Jul 30 11:08:40 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/51b92f82/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 13e3acf,467b2d7..c92a771
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,5 +1,31 @@@
+3.0
+ * Implement proper sandboxing for UDFs (CASSANDRA-9402)
+ * Simplify (and unify) cleanup of compaction leftovers (CASSANDRA-7066)
+ * Allow extra schema definitions in cassandra-stress yaml (CASSANDRA-9850)
+ * Metrics should use up to date nomenclature (CASSANDRA-9448)
+ * Change CREATE/ALTER TABLE syntax for compression (CASSANDRA-8384)
+ * Cleanup crc and adler code for java 8 (CASSANDRA-9650)
+ * Storage engine refactor (CASSANDRA-8099, 9743, 9746, 9759, 9781, 9808, 9825,
+ 9848, 9705, 9859, 9867, 9874, 9828, 9801)
+ * Update Guava to 18.0 (CASSANDRA-9653)
+ * Bloom filter false positive ratio is not honoured (CASSANDRA-8413)
+ * New option for cassandra-stress to leave a ratio of columns null (CASSANDRA-9522)
+ * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035)
+ * Add algorithmic token allocation (CASSANDRA-7032)
+ * Add nodetool command to replay batchlog (CASSANDRA-9547)
+ * Make file buffer cache independent of paths being read (CASSANDRA-8897)
+ * Remove deprecated legacy Hadoop code (CASSANDRA-9353)
+ * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
+ * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
+ * Change default garbage collector to G1 (CASSANDRA-7486)
+ * Populate TokenMetadata early during startup (CASSANDRA-9317)
+ * Undeprecate cache recentHitRate (CASSANDRA-6591)
+ * Add support for selectively varint encoding fields (CASSANDRA-9499, 9865)
+ * Materialized Views (CASSANDRA-6477)
+
+
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/51b92f82/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
----------------------------------------------------------------------