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 9C47E106E7 for ; Tue, 23 Jul 2013 21:50:52 +0000 (UTC) Received: (qmail 70628 invoked by uid 500); 23 Jul 2013 21:50:52 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 70605 invoked by uid 500); 23 Jul 2013 21:50:52 -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 70597 invoked by uid 99); 23 Jul 2013 21:50:52 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Jul 2013 21:50:52 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 42E698B2A08; Tue, 23 Jul 2013 21:50:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Message-Id: <86736db5aab74e1b8440cf47bd9dd590@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: Fix exception text in SelectStatement Date: Tue, 23 Jul 2013 21:50:52 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.2 66bd60590 -> 25a46eae5 Fix exception text in SelectStatement Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25a46eae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25a46eae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25a46eae Branch: refs/heads/cassandra-1.2 Commit: 25a46eae5d1f6b48a490a4e77eb4df7c81a436d9 Parents: 66bd605 Author: Aleksey Yeschenko Authored: Wed Jul 24 00:49:52 2013 +0300 Committer: Aleksey Yeschenko Committed: Wed Jul 24 00:49:52 2013 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cql3/statements/SelectStatement.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/25a46eae/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 2a2b33a..8343d1e 100644 --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@ -1157,7 +1157,7 @@ public class SelectStatement implements CQLStatement // We don't support IN for indexed values (basically this would require supporting a form of OR) if (restriction.eqValues.size() > 1) - throw new InvalidRequestException("Cannot use IN operator on column not part of the PRIMARY KEY"); + throw new InvalidRequestException("Cannot use IN operator on column not part of the partition key"); if (indexedNames.contains(entry.getKey().name.key)) {