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:
Dave Brosius 2014-05-09 19:51:25 -04:00
parent e3dd88a8cd 453a07430c
commit 7b398c52d5
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -19,6 +19,7 @@ Merged from 2.0:
* Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088)
* cqlsh can't tab-complete disabling compaction (CASSANDRA-7185)
* cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172)
* Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
Merged from 1.2:
* Add Cloudstack snitch (CASSANDRA-7147)
* Update system.peers correctly when relocating tokens (CASSANDRA-7126)

12
src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java
View File

@ -24,6 +24,7 @@ import java.nio.ByteBuffer;
import java.nio.charset.CharacterCodingException;
import java.util.*;
import com.google.common.base.Optional;
import com.google.common.collect.AbstractIterator;
import com.google.common.collect.Iterables;
import org.apache.cassandra.hadoop.HadoopCompat;
@ -115,13 +116,14 @@ public class CqlPagingRecordReader extends RecordReader<Map<String, ByteBuffer>,
columns = CqlConfigHelper.getInputcolumns(conf);
userDefinedWhereClauses = CqlConfigHelper.getInputWhereClauses(conf);
try
Optional<Integer> pageRowSizeOptional = CqlConfigHelper.getInputPageRowSize(conf);
try
{
pageRowSize = CqlConfigHelper.getInputPageRowSize(conf).get();
}
catch (NumberFormatException e)
pageRowSize = pageRowSizeOptional.isPresent() ? pageRowSizeOptional.get() : DEFAULT_CQL_PAGE_LIMIT;
}
catch(NumberFormatException e)
{
pageRowSize = DEFAULT_CQL_PAGE_LIMIT;
pageRowSize = DEFAULT_CQL_PAGE_LIMIT;
}
partitioner = ConfigHelper.getInputPartitioner(HadoopCompat.getConfiguration(context));