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/06/12 18:53:02 UTC
[1/4] cassandra git commit: Ignore fully expired sstables when
finding min timestamp
Repository: cassandra
Updated Branches:
refs/heads/trunk 8c19fd638 -> c2e54ddc3
Ignore fully expired sstables when finding min timestamp
Patch by marcuse; reviewed by slebresne for CASSANDRA-9572
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9e60611f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9e60611f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9e60611f
Branch: refs/heads/trunk
Commit: 9e60611fb807ad1bd03a13ef1fe55bf905100064
Parents: 3ddd17b
Author: Marcus Eriksson <ma...@apache.org>
Authored: Thu Jun 11 08:33:54 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Jun 12 18:50:01 2015 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/compaction/CompactionController.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9e60611f/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 7a4b7d9..59453cc 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
@@ -102,7 +102,12 @@ public class CompactionController
long minTimestamp = Long.MAX_VALUE;
for (SSTableReader sstable : overlapping)
- minTimestamp = Math.min(minTimestamp, sstable.getMinTimestamp());
+ {
+ // Overlapping might include fully expired sstables. What we care about here is
+ // the min timestamp of the overlapping sstables that actually contain live data.
+ if (sstable.getSSTableMetadata().maxLocalDeletionTime >= gcBefore)
+ minTimestamp = Math.min(minTimestamp, sstable.getMinTimestamp());
+ }
for (SSTableReader candidate : compacting)
{
[3/4] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by ma...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/271c9e4a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/271c9e4a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/271c9e4a
Branch: refs/heads/trunk
Commit: 271c9e4ac7a71252e4f4f1984fd4f8f16058bcde
Parents: b61da9b 69b7dd3
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Jun 12 18:51:48 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Jun 12 18:51:48 2015 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/compaction/CompactionController.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/271c9e4a/src/java/org/apache/cassandra/db/compaction/CompactionController.java
----------------------------------------------------------------------
[4/4] 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/c2e54ddc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2e54ddc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2e54ddc
Branch: refs/heads/trunk
Commit: c2e54ddc3f47912814323dcc4fca45300db2c518
Parents: 8c19fd6 271c9e4
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Jun 12 18:52:05 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Jun 12 18:52:05 2015 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/compaction/CompactionController.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/4] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by ma...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/69b7dd32
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69b7dd32
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69b7dd32
Branch: refs/heads/trunk
Commit: 69b7dd327443239b70a104dfe960bd0aa2ccf0a5
Parents: 16665ee 9e60611
Author: Marcus Eriksson <ma...@apache.org>
Authored: Fri Jun 12 18:51:39 2015 +0200
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Fri Jun 12 18:51:39 2015 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/compaction/CompactionController.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/69b7dd32/src/java/org/apache/cassandra/db/compaction/CompactionController.java
----------------------------------------------------------------------