You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/01/25 21:27:58 UTC
[6/9] git commit: Fix start key/end token validation for wide row
iteration. Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-5168
Fix start key/end token validation for wide row iteration.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-5168
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3298c2f1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3298c2f1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3298c2f1
Branch: refs/heads/cassandra-1.2
Commit: 3298c2f19edbb307893d4ba634dd14becc510157
Parents: 9c8d949
Author: Brandon Williams <br...@apache.org>
Authored: Fri Jan 25 14:25:49 2013 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Fri Jan 25 14:25:49 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/thrift/ThriftValidation.java | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3298c2f1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 61bcf60..1ad77b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -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
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3298c2f1/src/java/org/apache/cassandra/thrift/ThriftValidation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/ThriftValidation.java b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
index bc64018..4f40938 100644
--- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
@@ -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");
}