Commits

Anonymous committed 3298c2f

Fix start key/end token validation for wide row iteration.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-5168

Comments (0)

Files changed (2)

  * 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

src/java/org/apache/cassandra/thrift/ThriftValidation.java

         {
             // 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");
         }