Merge branch 'cassandra-1.1' into cassandra-1.2
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/thrift/ThriftValidation.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f4a941e4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f4a941e4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f4a941e4
Branch: refs/heads/cassandra-1.2
Commit: f4a941e49fa6557190dd03335bdf39e52191992a
Parents: 8540974 3298c2f
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Fri Jan 25 14:27:33 2013 -0600
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Fri Jan 25 14:27:33 2013 -0600
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
.../apache/cassandra/thrift/ThriftValidation.java | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4a941e4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3a53a34,1ad77b1..3696ca6
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -47,11 -2,17 +47,15 @@@ Merged from 1.1
* 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
* Simplify CompressedRandomAccessReader to work around JDK FD bug
(CASSANDRA-5088)
* Improve handling a changing target throttle rate mid-compaction
(CASSANDRA-5087)
- * fix multithreaded compaction deadlock (CASSANDRA-4492)
- * fix specifying and altering crc_check_chance (CASSANDRA-5053)
- * Don't expire columns sooner than they should in 2ndary indexes
(CASSANDRA-5079)
* Pig: correctly decode row keys in widerow mode (CASSANDRA-5098)
* nodetool repair command now prints progress (CASSANDRA-4767)
+ * Ensure Jackson dependency matches lib (CASSANDRA-5126)
* fix user defined compaction to run against 1.1 data directory
(CASSANDRA-5118)
* Fix CQL3 BATCH authorization caching (CASSANDRA-5145)
* fix get_count returns incorrect value with TTL (CASSANDRA-5099)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4a941e4/src/java/org/apache/cassandra/thrift/ThriftValidation.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/thrift/ThriftValidation.java
index eebc378,4f40938..daf044b
--- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
@@@ -485,8 -511,8 +485,8 @@@ public class ThriftValidatio
{
// 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");
+ throw new
org.apache.cassandra.exceptions.InvalidRequestException("Start key's token
sorts after end token");
}
validateFilterClauses(metadata, range.row_filter);
