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/c61784cd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c61784cd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c61784cd Branch: refs/heads/trunk Commit: c61784cd8f183c816229bed6add0f642a45e3449 Parents: a26f192 88ad4f4 Author: Jonathan Ellis <[email protected]> Authored: Wed Aug 13 11:57:51 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Aug 13 11:57:51 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../hadoop/AbstractBulkOutputFormat.java | 73 ++++++ .../hadoop/AbstractBulkRecordWriter.java | 251 ++++++++++++++++++ .../cassandra/hadoop/BulkOutputFormat.java | 49 +--- .../cassandra/hadoop/BulkRecordWriter.java | 259 ++----------------- .../cassandra/hadoop/cql3/CqlConfigHelper.java | 2 +- .../cassandra/hadoop/cql3/CqlOutputFormat.java | 2 +- .../io/sstable/AbstractSSTableSimpleWriter.java | 10 +- .../cassandra/io/sstable/CQLSSTableWriter.java | 3 +- 9 files changed, 358 insertions(+), 292 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c61784cd/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 9063813,de93018..4ed4d51 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,5 +1,22 @@@ +3.0 + * Support pure user-defined functions (CASSANDRA-7395) + * 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 + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) * SSTableExport uses correct validator to create string representation of partition keys (CASSANDRA-7498) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c61784cd/src/java/org/apache/cassandra/io/sstable/AbstractSSTableSimpleWriter.java ----------------------------------------------------------------------
