Updated Branches: refs/heads/trunk cb871ba90 -> b92c55e68
Set minTimestamp correctly to be able to drop expired sstables correctly patch by marcuse, reviewed by jbellis for CASSANDRA-6337 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e02341b3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e02341b3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e02341b3 Branch: refs/heads/trunk Commit: e02341b38c5c311bea2b0d954373ba55bb106446 Parents: 5008507 Author: Marcus Eriksson <marc...@spotify.com> Authored: Wed Nov 13 20:12:51 2013 +0100 Committer: Marcus Eriksson <marc...@spotify.com> Committed: Wed Nov 13 20:12:51 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/compaction/CompactionController.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e02341b3/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 159e8de..6a07720 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -21,6 +21,7 @@ * Fix CQL3 table validation in Thrift (CASSANDRA-6140) * Fix bug missing results with IN clauses (CASSANDRA-6327) * Fix paging with reversed slices (CASSANDRA-6343) + * Set minTimestamp correctly to be able to drop expired sstables (CASSANDRA-6337) Merged from 1.2: * add non-jamm path for cached statements (CASSANDRA-6293) * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e02341b3/src/java/org/apache/cassandra/db/compaction/CompactionController.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionController.java b/src/java/org/apache/cassandra/db/compaction/CompactionController.java index 65515d6..3ab2202 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java @@ -106,7 +106,7 @@ public class CompactionController List<SSTableReader> candidates = new ArrayList<SSTableReader>(); - long minTimestamp = Integer.MAX_VALUE; + long minTimestamp = Long.MAX_VALUE; for (SSTableReader sstable : overlapping) minTimestamp = Math.min(minTimestamp, sstable.getMinTimestamp());