natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.0' into cassandra-2.1

This commit is contained in:
Brandon Williams 2014-05-28 11:33:49 -05:00
parent 6d1500c501 a3b9d569f3
commit 4a295b6bee
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
View File

@ -27,6 +27,7 @@ import java.util.*;
import com.google.common.collect.AbstractIterator;
import com.google.common.collect.Maps;
import org.apache.cassandra.hadoop.HadoopCompat;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.cassandra.db.marshal.AbstractType;
@ -86,14 +87,14 @@ public class CqlRecordReader extends RecordReader<Long, Row>
public void initialize(InputSplit split, TaskAttemptContext context) throws IOException
{
this.split = (ColumnFamilySplit) split;
Configuration conf = context.getConfiguration();
Configuration conf = HadoopCompat.getConfiguration(context);
totalRowCount = (this.split.getLength() < Long.MAX_VALUE)
? (int) this.split.getLength()
: ConfigHelper.getInputSplitSize(conf);
cfName = quote(ConfigHelper.getInputColumnFamily(conf));
keyspace = quote(ConfigHelper.getInputKeyspace(conf));
cqlQuery = CqlConfigHelper.getInputCql(conf);
partitioner = ConfigHelper.getInputPartitioner(context.getConfiguration());
partitioner = ConfigHelper.getInputPartitioner(HadoopCompat.getConfiguration(context));
try
{
if (cluster != null)