Updated Branches: refs/heads/cassandra-1.2 4784e6717 -> d396fd47d refs/heads/cassandra-2.0 e9b624a73 -> 6a603046e refs/heads/trunk d34d84223 -> a2edbede5
fix build Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d396fd47 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d396fd47 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d396fd47 Branch: refs/heads/cassandra-1.2 Commit: d396fd47df2c04d75504208eb1de9d683747f5ee Parents: 4784e67 Author: Jonathan Ellis <jbel...@apache.org> Authored: Sun Oct 6 13:35:11 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sun Oct 6 13:35:11 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/d396fd47/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java b/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java index 7a165f4..a43f83e 100644 --- a/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java +++ b/src/java/org/apache/cassandra/exceptions/PreparedQueryNotFoundException.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.exceptions; -import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.utils.MD5Digest; public class PreparedQueryNotFoundException extends RequestValidationException @@ -34,7 +33,7 @@ public class PreparedQueryNotFoundException extends RequestValidationException { return String.format("Prepared query with ID %s 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 query %s has been evicted from the internal cache)", - id, QueryProcessor.MAX_CACHE_PREPARED, id); + " or you have prepared too many queries and it has been evicted from the internal cache)", + id); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/d396fd47/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java index 65ae177..dbaabbb 100644 --- a/src/java/org/apache/cassandra/thrift/CassandraServer.java +++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java @@ -1827,8 +1827,8 @@ public class CassandraServer implements Cassandra.Iface 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();
