Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bf4d6fbb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf4d6fbb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf4d6fbb Branch: refs/heads/trunk Commit: bf4d6fbbd928c4be823a8451e9b3d99d0aa001f0 Parents: de80c6c 97aa922 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Apr 11 13:25:19 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Apr 11 13:25:19 2012 -0500 ---------------------------------------------------------------------- examples/hadoop_word_count/README.txt | 13 ++ examples/hadoop_word_count/bin/word_count | 1 + examples/hadoop_word_count/conf/log4j.properties | 15 ++ examples/hadoop_word_count/src/WordCount.java | 3 +- src/java/org/apache/cassandra/db/Memtable.java | 86 +++++---- .../cassandra/hadoop/ColumnFamilyInputFormat.java | 25 ++- .../cassandra/hadoop/ColumnFamilyRecordReader.java | 139 ++++++++------ .../apache/cassandra/hadoop/ColumnFamilySplit.java | 9 +- .../apache/cassandra/thrift/CassandraServer.java | 5 +- .../apache/cassandra/thrift/ThriftValidation.java | 19 +-- 10 files changed, 192 insertions(+), 123 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf4d6fbb/src/java/org/apache/cassandra/thrift/CassandraServer.java ----------------------------------------------------------------------
