Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 757BD1165A for ; Fri, 22 Aug 2014 14:16:54 +0000 (UTC) Received: (qmail 28106 invoked by uid 500); 22 Aug 2014 14:16:54 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 28071 invoked by uid 500); 22 Aug 2014 14:16:54 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 28033 invoked by uid 99); 22 Aug 2014 14:16:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Aug 2014 14:16:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 050DF9C8064; Fri, 22 Aug 2014 14:16:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Fri, 22 Aug 2014 14:16:53 -0000 Message-Id: <8cc504e6ed64460ab78d4f5f2ba5dc75@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/4] git commit: Improve error message from 7499 Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 854aab79b -> 94f1107ec 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/cassandra-2.1 Commit: fd8f5b9f7e88bebf180c6142f772ba2808bc8b01 Parents: e4d5eda Author: Sylvain Lebresne Authored: Fri Aug 22 16:02:43 2014 +0200 Committer: Sylvain Lebresne 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())