Repository: cassandra Updated Branches: refs/heads/trunk aad152d81 -> bc6308321
Improve error message from 7499 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fd8f5b9f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd8f5b9f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fd8f5b9f Branch: refs/heads/trunk Commit: fd8f5b9f7e88bebf180c6142f772ba2808bc8b01 Parents: e4d5eda Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Aug 22 16:02:43 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Aug 22 16:03:38 2014 +0200 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/statements/BatchStatement.java | 2 +- .../apache/cassandra/cql3/statements/ModificationStatement.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd8f5b9f/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java index cbe3016..8a9a8f0 100644 --- a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java @@ -127,7 +127,7 @@ public class BatchStatement implements CQLStatement, MeasurableForPreparedCache statement.validate(state); if (hasConditions && statement.requiresRead()) - throw new InvalidRequestException("Operations using list indexes are not allowed with IF conditions"); + throw new InvalidRequestException("Operations on lists requiring a read (setting by index and deletions by index or value) are not allowed with IF conditions"); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/fd8f5b9f/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java index 99dd9d9..165dbc1 100644 --- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java @@ -157,7 +157,7 @@ public abstract class ModificationStatement implements CQLStatement, MeasurableF throw new InvalidRequestException("Cannot provide custom timestamp for conditional update"); if (requiresRead()) - throw new InvalidRequestException("Operations using list indexes are not allowed with IF conditions"); + throw new InvalidRequestException("Operations on lists requiring a read (setting by index and deletions by index or value) are not allowed with IF conditions"); } if (isCounter())
