Updated Branches: refs/heads/cassandra-1.1 8fd3f49e8 -> 6352edb3f refs/heads/trunk 63b6c029f -> 678f6ae38
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/678f6ae3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/678f6ae3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/678f6ae3 Branch: refs/heads/trunk Commit: 678f6ae38f2b7f4e484cf82ae24cf0cb6afe6686 Parents: 63b6c02 6352edb Author: Jonathan Ellis <[email protected]> Authored: Sat Jun 9 10:37:59 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Sat Jun 9 10:37:59 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cache/AutoSavingCache.java | 7 ++++- .../db/compaction/AbstractCompactionIterable.java | 5 ++- .../db/compaction/CompactionController.java | 2 +- .../cassandra/db/compaction/CompactionInfo.java | 23 ++++++--------- .../cassandra/db/compaction/CompactionManager.java | 6 ++- .../cassandra/db/index/SecondaryIndexBuilder.java | 3 +- 7 files changed, 27 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/678f6ae3/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4dc289b,ed9650c..bea8356 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ +1.2-dev + * add inter-node message compression (CASSANDRA-3127) + * enforce 1m min keycache for auto (CASSANDRA-4306) + * remove COPP (CASSANDRA-2479) + * 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) + * Add support for range tombstones (CASSANDRA-3708) + * Improve MessagingService efficiency (CASSANDRA-3617) + * Avoid ID conflicts from concurrent schema changes (CASSANDRA-3794) + * Set thrift HSHA server thread limit to unlimet by default (CASSANDRA-4277) + * Avoids double serialization of CF id in RowMutation messages + (CASSANDRA-4293) + * fix Summary component and caches to use correct partitioner (CASSANDRA-4289) + + 1.1.2 + * fix NPE in compactionstats (CASSANDRA-4318) * enforce 1m min keycache for auto (CASSANDRA-4306) * Have DeletedColumn.isMFD always return true (CASSANDRA-4307) * ex msg for cql3 order by constraints says primary filter can be an IN clause http://git-wip-us.apache.org/repos/asf/cassandra/blob/678f6ae3/src/java/org/apache/cassandra/cache/AutoSavingCache.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cache/AutoSavingCache.java index e6ee7c6,7eed2a0..41b8f5d --- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java +++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java @@@ -195,7 -193,10 +196,11 @@@ public class AutoSavingCache<K extends else type = OperationType.UNKNOWN; - info = new CompactionInfo(type, 0, keys.size(), "keys"); + info = new CompactionInfo(new CFMetaData("system", cacheType.toString(), null, null, null), + type, + 0, - estimatedTotalBytes); ++ keys.size(), ++ "keys"); } public CompactionInfo getCompactionInfo() http://git-wip-us.apache.org/repos/asf/cassandra/blob/678f6ae3/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/678f6ae3/src/java/org/apache/cassandra/db/compaction/CompactionController.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/compaction/CompactionController.java index 9680c95,8ff871e..c91684f --- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java @@@ -39,12 -40,14 +39,12 @@@ import org.apache.cassandra.utils.Throt */ public class CompactionController { - private static Logger logger = LoggerFactory.getLogger(CompactionController.class); + private static final Logger logger = LoggerFactory.getLogger(CompactionController.class); - private final ColumnFamilyStore cfs; + public final ColumnFamilyStore cfs; - private final boolean deserializeRequired; - private final IntervalTree<SSTableReader> overlappingTree; + private final DataTracker.SSTableIntervalTree overlappingTree; public final int gcBefore; - public boolean keyExistenceIsExpensive; public final int mergeShardBefore; private final Throttle throttle = new Throttle("Cassandra_Throttle", new Throttle.ThroughputFunction() { http://git-wip-us.apache.org/repos/asf/cassandra/blob/678f6ae3/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/compaction/CompactionInfo.java index d0f7efb,fdb363e..e477a47 --- a/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionInfo.java @@@ -32,43 -31,26 +32,38 @@@ public final class CompactionInfo imple private static final long serialVersionUID = 3695381572726744816L; private final CFMetaData cfm; private final OperationType tasktype; - private final long bytesComplete; - private final long totalBytes; + private final long completed; + private final long total; + private final String unit; - public CompactionInfo(OperationType tasktype, long bytesComplete, long totalBytes) + public CompactionInfo(CFMetaData cfm, OperationType tasktype, long bytesComplete, long totalBytes) { - this(null, tasktype, bytesComplete, totalBytes); - } - - public CompactionInfo(UUID id, OperationType tasktype, long bytesComplete, long totalBytes) - { - this(id, tasktype, bytesComplete, totalBytes, "bytes"); ++ this(cfm, tasktype, bytesComplete, totalBytes, "bytes"); + } + + public CompactionInfo(OperationType tasktype, long completed, long total, String unit) + { + this(null, tasktype, completed, total, unit); + } + - public CompactionInfo(UUID id, OperationType tasktype, long completed, long total, String unit) ++ public CompactionInfo(CFMetaData cfm, OperationType tasktype, long completed, long total, String unit) + { this.tasktype = tasktype; - this.bytesComplete = bytesComplete; - this.totalBytes = totalBytes; + this.completed = completed; + this.total = total; - this.cfm = id == null ? null : Schema.instance.getCFMetaData(id); + this.cfm = cfm; + this.unit = unit; } /** @return A copy of this CompactionInfo with updated progress. */ -- public CompactionInfo forProgress(long bytesComplete, long totalBytes) ++ public CompactionInfo forProgress(long complete, long total) { - return new CompactionInfo(cfm == null ? null : cfm.cfId, tasktype, bytesComplete, totalBytes, unit); - return new CompactionInfo(cfm, tasktype, bytesComplete, totalBytes); ++ return new CompactionInfo(cfm, tasktype, complete, total, unit); } - public Integer getId() + public UUID getId() { - return cfm == null ? null : cfm.cfId; + return cfm.cfId; } public String getKeyspace() http://git-wip-us.apache.org/repos/asf/cassandra/blob/678f6ae3/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/678f6ae3/src/java/org/apache/cassandra/db/index/SecondaryIndexBuilder.java ----------------------------------------------------------------------
