Updated Branches: refs/heads/cassandra-1.1 01a8c1c5f -> 4797b4033 refs/heads/trunk 28a1f7a71 -> 043ca24e6
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/043ca24e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/043ca24e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/043ca24e Branch: refs/heads/trunk Commit: 043ca24e63b60e7f8c2e2ac3cc7af871864c5874 Parents: 28a1f7a 4797b40 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Apr 18 09:56:29 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Apr 18 09:56:29 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + src/java/org/apache/cassandra/db/Table.java | 20 ++++++++- .../apache/cassandra/service/StorageService.java | 31 +++++++++++++- .../cassandra/service/StorageServiceMBean.java | 11 +++++- src/java/org/apache/cassandra/tools/NodeCmd.java | 23 ++++++++--- src/java/org/apache/cassandra/tools/NodeProbe.java | 19 +++++++-- .../service/StorageServiceServerTest.java | 8 ++++ 7 files changed, 97 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/043ca24e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 37e438f,54e5e41..3d03260 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,13 -1,6 +1,15 @@@ +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) + + 1.1.1-dev + * add -cf option to nodetool snapshot, and takeColumnFamilySnapshot to + StorageService mbean (CASSANDRA-556) * optimize cleanup to drop entire sstables where possible (CASSANDRA-4079) * optimize truncate when autosnapshot is disabled (CASSANDRA-4153) * add support for commitlog archiving and point-in-time recovery http://git-wip-us.apache.org/repos/asf/cassandra/blob/043ca24e/src/java/org/apache/cassandra/db/Table.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/043ca24e/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index fcb8a9d,01113df..6b195c5 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -1681,10 -1661,10 +1681,10 @@@ public class StorageService implements { return Schema.instance.getVersion().toString(); } - + public List<String> getLeavingNodes() { - return stringify(tokenMetadata_.getLeavingEndpoints()); + return stringify(tokenMetadata.getLeavingEndpoints()); } public List<String> getMovingNodes() http://git-wip-us.apache.org/repos/asf/cassandra/blob/043ca24e/src/java/org/apache/cassandra/service/StorageServiceMBean.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/043ca24e/src/java/org/apache/cassandra/tools/NodeCmd.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java index 22a8cad,346ee3b..79f9fd7 --- a/src/java/org/apache/cassandra/tools/NodeCmd.java +++ b/src/java/org/apache/cassandra/tools/NodeCmd.java @@@ -59,6 -63,9 +60,7 @@@ public class NodeCm static { - options = new ToolOptions(); - + options.addOption(SNAPSHOT_COLUMNFAMILY_OPT, true, "only take a snapshot of the specified column family"); options.addOption(HOST_OPT, true, "node hostname or ip address"); options.addOption(PORT_OPT, true, "remote jmx agent port number"); options.addOption(USERNAME_OPT, true, "remote jmx agent username"); http://git-wip-us.apache.org/repos/asf/cassandra/blob/043ca24e/src/java/org/apache/cassandra/tools/NodeProbe.java ----------------------------------------------------------------------
