Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
build.xml
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6df31637
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6df31637
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6df31637
Branch: refs/heads/trunk
Commit: 6df316375209410fbfe1e40059d25c915fa5fbb5
Parents: 43092aa b0841d8
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Tue Mar 25 16:52:21 2014 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Tue Mar 25 16:52:21 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 -
build.xml | 3 -
examples/hadoop_cql3_word_count/bin/word_count | 3 +-
.../bin/word_count_counters | 4 +-
.../hadoop_cql3_word_count/src/WordCount.java | 77 +--
.../src/WordCountCounters.java | 54 +-
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 541 +------------------
.../cassandra/hadoop/cql3/CqlInputFormat.java | 80 ---
.../hadoop/cql3/CqlPagingRecordReader.java | 2 +-
.../cassandra/hadoop/cql3/CqlRecordReader.java | 260 ---------
10 files changed, 29 insertions(+), 996 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6df31637/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6df31637/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 6656015,464dece..83ce003
--- a/build.xml
+++ b/build.xml
@@@ -383,12 -377,9 +383,11 @@@
<dependency groupId="org.apache.cassandra"
artifactId="cassandra-thrift" version="${version}" />
<dependency groupId="com.yammer.metrics" artifactId="metrics-core"
version="2.2.0" />
<dependency groupId="com.addthis.metrics"
artifactId="reporter-config" version="2.1.0" />
- <dependency groupId="edu.stanford.ppl" artifactId="snaptree"
version="0.1" />
<dependency groupId="org.mindrot" artifactId="jbcrypt"
version="0.3m" />
+ <dependency groupId="io.airlift" artifactId="airline" version="0.6"
/>
<dependency groupId="io.netty" artifactId="netty"
version="3.6.6.Final" />
+ <dependency groupId="com.google.code.findbugs" artifactId="jsr305"
version="2.0.2" />
+ <dependency groupId="com.clearspring.analytics" artifactId="stream"
version="2.5.2" />
- <dependency groupId="com.datastax.cassandra"
artifactId="cassandra-driver-core" version="2.0.1" />
<dependency groupId="net.sf.supercsv" artifactId="super-csv"
version="2.1.0" />
</dependencyManagement>
<developer id="alakshman" name="Avinash Lakshman"/>
@@@ -419,8 -410,8 +418,7 @@@
<dependency groupId="org.apache.hadoop" artifactId="hadoop-core"/>
<dependency groupId="org.apache.hadoop"
artifactId="hadoop-minicluster"/>
<dependency groupId="org.apache.pig" artifactId="pig"/>
-
- <dependency groupId="net.java.dev.jna" artifactId="jna"/>
+ <dependency groupId="com.google.code.findbugs"
artifactId="jsr305"/>
- <dependency groupId="com.datastax.cassandra"
artifactId="cassandra-driver-core"/>
</artifact:pom>
<artifact:pom id="coverage-deps-pom"
@@@ -486,10 -473,9 +484,9 @@@
<dependency groupId="org.apache.hadoop" artifactId="hadoop-core"
optional="true"/>
<dependency groupId="org.apache.hadoop"
artifactId="hadoop-minicluster" optional="true"/>
<dependency groupId="org.apache.pig" artifactId="pig"
optional="true"/>
- <dependency groupId="com.datastax.cassandra"
artifactId="cassandra-driver-core" optional="true"/>
<!-- don't need jna to run, but nice to have -->
- <dependency groupId="net.java.dev.jna" artifactId="jna"
optional="true"/>
+ <dependency groupId="net.java.dev.jna" artifactId="jna"
version="4.0.0"/>
<!-- don't need jamm unless running a server in which case it needs
to be a -javagent to be used anyway -->
<dependency groupId="com.github.stephenc" artifactId="jamm"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6df31637/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
----------------------------------------------------------------------
