Updated Branches: refs/heads/trunk 22d8e8448 -> 63cc6b0c7
update WordCountCounters for SuperColumn refactor Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/63cc6b0c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63cc6b0c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/63cc6b0c Branch: refs/heads/trunk Commit: 63cc6b0c79759121cb777a5baaf5d6e2983d07c8 Parents: 22d8e84 Author: Jonathan Ellis <[email protected]> Authored: Wed Feb 6 16:34:37 2013 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Wed Feb 6 16:34:37 2013 -0600 ---------------------------------------------------------------------- .../hadoop_word_count/src/WordCountCounters.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/63cc6b0c/examples/hadoop_word_count/src/WordCountCounters.java ---------------------------------------------------------------------- diff --git a/examples/hadoop_word_count/src/WordCountCounters.java b/examples/hadoop_word_count/src/WordCountCounters.java index e5a2460..55d0889 100644 --- a/examples/hadoop_word_count/src/WordCountCounters.java +++ b/examples/hadoop_word_count/src/WordCountCounters.java @@ -34,7 +34,7 @@ import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; -import org.apache.cassandra.db.IColumn; +import org.apache.cassandra.db.Column; import org.apache.cassandra.hadoop.ColumnFamilyInputFormat; import org.apache.cassandra.hadoop.ConfigHelper; import org.apache.cassandra.thrift.*; @@ -60,12 +60,12 @@ public class WordCountCounters extends Configured implements Tool System.exit(0); } - public static class SumMapper extends Mapper<ByteBuffer, SortedMap<ByteBuffer, IColumn>, Text, LongWritable> + public static class SumMapper extends Mapper<ByteBuffer, SortedMap<ByteBuffer, Column>, Text, LongWritable> { - public void map(ByteBuffer key, SortedMap<ByteBuffer, IColumn> columns, Context context) throws IOException, InterruptedException + public void map(ByteBuffer key, SortedMap<ByteBuffer, Column> columns, Context context) throws IOException, InterruptedException { long sum = 0; - for (IColumn column : columns.values()) + for (Column column : columns.values()) { logger.debug("read " + key + ":" + column.name() + " from " + context.getInputSplit()); sum += ByteBufferUtil.toLong(column.value());
