cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Thu, 04 Jun 2015 10:06:56 GMT
Merge branch 'cassandra-2.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
	src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java


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

Branch: refs/heads/trunk
Commit: 9718e13d7ec5d7cf88095d3db81091ca75247e15
Parents: 78c0305 1936657
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Thu Jun 4 10:55:19 2015 +0100
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Thu Jun 4 10:55:19 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 examples/hadoop_cql3_word_count/README.txt      |  14 +-
 .../bin/word_count_counters                     |   1 +
 .../conf/log4j.properties                       |  32 -
 .../hadoop_cql3_word_count/conf/logback.xml     |  42 +
 .../hadoop_cql3_word_count/src/WordCount.java   |   4 +-
 examples/hadoop_word_count/README.txt           |  10 +-
 .../hadoop_word_count/bin/word_count_counters   |   1 +
 .../hadoop_word_count/conf/log4j.properties     |  32 -
 examples/hadoop_word_count/conf/logback.xml     |  42 +
 examples/hadoop_word_count/src/WordCount.java   |  20 +-
 .../src/WordCountCounters.java                  |  24 +-
 .../hadoop/ColumnFamilyInputFormat.java         |   7 +-
 .../hadoop/ColumnFamilyRecordReader.java        | 117 +--
 .../hadoop/pig/AbstractCassandraStorage.java    | 775 -------------------
 .../cassandra/hadoop/pig/CassandraStorage.java  |  35 +-
 .../cassandra/hadoop/pig/CqlNativeStorage.java  |  12 +-
 test/conf/logback-test.xml                      |   4 +-
 18 files changed, 218 insertions(+), 955 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9718e13d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 688e8ad,882279f..ea619e6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.0:
 + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801)
 + * Change gossip stabilization to use endpoit size (CASSANDRA-9401)
 + * Change default garbage collector to G1 (CASSANDRA-7486)
 +
 +
  2.2
+  * Remove use of Cell in Thrift MapReduce classes (CASSANDRA-8609)
   * Integrate pre-release Java Driver 2.2-rc1, custom build (CASSANDRA-9493)
   * Clean up gossiper logic for old versions (CASSANDRA-9370)
   * Fix custom payload coding/decoding to match the spec (CASSANDRA-9515)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9718e13d/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
index 0635459,5d354a7..7bf43ef
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@@ -113,7 -113,8 +113,7 @@@ public class CassandraStorage extends L
      
      // wide row hacks
      private ByteBuffer lastKey;
-     private Map<ByteBuffer, Cell> lastRow;
+     private Map<ByteBuffer, ColumnFamilyRecordReader.Column> lastRow;
 -    private boolean hasNext = true;
  
      public CassandraStorage()
      {


Mime
View raw message