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 

Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog
This commit is contained in:
Brandon Williams 2014-10-23 11:57:00 -05:00
parent b21bb3f1bb b10c2ab86e
commit 0126760f6d
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -2,6 +2,8 @@
* Fix installing as service on Windows (CASSANDRA-8115)
* Fix CREATE TABLE for CQL2 (CASSANDRA-8144)
* Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109)
Merged from 2.0:
* Pig: Remove errant LIMIT clause in CqlNativeStorage
2.1.1

1
debian/changelog vendored
View File

@ -1,4 +1,5 @@
cassandra (2.1.1) unstable; urgency=medium
=======
* New release

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

@ -86,7 +86,6 @@ public class CqlRecordReader extends RecordReader<Long, Row>
private IPartitioner partitioner;
private String inputColumns;
private String userDefinedWhereClauses;
private int pageRowSize;
private List<String> partitionKeys = new ArrayList<>();
@ -111,14 +110,7 @@ public class CqlRecordReader extends RecordReader<Long, Row>
inputColumns = CqlConfigHelper.getInputcolumns(conf);
userDefinedWhereClauses = CqlConfigHelper.getInputWhereClauses(conf);
Optional<Integer> pageRowSizeOptional = CqlConfigHelper.getInputPageRowSize(conf);
try
{
pageRowSize = pageRowSizeOptional.isPresent() ? pageRowSizeOptional.get() : DEFAULT_CQL_PAGE_LIMIT;
}
catch(NumberFormatException e)
{
pageRowSize = DEFAULT_CQL_PAGE_LIMIT;
}
try
{
if (cluster != null)
@ -143,7 +135,6 @@ public class CqlRecordReader extends RecordReader<Long, Row>
// otherwise we will fall back to building a query using the:
// inputColumns
// whereClauses
// pageRowSize
cqlQuery = CqlConfigHelper.getInputCql(conf);
// validate that the user hasn't tried to give us a custom query along with input columns
// and where clauses
@ -520,8 +511,7 @@ public class CqlRecordReader extends RecordReader<Long, Row>
/**
* Build a query for the reader of the form:
*
* SELECT * FROM ks>cf token(pk1,...pkn)>? AND token(pk1,...pkn)<=? [AND user where clauses]
* LIMIT pageRowSize [ALLOW FILTERING]
* SELECT * FROM ks>cf token(pk1,...pkn)>? AND token(pk1,...pkn)<=? [AND user where clauses] [ALLOW FILTERING]
*/
private String buildQuery()
{
@ -540,7 +530,6 @@ public class CqlRecordReader extends RecordReader<Long, Row>
String whereClause = "";
if (StringUtils.isNotEmpty(userDefinedWhereClauses))
whereClause += " AND " + userDefinedWhereClauses;
whereClause += " LIMIT " + pageRowSize;
if (StringUtils.isNotEmpty(userDefinedWhereClauses))
whereClause += " ALLOW FILTERING";
return whereClause;