merge from 2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49833b94 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49833b94 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49833b94 Branch: refs/heads/trunk Commit: 49833b943b1cca627b1156620c83697661f4b51d Parents: 8ee7394 abde62d Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Oct 20 11:39:31 2014 -0700 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Oct 20 11:41:54 2014 -0700 ---------------------------------------------------------------------- .../cassandra/hadoop/cql3/CqlRecordReader.java | 36 ++++++++++++-------- 1 file changed, 22 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/49833b94/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java index b31a1a5,d052d73..c12a145 --- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java @@@ -22,7 -22,7 +22,17 @@@ import java.math.BigDecimal import java.math.BigInteger; import java.net.InetAddress; import java.nio.ByteBuffer; --import java.util.*; ++import java.util.ArrayList; ++import java.util.Arrays; ++import java.util.Collection; ++import java.util.Date; ++import java.util.HashMap; ++import java.util.Iterator; ++import java.util.LinkedHashMap; ++import java.util.List; ++import java.util.Map; ++import java.util.Set; ++import java.util.UUID; import com.google.common.base.Function; import com.google.common.base.Joiner; @@@ -31,16 -31,17 +41,23 @@@ 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.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; - -import org.apache.cassandra.hadoop.HadoopCompat; +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; import org.apache.cassandra.hadoop.ConfigHelper; ++import org.apache.cassandra.hadoop.HadoopCompat; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Pair; import org.apache.hadoop.conf.Configuration; @@@ -48,15 -49,12 +65,6 @@@ import org.apache.hadoop.mapreduce.Inpu import org.apache.hadoop.mapreduce.RecordReader; import org.apache.hadoop.mapreduce.TaskAttemptContext; --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; - /** * CqlRecordReader reads the rows return from the CQL query * It uses CQL auto-paging.
