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 8CE6710B8F for ; Sun, 6 Oct 2013 18:35:46 +0000 (UTC) Received: (qmail 49123 invoked by uid 500); 6 Oct 2013 18:35:38 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 49052 invoked by uid 500); 6 Oct 2013 18:35:37 -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 49004 invoked by uid 99); 6 Oct 2013 18:35:36 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 06 Oct 2013 18:35:36 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DBDE5910D48; Sun, 6 Oct 2013 18:35:35 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Sun, 06 Oct 2013 18:35:39 -0000 Message-Id: <437d76d085c94683adbddb84d8fa111d@git.apache.org> In-Reply-To: <4ce004fcf3834097a510a3fa456701a5@git.apache.org> References: <4ce004fcf3834097a510a3fa456701a5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0 Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a603046 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a603046 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a603046 Branch: refs/heads/cassandra-2.0 Commit: 6a603046e6cb981775e38925ff853e864151a4fc Parents: e9b624a d396fd4 Author: Jonathan Ellis Authored: Sun Oct 6 13:35:24 2013 -0500 Committer: Jonathan Ellis Committed: Sun Oct 6 13:35:24 2013 -0500 ---------------------------------------------------------------------- .../cassandra/exceptions/PreparedQueryNotFoundException.java | 5 ++--- src/java/org/apache/cassandra/thrift/CassandraServer.java | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a603046/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/thrift/CassandraServer.java index 12176b7,dbaabbb..8a1bdb5 --- a/src/java/org/apache/cassandra/thrift/CassandraServer.java +++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java @@@ -2054,13 -1827,11 +2054,13 @@@ public class CassandraServer implement if (statement == null) throw new InvalidRequestException(String.format("Prepared query with ID %d not found" + " (either the query was not prepared on this host (maybe the host has been restarted?)" + - " or you have prepared more than %d queries and queries %d has been evicted from the internal cache)", - itemId, org.apache.cassandra.cql3.QueryProcessor.MAX_CACHE_PREPARED, itemId)); + " or you have prepared too many queries and it has been evicted from the internal cache)", + itemId)); logger.trace("Retrieved prepared statement #{} with {} bind markers", itemId, statement.getBoundsTerms()); - return org.apache.cassandra.cql3.QueryProcessor.processPrepared(statement, ThriftConversion.fromThrift(cLevel), cState.getQueryState(), bindVariables).toThriftResult(); + return org.apache.cassandra.cql3.QueryProcessor.processPrepared(statement, + cState.getQueryState(), + new QueryOptions(ThriftConversion.fromThrift(cLevel), bindVariables)).toThriftResult(); } catch (RequestExecutionException e) {