cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [4/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Date Thu, 26 Sep 2013 18:54:36 GMT
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java


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

Branch: refs/heads/trunk
Commit: 006eec4a5dc76d79f3147ab1e1e78e17e304a88c
Parents: d493030 389ff55
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Thu Sep 26 13:53:46 2013 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Thu Sep 26 13:53:46 2013 -0500

----------------------------------------------------------------------
 .../hadoop/pig/AbstractCassandraStorage.java    | 151 ++-----------------
 .../cassandra/hadoop/pig/CassandraStorage.java  |   2 +-
 .../apache/cassandra/hadoop/pig/CqlStorage.java | 144 +++++++++++++++++-
 3 files changed, 153 insertions(+), 144 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/006eec4a/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/006eec4a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
index e66f585,09171a0..c9afff0
--- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java
@@@ -700,12 -698,20 +700,12 @@@ public class CassandraStorage extends A
  
      /** get a list of column for the column family */
      protected List<ColumnDef> getColumnMetadata(Cassandra.Client client, boolean cql3Table)

 -            throws InvalidRequestException, 
 -            UnavailableException, 
 -            TimedOutException, 
 -            SchemaDisagreementException, 
 -            TException,
 -            CharacterCodingException,
 -            org.apache.cassandra.exceptions.InvalidRequestException,
 -            ConfigurationException,
 -            NotFoundException
 +    throws TException, CharacterCodingException, InvalidRequestException, ConfigurationException
      {
          if (cql3Table)
 -            return new ArrayList<ColumnDef>();
 +            return new ArrayList<>();
          
-         return getColumnMeta(client, true);
+         return getColumnMeta(client, true, true);
      }
  
      /** convert key to a tuple */

http://git-wip-us.apache.org/repos/asf/cassandra/blob/006eec4a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
index 86fe338,79abc2c..b96d10e
--- a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
+++ b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java
@@@ -23,6 -23,9 +23,8 @@@ import java.nio.charset.CharacterCoding
  import java.util.*;
  
  
+ import org.apache.cassandra.cql3.CFDefinition;
+ import org.apache.cassandra.cql3.ColumnIdentifier;
 -import org.apache.cassandra.db.IColumn;
  import org.apache.cassandra.db.Column;
  import org.apache.cassandra.db.marshal.*;
  import org.apache.cassandra.exceptions.ConfigurationException;


Mime
View raw message