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.1' into cassandra-2.2 

Conflicts:
	CHANGES.txt
This commit is contained in:
Sylvain Lebresne 2015-09-18 16:31:39 +02:00
parent dcada8bafd 0c1432ac7b
commit f3ad68cb4e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -9,6 +9,7 @@
* Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
(CASSANDRA-10199)
Merged from 2.1:
* Fix potential ClassCastException during paging (CASSANDRA-10352)
* Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)
* Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359)
* Fix NPE in nodetool compactionhistory (CASSANDRA-9758)

7
src/java/org/apache/cassandra/service/pager/SliceQueryPager.java
View File

@ -59,9 +59,10 @@ public class SliceQueryPager extends AbstractQueryPager implements SinglePartiti
if (state != null)
{
// The only case where this could be a non-CellName Composite is if it's Composites.EMPTY, but that's not
// valid for PagingState.cellName, so we can safely cast to CellName.
lastReturned = (CellName) cfm.comparator.fromByteBuffer(state.cellName);
// The cellname can be empty if this is used in a MultiPartitionPager and we're supposed to start reading this row
// (because the previous page has exhausted the previous pager). See #10352 for details.
if (state.cellName.hasRemaining())
lastReturned = (CellName) cfm.comparator.fromByteBuffer(state.cellName);
restoreState(state.remaining, true);
}
}