Updated Branches: refs/heads/cassandra-1.1 6f384c54d -> f46232c0b refs/heads/trunk d62f8c1e5 -> b167e9ba7
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/b167e9ba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b167e9ba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b167e9ba Branch: refs/heads/trunk Commit: b167e9ba74fa917aeed55cfdcbff9133c13720d5 Parents: d62f8c1 f46232c Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Jul 25 13:15:29 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Jul 25 13:15:29 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../apache/cassandra/service/StorageService.java | 2 +- .../cassandra/service/StorageServiceMBean.java | 8 +++++--- src/java/org/apache/cassandra/tools/NodeCmd.java | 2 +- src/java/org/apache/cassandra/tools/NodeProbe.java | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b167e9ba/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c558c3f,c160d69..6dc6382 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,39 -1,6 +1,41 @@@ +1.2-dev + * 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) + + 1.1.3 + * (JMX) rename getRangeKeySample to sampleKeyRange to avoid returning + multi-MB results as an attribute (CASSANDRA-4452) * flush based on data size, not throughput; overwritten columns no longer artificially inflate liveRatio (CASSANDRA-4399) * update default commitlog segment size to 32MB and total commitlog http://git-wip-us.apache.org/repos/asf/cassandra/blob/b167e9ba/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index d8bed6f,bfc8c81..4af399d --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -3289,11 -3080,9 +3289,11 @@@ public class StorageService implements /** * #{@inheritDoc} */ - public List<String> getRangeKeySample() + public List<String> sampleKeyRange() // do not rename to getter - see CASSANDRA-4452 for details { - List<DecoratedKey> keys = keySamples(ColumnFamilyStore.allUserDefined(), getLocalPrimaryRange()); + List<DecoratedKey> keys = new ArrayList<DecoratedKey>(); + for (Range<Token> range : getLocalPrimaryRanges()) + keys.addAll(keySamples(ColumnFamilyStore.allUserDefined(), range)); List<String> sampledKeys = new ArrayList<String>(keys.size()); for (DecoratedKey key : keys) http://git-wip-us.apache.org/repos/asf/cassandra/blob/b167e9ba/src/java/org/apache/cassandra/service/StorageServiceMBean.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b167e9ba/src/java/org/apache/cassandra/tools/NodeCmd.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b167e9ba/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------
