cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [1/3] cassandra git commit: fix references to defunct CqlPagingInputFormat patch by rjoshi reviewed by dbrosius for CASSANDRA-8541
Date Sun, 28 Dec 2014 01:41:23 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 17d9791d6 -> 36b287bea


fix references to defunct CqlPagingInputFormat
patch by rjoshi reviewed by dbrosius for CASSANDRA-8541


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e550ea60
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e550ea60
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e550ea60

Branch: refs/heads/trunk
Commit: e550ea60212e933f3849a11717ba4ef916fc4aa3
Parents: f981bd5
Author: rekhajoshm <dbrosius@mebigfatguy.com>
Authored: Sat Dec 27 20:23:01 2014 -0500
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Sat Dec 27 20:23:01 2014 -0500

----------------------------------------------------------------------
 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/e550ea60/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/e550ea60/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/e550ea60/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 53f3900..6c50ab2 100644
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
@@ -74,7 +74,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";
     }   
 


Mime
View raw message