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/3d399259 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d399259 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d399259 Branch: refs/heads/trunk Commit: 3d399259d84e4d6bee07a86ac0c9efd3400d6248 Parents: 917e387 7b32dbd Author: Sylvain Lebresne <[email protected]> Authored: Wed Mar 26 15:38:31 2014 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Mar 26 15:38:31 2014 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 + build.xml | 3 + examples/hadoop_cql3_word_count/bin/word_count | 3 +- .../bin/word_count_counters | 4 +- .../hadoop_cql3_word_count/src/WordCount.java | 77 ++- .../src/WordCountCounters.java | 54 +- .../cassandra/hadoop/cql3/CqlConfigHelper.java | 553 ++++++++++++++++++- .../cassandra/hadoop/cql3/CqlInputFormat.java | 80 +++ .../hadoop/cql3/CqlPagingRecordReader.java | 2 +- .../cassandra/hadoop/cql3/CqlRecordReader.java | 487 ++++++++++++++++ 10 files changed, 1237 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d399259/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d399259/build.xml ----------------------------------------------------------------------
