Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7f117da0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7f117da0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7f117da0 Branch: refs/heads/cassandra-2.0 Commit: 7f117da0caf66715a82417b3f7e3a2b30d0f279e Parents: 1ae996d f5618e3 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Sep 11 10:18:40 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Sep 11 10:18:40 2013 -0500 ---------------------------------------------------------------------- .../hadoop/pig/AbstractCassandraStorage.java | 170 +++++++++++++++---- .../cassandra/hadoop/pig/CassandraStorage.java | 8 +- .../apache/cassandra/hadoop/pig/CqlStorage.java | 10 +- 3 files changed, 147 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f117da0/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java index 19361e4,68e18c8..b770ed6 --- a/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java +++ b/src/java/org/apache/cassandra/hadoop/pig/AbstractCassandraStorage.java @@@ -29,7 -29,11 +29,10 @@@ import java.util.* import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.SyntaxException; import org.apache.cassandra.auth.IAuthenticator; + import org.apache.cassandra.config.CFMetaData; + import org.apache.cassandra.cql3.CFDefinition; + import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.Column; -import org.apache.cassandra.db.IColumn; import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.db.marshal.AbstractCompositeType.CompositeComponent; import org.apache.cassandra.hadoop.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f117da0/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java index e3c8a67,dbdd5e9..577fd38 --- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java +++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java @@@ -23,25 -23,11 +23,26 @@@ import java.nio.charset.CharacterCoding import java.util.*; -import org.apache.cassandra.db.IColumn; +import org.apache.cassandra.db.Column; import org.apache.cassandra.db.marshal.*; + import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.hadoop.*; -import org.apache.cassandra.thrift.*; +import org.apache.cassandra.thrift.Cassandra; +import org.apache.cassandra.thrift.CfDef; +import org.apache.cassandra.thrift.ColumnDef; +import org.apache.cassandra.thrift.ColumnOrSuperColumn; +import org.apache.cassandra.thrift.Deletion; +import org.apache.cassandra.thrift.IndexClause; +import org.apache.cassandra.thrift.IndexExpression; +import org.apache.cassandra.thrift.IndexOperator; +import org.apache.cassandra.thrift.InvalidRequestException; +import org.apache.cassandra.thrift.Mutation; +import org.apache.cassandra.thrift.SchemaDisagreementException; +import org.apache.cassandra.thrift.SlicePredicate; +import org.apache.cassandra.thrift.SliceRange; +import org.apache.cassandra.thrift.SuperColumn; +import org.apache.cassandra.thrift.TimedOutException; +import org.apache.cassandra.thrift.UnavailableException; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Hex; http://git-wip-us.apache.org/repos/asf/cassandra/blob/7f117da0/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java index 2b76b83,b35e13a..1ef69b7 --- a/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java +++ b/src/java/org/apache/cassandra/hadoop/pig/CqlStorage.java @@@ -23,8 -23,10 +23,9 @@@ import java.nio.charset.CharacterCoding import java.util.*; -import org.apache.cassandra.db.IColumn; import org.apache.cassandra.db.Column; import org.apache.cassandra.db.marshal.*; + import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.hadoop.*; import org.apache.cassandra.hadoop.cql3.CqlConfigHelper; import org.apache.cassandra.thrift.*;