Repository: cassandra Updated Branches: refs/heads/trunk 7bd6d56b5 -> 3b945483b
fix errant CPIF references Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6d0f436 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6d0f436 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6d0f436 Branch: refs/heads/trunk Commit: f6d0f436b39f78f2b4fee5e84190a53259ff677b Parents: 75378c2 Author: Brandon Williams <[email protected]> Authored: Mon Jan 12 11:57:23 2015 -0600 Committer: Brandon Williams <[email protected]> Committed: Mon Jan 12 11:57:23 2015 -0600 ---------------------------------------------------------------------- examples/hadoop_cql3_word_count/src/WordCount.java | 3 +-- examples/hadoop_cql3_word_count/src/WordCountCounters.java | 3 +-- src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6d0f436/examples/hadoop_cql3_word_count/src/WordCount.java ---------------------------------------------------------------------- diff --git a/examples/hadoop_cql3_word_count/src/WordCount.java b/examples/hadoop_cql3_word_count/src/WordCount.java index 519a98f..6a2f846 100644 --- a/examples/hadoop_cql3_word_count/src/WordCount.java +++ b/examples/hadoop_cql3_word_count/src/WordCount.java @@ -26,7 +26,6 @@ import org.apache.cassandra.hadoop.cql3.CqlOutputFormat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.hadoop.cql3.CqlPagingInputFormat; import org.apache.cassandra.hadoop.cql3.CqlInputFormat; import org.apache.cassandra.hadoop.ConfigHelper; import org.apache.cassandra.utils.ByteBufferUtil; @@ -247,7 +246,7 @@ public class WordCount extends Configured implements Tool else { job.setMapperClass(TokenizerMapper.class); - job.setInputFormatClass(CqlPagingInputFormat.class); + job.setInputFormatClass(CqlInputFormat.class); ConfigHelper.setInputRpcPort(job.getConfiguration(), "9160"); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6d0f436/examples/hadoop_cql3_word_count/src/WordCountCounters.java ---------------------------------------------------------------------- diff --git a/examples/hadoop_cql3_word_count/src/WordCountCounters.java b/examples/hadoop_cql3_word_count/src/WordCountCounters.java index 74de9ab..150d18d 100644 --- a/examples/hadoop_cql3_word_count/src/WordCountCounters.java +++ b/examples/hadoop_cql3_word_count/src/WordCountCounters.java @@ -25,7 +25,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.hadoop.cql3.CqlConfigHelper; -import org.apache.cassandra.hadoop.cql3.CqlPagingInputFormat; import org.apache.cassandra.hadoop.cql3.CqlInputFormat; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; @@ -156,7 +155,7 @@ public class WordCountCounters extends Configured implements Tool else { job.setMapperClass(SumMapper.class); - job.setInputFormatClass(CqlPagingInputFormat.class); + job.setInputFormatClass(CqlInputFormat.class); ConfigHelper.setInputRpcPort(job.getConfiguration(), "9160"); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6d0f436/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java index 2ba4dbf..08926fa 100644 --- a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java +++ b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java @@ -76,7 +76,7 @@ public class CqlStorage extends AbstractCassandraStorage { super(); this.pageSize = pageSize; - DEFAULT_INPUT_FORMAT = "org.apache.cassandra.hadoop.cql3.CqlPagingInputFormat"; + DEFAULT_INPUT_FORMAT = "org.apache.cassandra.hadoop.cql3.CqlInputFormat"; DEFAULT_OUTPUT_FORMAT = "org.apache.cassandra.hadoop.cql3.CqlOutputFormat"; }
