Updated Branches: refs/heads/cassandra-1.1 aa81f84c3 -> 8173c6f64 refs/heads/trunk e1fef7248 -> 66d52f9d2
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66d52f9d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66d52f9d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66d52f9d Branch: refs/heads/trunk Commit: 66d52f9d2742877a31df3b05cf3a3fe8fe72377e Parents: e1fef72 8173c6f Author: Jonathan Ellis <[email protected]> Authored: Wed Aug 22 10:34:57 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Aug 22 10:34:57 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra-env.sh | 2 +- .../apache/cassandra/cache/AutoSavingCache.java | 8 +++++++- .../cassandra/db/compaction/CompactionManager.java | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/66d52f9d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d9d67e4,3c7163a..7c0aa32 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,48 -1,5 +1,49 @@@ +1.2-dev + * Make compaction, flush JBOD-aware (CASSANDRA-4292) + * run local range scans on the read stage (CASSANDRA-3687) + * clean up ioexceptions (CASSANDRA-2116) + * Introduce new json format with row level deletion (CASSANDRA-4054) + * remove redundant "name" column from schema_keyspaces (CASSANDRA-4433) + * improve "nodetool ring" handling of multi-dc clusters (CASSANDRA-3047) + * update NTS calculateNaturalEndpoints to be O(N log N) (CASSANDRA-3881) + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366) + * split up rpc timeout by operation type (CASSANDRA-2819) + * rewrite key cache save/load to use only sequential i/o (CASSANDRA-3762) + * update MS protocol with a version handshake + broadcast address id + (CASSANDRA-4311) + * multithreaded hint replay (CASSANDRA-4189) + * add inter-node message compression (CASSANDRA-3127) + * remove COPP (CASSANDRA-2479) + * Track tombstone expiration and compact when tombstone content is + higher than a configurable threshold, default 20% (CASSANDRA-3442, 4234) + * 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, 4289) + * 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 unlimited by default (CASSANDRA-4277) + * Avoids double serialization of CF id in RowMutation messages + (CASSANDRA-4293) + * stream compressed sstables directly with java nio (CASSANDRA-4297) + * Support multiple ranges in SliceQueryFilter (CASSANDRA-3885) + * Add column metadata to system column families (CASSANDRA-4018) + * (cql3) Always use composite types by default (CASSANDRA-4329) + * (cql3) Add support for set, map and list (CASSANDRA-3647) + * Validate date type correctly (CASSANDRA-4441) + * (cql3) Allow definitions with only a PK (CASSANDRA-4361) + * (cql3) Add support for row key composites (CASSANDRA-4179) + * improve DynamicEndpointSnitch by using reservoir sampling (CASSANDRA-4038) + * (cql3) Add support for 2ndary indexes (CASSANDRA-3680) + * (cql3) fix defining more than one PK to be invalid (CASSANDRA-4477) + * remove schema agreement checking from all external APIs (Thrift, CQL and CQL3) (CASSANDRA-4487) + * add Murmur3Partitioner and make it default for new installations (CASSANDRA-3772) + + 1.1.5 + * increase stack size under Java7 to 180K * Log(info) schema changes (CASSANDRA-4547) http://git-wip-us.apache.org/repos/asf/cassandra/blob/66d52f9d/src/java/org/apache/cassandra/cache/AutoSavingCache.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cache/AutoSavingCache.java index ec054fb,b4e77be..7ce2beb --- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java +++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java @@@ -201,17 -198,23 +202,22 @@@ public class AutoSavingCache<K extends info = new CompactionInfo(new CFMetaData("system", cacheType.toString(), null, null, null), type, 0, - estimatedTotalBytes); + keys.size(), + "keys"); } + public CacheService.CacheType cacheType() + { + return cacheType; + } + public CompactionInfo getCompactionInfo() { - long bytesWritten = this.bytesWritten; - // keyset can change in size, thus totalBytes can too - return info.forProgress(bytesWritten, - Math.max(bytesWritten, estimatedTotalBytes)); + // keyset can change in size, thus total can too + return info.forProgress(keysWritten, Math.max(keysWritten, keys.size())); } - public void saveCache() throws IOException + public void saveCache() { logger.debug("Deleting old {} files.", cacheType); deleteOldCacheFiles(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/66d52f9d/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java index b888ffd,fcdf45b..5526dc1 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@@ -779,11 -769,11 +779,11 @@@ public class CompactionManager implemen public Future<?> submitCacheWrite(final AutoSavingCache.Writer writer) { - Runnable runnable = new WrappedRunnable() + Runnable runnable = new Runnable() { - public void runMayThrow() throws IOException + public void run() { - if (!AutoSavingCache.flushInProgress.compareAndSet(false, true)) + if (!AutoSavingCache.flushInProgress.add(writer.cacheType())) { logger.debug("Cache flushing was already in progress: skipping {}", writer.getCompactionInfo()); return;
