Updated Branches: refs/heads/cassandra-1.1 0a8e978e7 -> 63f6c8431 refs/heads/trunk b8231eb22 -> d616dcdd7
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/d616dcdd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d616dcdd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d616dcdd Branch: refs/heads/trunk Commit: d616dcdd7b9ede69c5e703af7153ed4ce3072204 Parents: b8231eb 63f6c84 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Apr 4 14:28:38 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Apr 4 14:28:38 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cache/AutoSavingCache.java | 6 +- src/java/org/apache/cassandra/cache/CacheKey.java | 5 +- .../org/apache/cassandra/cache/KeyCacheKey.java | 59 ++++++++++++--- .../org/apache/cassandra/cache/RowCacheKey.java | 57 +++++++------- .../org/apache/cassandra/utils/ByteBufferUtil.java | 6 ++ .../apache/cassandra/cache/CacheProviderTest.java | 17 ++++ 7 files changed, 105 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d616dcdd/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7916cf5,631c774..46432a3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,5 +1,12 @@@ +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) + + 1.1.1-dev + * update caches to use byte[] keys to reduce memory overhead (CASSANDRA-3966) * add column limit to cli (CASSANDRA-3012, 4098) * clean up and optimize DataOutputBuffer, used by CQL compression and CompositeType (CASSANDRA-4072) http://git-wip-us.apache.org/repos/asf/cassandra/blob/d616dcdd/src/java/org/apache/cassandra/cache/AutoSavingCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d616dcdd/src/java/org/apache/cassandra/cache/CacheKey.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d616dcdd/src/java/org/apache/cassandra/cache/KeyCacheKey.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d616dcdd/src/java/org/apache/cassandra/cache/RowCacheKey.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d616dcdd/src/java/org/apache/cassandra/utils/ByteBufferUtil.java ----------------------------------------------------------------------
