Updated Branches: refs/heads/cassandra-1.1 38748b43d -> d90f0f3e7 refs/heads/trunk 46b658f76 -> 213974d84
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/213974d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/213974d8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/213974d8 Branch: refs/heads/trunk Commit: 213974d84d9a5a6abb3beb68e71d8e4f47bdc2ee Parents: 46b658f d90f0f3 Author: Jonathan Ellis <[email protected]> Authored: Fri May 18 11:39:17 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri May 18 11:39:17 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../apache/cassandra/db/CollationController.java | 2 +- .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 +- .../db/compaction/LeveledCompactionStrategy.java | 20 +++++++++------ .../db/compaction/LeveledCompactionTask.java | 5 +++ .../cassandra/db/compaction/LeveledManifest.java | 2 +- .../apache/cassandra/service/StorageService.java | 8 +---- 7 files changed, 24 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/213974d8/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4d0951e,a375f36..9504d25 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,14 -1,6 +1,16 @@@ +1.2-dev + * Track tombstone expiration and compact when tombstone content is + higher than a configurable threshold, default 20% (CASSANDRA-3442) + * update MurmurHash to version 3 (CASSANDRA-2975) + * (CLI) track elapsed time for `delete' operation (CASSANDRA-4060) + * (CLI) jline version is bumped to 1.0 to properly support + 'delete' key function (CASSANDRA-4132) + * Save IndexSummary into new SSTable 'Summary' component (CASSANDRA-2392) + + 1.1.1-dev + * ignore min/max compactions settings in LCS, while preserving + behavior that min=max=0 disables autocompaction (CASSANDRA-4233) * log number of rows read from saved cache (CASSANDRA-4249) * calculate exact size required for cleanup operations (CASSANDRA-1404) * avoid blocking additional writes during flush when the commitlog http://git-wip-us.apache.org/repos/asf/cassandra/blob/213974d8/src/java/org/apache/cassandra/db/CollationController.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/213974d8/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/213974d8/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/213974d8/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/213974d8/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/213974d8/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index eed37df,10f9351..dc91747 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -2426,9 -2434,8 +2423,8 @@@ public class StorageService implements } setMode(Mode.MOVING, "fetching new ranges and streaming old ranges", true); - - if (logger_.isDebugEnabled()) - logger_.debug("[Move->STREAMING] Work Map: " + rangesToStreamByTable); + if (logger.isDebugEnabled()) + logger.debug("[Move->STREAMING] Work Map: " + rangesToStreamByTable); CountDownLatch streamLatch = streamRanges(rangesToStreamByTable);
