natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.1' into trunk

This commit is contained in:
Dave Brosius 2014-12-27 20:40:16 -05:00
parent 17d9791d63 6124a733cb
commit 36b287bea4
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/hadoop_cql3_word_count/src/WordCount.java
View File

@ -26,7 +26,6 @@ import org.apache.cassandra.hadoop.cql3.CqlOutputFormat;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.apache.cassandra.hadoop.cql3.CqlPagingInputFormat;
import org.apache.cassandra.hadoop.cql3.CqlInputFormat; import org.apache.cassandra.hadoop.cql3.CqlInputFormat;
import org.apache.cassandra.hadoop.ConfigHelper; import org.apache.cassandra.hadoop.ConfigHelper;
import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.ByteBufferUtil;
@ -247,7 +246,7 @@ public class WordCount extends Configured implements Tool
else else
{ {
job.setMapperClass(TokenizerMapper.class); job.setMapperClass(TokenizerMapper.class);
job.setInputFormatClass(CqlPagingInputFormat.class); job.setInputFormatClass(CqlInputFormat.class);
ConfigHelper.setInputRpcPort(job.getConfiguration(), "9160"); ConfigHelper.setInputRpcPort(job.getConfiguration(), "9160");
} }

3
examples/hadoop_cql3_word_count/src/WordCountCounters.java
View File

@ -25,7 +25,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.apache.cassandra.hadoop.cql3.CqlConfigHelper; import org.apache.cassandra.hadoop.cql3.CqlConfigHelper;
import org.apache.cassandra.hadoop.cql3.CqlPagingInputFormat;
import org.apache.cassandra.hadoop.cql3.CqlInputFormat; import org.apache.cassandra.hadoop.cql3.CqlInputFormat;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.conf.Configured; import org.apache.hadoop.conf.Configured;
@ -156,7 +155,7 @@ public class WordCountCounters extends Configured implements Tool
else else
{ {
job.setMapperClass(SumMapper.class); job.setMapperClass(SumMapper.class);
job.setInputFormatClass(CqlPagingInputFormat.class); job.setInputFormatClass(CqlInputFormat.class);
ConfigHelper.setInputRpcPort(job.getConfiguration(), "9160"); ConfigHelper.setInputRpcPort(job.getConfiguration(), "9160");
} }

2
src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
View File

@ -78,7 +78,7 @@ public class CqlStorage extends AbstractCassandraStorage
{ {
super(); super();
this.pageSize = pageSize; 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"; DEFAULT_OUTPUT_FORMAT = "org.apache.cassandra.hadoop.cql3.CqlOutputFormat";
} }