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/trunk Commit: 6a603046e6cb981775e38925ff853e864151a4fc Parents: e9b624a d396fd4 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sun Oct 6 13:35:24 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> 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) {
