Updated Branches: refs/heads/trunk b226cf93f -> 05786528d
fix word_count build Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/05786528 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05786528 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05786528 Branch: refs/heads/trunk Commit: 05786528de13058f93c4a24311faf689033946f9 Parents: b226cf9 Author: Jonathan Ellis <jbel...@apache.org> Authored: Fri Jan 20 17:03:36 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Jan 20 17:12:21 2012 -0600 ---------------------------------------------------------------------- examples/hadoop_word_count/src/WordCount.java | 7 +++---- .../hadoop_word_count/src/WordCountCounters.java | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/05786528/examples/hadoop_word_count/src/WordCount.java ---------------------------------------------------------------------- diff --git a/examples/hadoop_word_count/src/WordCount.java b/examples/hadoop_word_count/src/WordCount.java index b21c05c..cdd87d9 100644 --- a/examples/hadoop_word_count/src/WordCount.java +++ b/examples/hadoop_word_count/src/WordCount.java @@ -191,10 +191,9 @@ public class WordCount extends Configured implements Tool job.setInputFormatClass(ColumnFamilyInputFormat.class); - - ConfigHelper.setRpcPort(job.getConfiguration(), "9160"); - ConfigHelper.setInitialAddress(job.getConfiguration(), "localhost"); - ConfigHelper.setPartitioner(job.getConfiguration(), "org.apache.cassandra.dht.RandomPartitioner"); + ConfigHelper.setInputRpcPort(job.getConfiguration(), "9160"); + ConfigHelper.setInputInitialAddress(job.getConfiguration(), "localhost"); + ConfigHelper.setInputPartitioner(job.getConfiguration(), "org.apache.cassandra.dht.RandomPartitioner"); ConfigHelper.setInputColumnFamily(job.getConfiguration(), KEYSPACE, COLUMN_FAMILY); SlicePredicate predicate = new SlicePredicate().setColumn_names(Arrays.asList(ByteBufferUtil.bytes(columnName))); ConfigHelper.setInputSlicePredicate(job.getConfiguration(), predicate); http://git-wip-us.apache.org/repos/asf/cassandra/blob/05786528/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 68d6bcf..2d843df 100644 --- a/examples/hadoop_word_count/src/WordCountCounters.java +++ b/examples/hadoop_word_count/src/WordCountCounters.java @@ -87,10 +87,9 @@ public class WordCountCounters extends Configured implements Tool job.setInputFormatClass(ColumnFamilyInputFormat.class); - - ConfigHelper.setRpcPort(job.getConfiguration(), "9160"); - ConfigHelper.setInitialAddress(job.getConfiguration(), "localhost"); - ConfigHelper.setPartitioner(job.getConfiguration(), "org.apache.cassandra.dht.RandomPartitioner"); + ConfigHelper.setInputRpcPort(job.getConfiguration(), "9160"); + ConfigHelper.setInputInitialAddress(job.getConfiguration(), "localhost"); + ConfigHelper.setInputPartitioner(job.getConfiguration(), "org.apache.cassandra.dht.RandomPartitioner"); ConfigHelper.setInputColumnFamily(job.getConfiguration(), WordCount.KEYSPACE, WordCountCounters.COUNTER_COLUMN_FAMILY); SlicePredicate predicate = new SlicePredicate().setSlice_range( new SliceRange().