ex msg for cql3 order by constraints says primary filter can be an IN clause which is misleading patch by dbrosius reviewed by slebresne for CASSANDRA-4319
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8fd3f49e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8fd3f49e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8fd3f49e Branch: refs/heads/trunk Commit: 8fd3f49e8469f0123a58b37243b3a2e1147fa51f Parents: 4ec0990 Author: Dave Brosius <[email protected]> Authored: Fri Jun 8 19:29:11 2012 -0400 Committer: Dave Brosius <[email protected]> Committed: Fri Jun 8 19:29:11 2012 -0400 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../cassandra/cql3/statements/SelectStatement.java | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8fd3f49e/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index e4c899c..71ab07d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,8 @@ 1.1.2 * enforce 1m min keycache for auto (CASSANDRA-4306) * Have DeletedColumn.isMFD always return true (CASSANDRA-4307) + * ex msg for cql3 order by constraints says primary filter can be an IN clause + which is misleading (CASSANDRA-4319) Merged from 1.0: * Set gc_grace on index CF to 0 (CASSANDRA-4314) http://git-wip-us.apache.org/repos/asf/cassandra/blob/8fd3f49e/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java index 26f082b..600415e 100644 --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@ -1082,7 +1082,7 @@ public class SelectStatement implements CQLStatement // TODO: we could allow ordering for IN queries, as we can do the // sorting post-query easily, but we will have to add it if (stmt.keyRestriction == null || !stmt.keyRestriction.isEquality() || stmt.keyRestriction.eqValues.size() != 1) - throw new InvalidRequestException("Ordering is only supported is the first part of the PRIMARY KEY is restricted by an Equal or a IN"); + throw new InvalidRequestException("Ordering is only supported if the first part of the PRIMARY KEY is restricted by an Equal"); } // If this is a query on tokens, it's necessary a range query (there can be more than one key per token), so reject IN queries (as we don't know how to do them)
