Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3683d621 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3683d621 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3683d621 Branch: refs/heads/trunk Commit: 3683d621b11efee78f37e31ea7145488b46488e6 Parents: 2effc40 5692797 Author: Dave Brosius <[email protected]> Authored: Mon May 13 14:19:49 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Mon May 13 14:19:49 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- src/java/org/apache/cassandra/tools/NodeCmd.java | 5 +++++ src/java/org/apache/cassandra/tools/NodeProbe.java | 5 +++++ .../org/apache/cassandra/tools/NodeToolHelp.yaml | 6 ++++++ 4 files changed, 18 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3683d621/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6efd6bf,844fe3d..1aca920 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,52 -1,5 +1,52 @@@ +2.0 + * JEMalloc support for off-heap allocation (CASSANDRA-3997) + * Single-pass compaction (CASSANDRA-4180) + * Removed token range bisection (CASSANDRA-5518) + * Removed compatibility with pre-1.2.5 sstables and network messages + (CASSANDRA-5511) + * removed PBSPredictor (CASSANDRA-5455) + * CAS support (CASSANDRA-5062, 5441, 5443) + * Leveled compaction performs size-tiered compactions in L0 + (CASSANDRA-5371, 5439) + * Add yaml network topology snitch for mixed ec2/other envs (CASSANDRA-5339) + * Log when a node is down longer than the hint window (CASSANDRA-4554) + * Optimize tombstone creation for ExpiringColumns (CASSANDRA-4917) + * Improve LeveledScanner work estimation (CASSANDRA-5250, 5407) + * Replace compaction lock with runWithCompactionsDisabled (CASSANDRA-3430) + * Change Message IDs to ints (CASSANDRA-5307) + * Move sstable level information into the Stats component, removing the + need for a separate Manifest file (CASSANDRA-4872) + * avoid serializing to byte[] on commitlog append (CASSANDRA-5199) + * make index_interval configurable per columnfamily (CASSANDRA-3961) + * add default_time_to_live (CASSANDRA-3974) + * add memtable_flush_period_in_ms (CASSANDRA-4237) + * replace supercolumns internally by composites (CASSANDRA-3237, 5123) + * upgrade thrift to 0.9.0 (CASSANDRA-3719) + * drop unnecessary keyspace parameter from user-defined compaction API + (CASSANDRA-5139) + * more robust solution to incomplete compactions + counters (CASSANDRA-5151) + * Change order of directory searching for c*.in.sh (CASSANDRA-3983) + * Add tool to reset SSTable compaction level for LCS (CASSANDRA-5271) + * Allow custom configuration loader (CASSANDRA-5045) + * Remove memory emergency pressure valve logic (CASSANDRA-3534) + * Reduce request latency with eager retry (CASSANDRA-4705) + * cqlsh: Remove ASSUME command (CASSANDRA-5331) + * Rebuild BF when loading sstables if bloom_filter_fp_chance + has changed since compaction (CASSANDRA-5015) + * remove row-level bloom filters (CASSANDRA-4885) + * Change Kernel Page Cache skipping into row preheating (disabled by default) + (CASSANDRA-4937) + * Improve repair by deciding on a gcBefore before sending + out TreeRequests (CASSANDRA-4932) + * Add an official way to disable compactions (CASSANDRA-5074) + * Reenable ALTER TABLE DROP with new semantics (CASSANDRA-3919) + * Add binary protocol versioning (CASSANDRA-5436) + * Swap THshaServer for TThreadedSelectorServer (CASSANDRA-5530) + * Add alias support to SELECT statement (CASSANDRA-5075) + + 1.2.5 - * fix 2i updates with indentical values and timestamps (CASSANDRA-5540) + * fix 2i updates with identical values and timestamps (CASSANDRA-5540) * fix compaction throttling bursty-ness (CASSANDRA-4316) * reduce memory consumption of IndexSummary (CASSANDRA-5506) * remove per-row column name bloom filters (CASSANDRA-5492) http://git-wip-us.apache.org/repos/asf/cassandra/blob/3683d621/src/java/org/apache/cassandra/tools/NodeCmd.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/NodeCmd.java index 63a3357,b2732a5..4008ffa --- a/src/java/org/apache/cassandra/tools/NodeCmd.java +++ b/src/java/org/apache/cassandra/tools/NodeCmd.java @@@ -155,6 -155,9 +155,8 @@@ public class NodeCm RANGEKEYSAMPLE, REBUILD_INDEX, RESETLOCALSCHEMA, - PREDICTCONSISTENCY, + ENABLEBACKUP, + DISABLEBACKUP } http://git-wip-us.apache.org/repos/asf/cassandra/blob/3683d621/src/java/org/apache/cassandra/tools/NodeProbe.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/tools/NodeProbe.java index 0a1bc5b,b2b9cf8..63733c0 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@@ -517,16 -520,10 +517,21 @@@ public class NodeProb cfsProxy.setCompactionThresholds(minimumCompactionThreshold, maximumCompactionThreshold); } - public void setIncrementalBackupsEnabled(boolean enabled){ + public void disableAutoCompaction(String ks, String ... columnFamilies) throws IOException + { + ssProxy.disableAutoCompaction(ks, columnFamilies); + } + + public void enableAutoCompaction(String ks, String ... columnFamilies) throws IOException + { + ssProxy.enableAutoCompaction(ks, columnFamilies); + } + ++ public void setIncrementalBackupsEnabled(boolean enabled) ++ { + ssProxy.setIncrementalBackupsEnabled(enabled); + } + public void setCacheCapacities(int keyCacheCapacity, int rowCacheCapacity) { try http://git-wip-us.apache.org/repos/asf/cassandra/blob/3683d621/src/resources/org/apache/cassandra/tools/NodeToolHelp.yaml ----------------------------------------------------------------------
