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/dd184c43 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dd184c43 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/dd184c43 Branch: refs/heads/trunk Commit: dd184c430f6fdb5b9e062670a48f524f174fd954 Parents: 9f268d1 c5864a5 Author: jluci...@bluemountaincapital.com <jluciani@workbox.local> Authored: Thu Mar 21 12:43:45 2013 -0400 Committer: jluci...@bluemountaincapital.com <jluciani@workbox.local> Committed: Thu Mar 21 12:43:45 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + conf/cassandra-env.sh | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd184c43/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6827087,e2b1daa..0959ac9 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -39,89 -7,9 +39,90 @@@ Merged from 1.1 * Fix possible assertion triggered in SliceFromReadCommand (CASSANDRA-5284) * cqlsh: Add inet type support on Windows (ipv4-only) (CASSANDRA-4801) * Fix race when initializing ColumnFamilyStore (CASSANDRA-5350) + * Add UseTLAB JVM flag (CASSANDRA-5361) +1.2.2 + * fix potential for multiple concurrent compactions of the same sstables + (CASSANDRA-5256) + * avoid no-op caching of byte[] on commitlog append (CASSANDRA-5199) + * fix symlinks under data dir not working (CASSANDRA-5185) + * fix bug in compact storage metadata handling (CASSANDRA-5189) + * Validate login for USE queries (CASSANDRA-5207) + * cli: remove default username and password (CASSANDRA-5208) + * configure populate_io_cache_on_flush per-CF (CASSANDRA-4694) + * allow configuration of internode socket buffer (CASSANDRA-3378) + * Make sstable directory picking blacklist-aware again (CASSANDRA-5193) + * Correctly expire gossip states for edge cases (CASSANDRA-5216) + * Improve handling of directory creation failures (CASSANDRA-5196) + * Expose secondary indicies to the rest of nodetool (CASSANDRA-4464) + * Binary protocol: avoid sending notification for 0.0.0.0 (CASSANDRA-5227) + * add UseCondCardMark XX jvm settings on jdk 1.7 (CASSANDRA-4366) + * CQL3 refactor to allow conversion function (CASSANDRA-5226) + * Fix drop of sstables in some circumstance (CASSANDRA-5232) + * Implement caching of authorization results (CASSANDRA-4295) + * Add support for LZ4 compression (CASSANDRA-5038) + * Fix missing columns in wide rows queries (CASSANDRA-5225) + * Simplify auth setup and make system_auth ks alterable (CASSANDRA-5112) + * Stop compactions from hanging during bootstrap (CASSANDRA-5244) + * fix compressed streaming sending extra chunk (CASSANDRA-5105) + * Add CQL3-based implementations of IAuthenticator and IAuthorizer + (CASSANDRA-4898) + * Fix timestamp-based tomstone removal logic (CASSANDRA-5248) + * cli: Add JMX authentication support (CASSANDRA-5080) + * Fix forceFlush behavior (CASSANDRA-5241) + * cqlsh: Add username autocompletion (CASSANDRA-5231) + * Fix CQL3 composite partition key error (CASSANDRA-5240) + * Allow IN clause on last clustering key (CASSANDRA-5230) + + +1.2.1 + * stream undelivered hints on decommission (CASSANDRA-5128) + * 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 and compaction 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) + + 1.1.10 * fix saved key cache not loading at startup (CASSANDRA-5166) * fix ConcurrentModificationException in getBootstrapSource (CASSANDRA-5170) http://git-wip-us.apache.org/repos/asf/cassandra/blob/dd184c43/conf/cassandra-env.sh ---------------------------------------------------------------------- diff --cc conf/cassandra-env.sh index f98bdb8,dcc6401..4fd1855 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@@ -202,10 -202,7 +202,11 @@@ JVM_OPTS="$JVM_OPTS -XX:SurvivorRatio=8 JVM_OPTS="$JVM_OPTS -XX:MaxTenuringThreshold=1" JVM_OPTS="$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75" JVM_OPTS="$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly" + JVM_OPTS="$JVM_OPTS -XX:+UseTLAB" +# note: bash evals '1.7.x' as > '1.7' so this is really a >= 1.7 jvm check +if [ "$JVM_VERSION" \> "1.7" ] ; then + JVM_OPTS="$JVM_OPTS -XX:+UseCondCardMark" +fi # GC logging options -- uncomment to enable # JVM_OPTS="$JVM_OPTS -XX:+PrintGCDetails"
