Updated Branches: refs/heads/trunk 9d1bf3723 -> 7c59d8f4d
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/7c59d8f4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c59d8f4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c59d8f4 Branch: refs/heads/trunk Commit: 7c59d8f4d37e467e664e6fea1e9b6414a1dba13a Parents: 9d1bf37 b1c60d2 Author: Pavel Yaskevich <[email protected]> Authored: Sat Jun 30 15:14:59 2012 +0300 Committer: Pavel Yaskevich <[email protected]> Committed: Sat Jun 30 15:14:59 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 4 + .../src/org/apache/cassandra/stress/Session.java | 26 ++++- .../org/apache/cassandra/stress/StressAction.java | 4 +- .../cassandra/stress/operations/CounterAdder.java | 3 +- .../cassandra/stress/operations/CounterGetter.java | 3 +- .../stress/operations/CqlCounterAdder.java | 47 +++++++--- .../stress/operations/CqlCounterGetter.java | 38 ++++++-- .../stress/operations/CqlIndexedRangeSlicer.java | 44 +++++--- .../cassandra/stress/operations/CqlInserter.java | 50 +++++++--- .../stress/operations/CqlMultiGetter.java | 4 +- .../stress/operations/CqlRangeSlicer.java | 38 ++++++-- .../cassandra/stress/operations/CqlReader.java | 61 ++++++++--- .../stress/operations/IndexedRangeSlicer.java | 3 +- .../cassandra/stress/operations/Inserter.java | 3 +- .../cassandra/stress/operations/MultiGetter.java | 3 +- .../cassandra/stress/operations/RangeSlicer.java | 3 +- .../apache/cassandra/stress/operations/Reader.java | 3 +- .../cassandra/stress/util/CassandraClient.java | 34 +++++++ .../apache/cassandra/stress/util/Operation.java | 77 +++++++++++++-- 19 files changed, 352 insertions(+), 96 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c59d8f4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d50bc4b,25d9784..1700ee7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,30 -1,7 +1,34 @@@ +1.2-dev + * 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) + * 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) + + + 1.1.3 + * (stress) support for CQL prepared statements (CASSANDRA-3633) + + 1.1.2 * Fix cleanup not deleting index entries (CASSANDRA-4379) * Use correct partitioner when saving + loading caches (CASSANDRA-4331)
