cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Wed, 26 Mar 2014 14:38:39 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	build.xml


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

Branch: refs/heads/trunk
Commit: 7b32dbd4db8c8e06a6b35fc5ccd3fb4c7fe2f3ad
Parents: 0ac36ea d7cb970
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Wed Mar 26 15:38:13 2014 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Wed Mar 26 15:38:13 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   3 +
 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  | 553 ++++++++++++++++++-
 .../cassandra/hadoop/cql3/CqlInputFormat.java   |  80 +++
 .../hadoop/cql3/CqlPagingRecordReader.java      |   2 +-
 .../cassandra/hadoop/cql3/CqlRecordReader.java  | 487 ++++++++++++++++
 10 files changed, 1237 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b32dbd4/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b32dbd4/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 83ce003,a15415b..6656015
--- a/build.xml
+++ b/build.xml
@@@ -383,11 -377,10 +383,12 @@@
            <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"/>
@@@ -418,7 -411,8 +419,8 @@@
          <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="com.google.code.findbugs" artifactId="jsr305"/>
+         <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"/>
 -        <dependency groupId="net.java.dev.jna" artifactId="jna"/>
        </artifact:pom>
  
        <artifact:pom id="coverage-deps-pom"
@@@ -484,9 -474,10 +486,10 @@@
          <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/7b32dbd4/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
----------------------------------------------------------------------


Mime
View raw message