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

Fix start key/end token validation for wide row iteration. 

Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-5168
This commit is contained in:
Brandon Williams 2013-01-25 14:25:49 -06:00
parent 9c8d949301
commit 3298c2f19e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -2,6 +2,7 @@
* fix saved key cache not loading at startup (CASSANDRA-5166)
* fix ConcurrentModificationException in getBootstrapSource (CASSANDRA-5170)
* fix sstable maxtimestamp for row deletes and pre-1.1.1 sstables (CASSANDRA-5153)
* fix start key/end token validation for wide row iteration (CASSANDRA-5168)
1.1.9

2
src/java/org/apache/cassandra/thrift/ThriftValidation.java
View File

@ -511,7 +511,7 @@ public class ThriftValidation
{
// start_token/end_token can wrap, but key/token should not
RowPosition stop = p.getTokenFactory().fromString(range.end_token).maxKeyBound(p);
if (RowPosition.forKey(range.start_key, p).compareTo(stop) > 0)
if (RowPosition.forKey(range.start_key, p).compareTo(stop) > 0 && !stop.isMinimum())
throw new InvalidRequestException("Start key's token sorts after end token");
}