cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [1/2] cassandra git commit: Revert "fix references to defunct CqlPagingInputFormat"
Date Tue, 06 Jan 2015 23:26:13 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 f8b43d4a8 -> edf48f817


Revert "fix references to defunct CqlPagingInputFormat"

This reverts commit e550ea60212e933f3849a11717ba4ef916fc4aa3.


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

Branch: refs/heads/cassandra-2.1
Commit: e27cdf935c73f5d51ce920cf3245eca58219ceb1
Parents: e20810c
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Jan 7 02:25:09 2015 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Jan 7 02:25:09 2015 +0300

----------------------------------------------------------------------
 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, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e27cdf93/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 6a2f846..519a98f 100644
--- a/examples/hadoop_cql3_word_count/src/WordCount.java
+++ b/examples/hadoop_cql3_word_count/src/WordCount.java
@@ -26,6 +26,7 @@ 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;
@@ -246,7 +247,7 @@ public class WordCount extends Configured implements Tool
         else
         {
             job.setMapperClass(TokenizerMapper.class);
-            job.setInputFormatClass(CqlInputFormat.class);
+            job.setInputFormatClass(CqlPagingInputFormat.class);
             ConfigHelper.setInputRpcPort(job.getConfiguration(), "9160");
         }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e27cdf93/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 150d18d..74de9ab 100644
--- a/examples/hadoop_cql3_word_count/src/WordCountCounters.java
+++ b/examples/hadoop_cql3_word_count/src/WordCountCounters.java
@@ -25,6 +25,7 @@ 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;
@@ -155,7 +156,7 @@ public class WordCountCounters extends Configured implements Tool
         else
         {
             job.setMapperClass(SumMapper.class);
-            job.setInputFormatClass(CqlInputFormat.class);
+            job.setInputFormatClass(CqlPagingInputFormat.class);
             ConfigHelper.setInputRpcPort(job.getConfiguration(), "9160");
         }
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e27cdf93/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 6c50ab2..53f3900 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.CqlInputFormat";
+        DEFAULT_INPUT_FORMAT = "org.apache.cassandra.hadoop.cql3.CqlPagingInputFormat";
         DEFAULT_OUTPUT_FORMAT = "org.apache.cassandra.hadoop.cql3.CqlOutputFormat";
     }   
 


Mime
View raw message