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/a330716d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a330716d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a330716d Branch: refs/heads/trunk Commit: a330716d4507079e3ae208c7b4a4c50f01ce6c8f Parents: 17adf8e a7da029 Author: Jonathan Ellis <[email protected]> Authored: Fri Jan 18 12:58:18 2013 -0800 Committer: Jonathan Ellis <[email protected]> Committed: Fri Jan 18 12:58:18 2013 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../apache/cassandra/service/LoadBroadcaster.java | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a330716d/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 86743ca,9cdb02a..2f054f7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,53 -1,16 +1,55 @@@ -1.1.10 +1.2.1 + * GossipingPropertyFileSnitch loads saved dc/rack info if needed (CASSANDRA-5133) + * drain should flush system CFs too (CASSANDRA-4446) + * add inter_dc_tcp_nodelay setting (CASSANDRA-5148) + * re-allow wrapping ranges for start_token/end_token range pairing (CASSANDRA-5106) + * fix validation compaction of empty rows (CASSADRA-5136) + * nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750) + * disallow bloom filter false positive chance of 0 (CASSANDRA-5013) + * add threadpool size adjustment methods to JMXEnabledThreadPoolExecutor and + CompactionManagerMBean (CASSANDRA-5044) + * fix hinting for dropped local writes (CASSANDRA-4753) + * off-heap cache doesn't need mutable column container (CASSANDRA-5057) + * apply disk_failure_policy to bad disks on initial directory creation + (CASSANDRA-4847) + * Optimize name-based queries to use ArrayBackedSortedColumns (CASSANDRA-5043) + * Fall back to old manifest if most recent is unparseable (CASSANDRA-5041) + * pool [Compressed]RandomAccessReader objects on the partitioned read path + (CASSANDRA-4942) + * Add debug logging to list filenames processed by Directories.migrateFile + method (CASSANDRA-4939) + * Expose black-listed directories via JMX (CASSANDRA-4848) + * Log compaction merge counts (CASSANDRA-4894) + * Minimize byte array allocation by AbstractData{Input,Output} (CASSANDRA-5090) + * Add SSL support for the binary protocol (CASSANDRA-5031) + * Allow non-schema system ks modification for shuffle to work (CASSANDRA-5097) + * cqlsh: Add default limit to SELECT statements (CASSANDRA-4972) + * cqlsh: fix DESCRIBE for 1.1 cfs in CQL3 (CASSANDRA-5101) + * Correctly gossip with nodes >= 1.1.7 (CASSANDRA-5102) + * Ensure CL guarantees on digest mismatch (CASSANDRA-5113) + * Validate correctly selects on composite partition key (CASSANDRA-5122) + * Fix exception when adding collection (CASSANDRA-5117) + * Handle states for non-vnode clusters correctly (CASSANDRA-5127) + * Refuse unrecognized replication strategy options (CASSANDRA-4795) + * Pick the correct value validator in sstable2json for cql3 tables (CASSANDRA-5134) + * Validate login for describe_keyspace, describe_keyspaces and set_keyspace + (CASSANDRA-5144) + * Fix inserting empty maps (CASSANDRA-5141) + * Don't remove tokens from System table for node we know (CASSANDRA-5121) + * fix streaming progress report for compresed files (CASSANDRA-5130) + * Coverage analysis for low-CL queries (CASSANDRA-4858) + * Stop interpreting dates as valid timeUUID value (CASSANDRA-4936) + * Adds E notation for floating point numbers (CASSANDRA-4927) + * Detect (and warn) unintentional use of the cql2 thrift methods when cql3 was + intended (CASSANDRA-5172) +Merged from 1.1: + * fix saved key cache not loading at startup (CASSANDRA-5166) + * fix ConcurrentModificationException in getBootstrapSource (CASSANDRA-5170) - - -1.1.9 * Simplify CompressedRandomAccessReader to work around JDK FD bug (CASSANDRA-5088) * Improve handling a changing target throttle rate mid-compaction (CASSANDRA-5087) - * fix multithreaded compaction deadlock (CASSANDRA-4492) - * fix specifying and altering crc_check_chance (CASSANDRA-5053) - * Don't expire columns sooner than they should in 2ndary indexes (CASSANDRA-5079) * Pig: correctly decode row keys in widerow mode (CASSANDRA-5098) * nodetool repair command now prints progress (CASSANDRA-4767) + * Ensure Jackson dependency matches lib (CASSANDRA-5126) * fix user defined compaction to run against 1.1 data directory (CASSANDRA-5118) * Fix CQL3 BATCH authorization caching (CASSANDRA-5145) * fix get_count returns incorrect value with TTL (CASSANDRA-5099) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a330716d/src/java/org/apache/cassandra/service/LoadBroadcaster.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/LoadBroadcaster.java index 4bcb7f1,40e25ce..4a118ba --- a/src/java/org/apache/cassandra/service/LoadBroadcaster.java +++ b/src/java/org/apache/cassandra/service/LoadBroadcaster.java @@@ -32,9 -35,9 +34,9 @@@ public class LoadBroadcaster implement public static final LoadBroadcaster instance = new LoadBroadcaster(); - private static final Logger logger_ = LoggerFactory.getLogger(LoadBroadcaster.class); + private static final Logger logger = LoggerFactory.getLogger(LoadBroadcaster.class); - private final Map<InetAddress, Double> loadInfo = new HashMap<InetAddress, Double>(); - private ConcurrentMap<InetAddress, Double> loadInfo_ = new ConcurrentHashMap<InetAddress, java.lang.Double>(); ++ private ConcurrentMap<InetAddress, Double> loadInfo = new ConcurrentHashMap<InetAddress, java.lang.Double>(); private LoadBroadcaster() { @@@ -70,7 -73,7 +72,7 @@@ public Map<InetAddress, Double> getLoadInfo() { - return loadInfo; - return Collections.unmodifiableMap(loadInfo_); ++ return Collections.unmodifiableMap(loadInfo); } public void startBroadcasting()
