Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a22dd291 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a22dd291 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a22dd291 Branch: refs/heads/trunk Commit: a22dd291b35e88867493fd11d83dd0360c051b0a Parents: 6851402 42b91d4 Author: Jake Luciani <j...@apache.org> Authored: Wed Sep 10 16:22:07 2014 -0400 Committer: Jake Luciani <j...@apache.org> Committed: Wed Sep 10 16:22:07 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/cql3/QueryProcessor.java | 66 ++++++++--- .../cassandra/metrics/CqlStatementMetrics.java | 53 +++++++++ .../apache/cassandra/service/ClientState.java | 2 +- .../apache/cassandra/cql3/CqlMetricsTest.java | 110 +++++++++++++++++++ 5 files changed, 213 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a22dd291/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 449f688,177ac76..5c6bace --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ +3.0 + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + 2.1.1 + * Add metrics for tracking PreparedStatement use (CASSANDRA-7719) * (cqlsh) tab-completion for triggers (CASSANDRA-7824) * (cqlsh): Support for query paging (CASSANDRA-7514) * (cqlsh): Show progress of COPY operations (CASSANDRA-7789) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a22dd291/src/java/org/apache/cassandra/cql3/QueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a22dd291/src/java/org/apache/cassandra/service/ClientState.java ----------------------------------------------------------------------
