You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/01/07 00:26:54 UTC
[1/3] cassandra git commit: Revert "fix references to defunct
CqlPagingInputFormat"
Repository: cassandra
Updated Branches:
refs/heads/trunk 9529fba66 -> e1e28d0f0
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/trunk
Commit: e27cdf935c73f5d51ce920cf3245eca58219ceb1
Parents: e20810c
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Jan 7 02:25:09 2015 +0300
Committer: Aleksey Yeschenko <al...@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";
}
[2/3] cassandra git commit: Merge branch 'cassandra-2.0' into
cassandra-2.1
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/edf48f81
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edf48f81
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edf48f81
Branch: refs/heads/trunk
Commit: edf48f81739d45978460a3413bad7252a34636d9
Parents: f8b43d4 e27cdf9
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Jan 7 02:25:59 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Jan 7 02:25:59 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/edf48f81/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
----------------------------------------------------------------------
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e1e28d0f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1e28d0f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1e28d0f
Branch: refs/heads/trunk
Commit: e1e28d0f0d9a6b4bca97cfd081c042180814bff3
Parents: 9529fba edf48f8
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Wed Jan 7 02:26:43 2015 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Wed Jan 7 02:26:43 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/e1e28d0f/examples/hadoop_cql3_word_count/src/WordCount.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1e28d0f/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
----------------------------------------------------------------------