Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/452dd108 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/452dd108 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/452dd108 Branch: refs/heads/trunk Commit: 452dd10809b2eb1dd757e648c537f5117d04a0eb Parents: 70bf377 abbf634 Author: Dave Brosius <[email protected]> Authored: Thu Oct 23 23:24:30 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Thu Oct 23 23:24:30 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/452dd108/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java index f6b3869,9c1118b..b536246 --- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java @@@ -41,18 -30,12 +40,21 @@@ import com.google.common.base.Splitter import com.google.common.collect.AbstractIterator; import com.google.common.collect.Iterables; import com.google.common.collect.Maps; + import org.apache.commons.lang3.StringUtils; + + import org.apache.cassandra.hadoop.HadoopCompat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + +import com.datastax.driver.core.Cluster; +import com.datastax.driver.core.ColumnDefinitions; +import com.datastax.driver.core.ColumnMetadata; +import com.datastax.driver.core.ResultSet; +import com.datastax.driver.core.Row; +import com.datastax.driver.core.Session; +import com.datastax.driver.core.TupleValue; +import com.datastax.driver.core.UDTValue; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.hadoop.ColumnFamilySplit;
