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 2013/08/21 14:53:51 UTC
[1/3] git commit: Add all sstables to the leveled manifest on startup.
Updated Branches:
refs/heads/trunk fe32c9744 -> 7678661b0
Add all sstables to the leveled manifest on startup.
Patch by marcuse, reviewed by jbellis for CASSANDRA-5908
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f367fdf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f367fdf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f367fdf
Branch: refs/heads/trunk
Commit: 8f367fdf92c03ee4bbcb0daa2272bd5155cf4174
Parents: cd47182
Author: Marcus Eriksson <ma...@spotify.com>
Authored: Wed Aug 21 14:50:02 2013 +0200
Committer: Marcus Eriksson <ma...@spotify.com>
Committed: Wed Aug 21 14:50:02 2013 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/compaction/LeveledCompactionStrategy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f367fdf/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
index 292220d..65abb0a 100644
--- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
@@ -71,7 +71,7 @@ public class LeveledCompactionStrategy extends AbstractCompactionStrategy implem
cfs.getDataTracker().subscribe(this);
logger.debug("{} subscribed to the data tracker.", this);
- manifest = LeveledManifest.create(cfs, this.maxSSTableSizeInMB, Collections.<SSTableReader>emptyList(), localOptions);
+ manifest = LeveledManifest.create(cfs, this.maxSSTableSizeInMB, cfs.getSSTables(), localOptions);
logger.debug("Created {}", manifest);
}
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by ma...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7678661b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7678661b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7678661b
Branch: refs/heads/trunk
Commit: 7678661b0937ebef8e045418ea66ff6f26269928
Parents: fe32c97 857a7f5
Author: Marcus Eriksson <ma...@spotify.com>
Authored: Wed Aug 21 14:53:23 2013 +0200
Committer: Marcus Eriksson <ma...@spotify.com>
Committed: Wed Aug 21 14:53:23 2013 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/compaction/LeveledCompactionStrategy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by ma...@apache.org.
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/857a7f5f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/857a7f5f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/857a7f5f
Branch: refs/heads/trunk
Commit: 857a7f5fb8246aa2d588c3ff257109b14f35be2f
Parents: c4f6be8 8f367fd
Author: Marcus Eriksson <ma...@spotify.com>
Authored: Wed Aug 21 14:52:25 2013 +0200
Committer: Marcus Eriksson <ma...@spotify.com>
Committed: Wed Aug 21 14:52:25 2013 +0200
----------------------------------------------------------------------
.../apache/cassandra/db/compaction/LeveledCompactionStrategy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/857a7f5f/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
----------------------------------------------------------------------