You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/10/21 01:12:25 UTC
[1/2] git commit: Ninja make public QP#processStatement/3
Repository: cassandra
Updated Branches:
refs/heads/trunk 49833b943 -> 0be66837e
Ninja make public QP#processStatement/3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be3b3807
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be3b3807
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be3b3807
Branch: refs/heads/trunk
Commit: be3b3807e0681a405d0be83fd2c076bf3992f8e0
Parents: abde62d
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Oct 21 02:09:37 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Oct 21 02:09:37 2014 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/QueryProcessor.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/be3b3807/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
index 2818358..f0116e5 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -84,7 +84,8 @@ public class QueryProcessor implements QueryHandler
// bother with expiration on those.
private static final ConcurrentMap<String, ParsedStatement.Prepared> internalStatements = new ConcurrentHashMap<>();
- @VisibleForTesting
+ // Direct calls to processStatement do not increment the preparedStatementsExecuted/regularStatementsExecuted
+ // counters. Callers of processStatement are responsible for correctly notifying metrics
public static final CQLMetrics metrics = new CQLMetrics();
private static final AtomicInteger lastMinuteEvictionsCount = new AtomicInteger(0);
@@ -214,9 +215,7 @@ public class QueryProcessor implements QueryHandler
Cell.MAX_NAME_LENGTH));
}
- private static ResultMessage processStatement(CQLStatement statement,
- QueryState queryState,
- QueryOptions options)
+ public ResultMessage processStatement(CQLStatement statement, QueryState queryState, QueryOptions options)
throws RequestExecutionException, RequestValidationException
{
logger.trace("Process {} @CL.{}", statement, options.getConsistency());
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0be66837
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0be66837
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0be66837
Branch: refs/heads/trunk
Commit: 0be66837e154e781677f84801bfdc4d2f54a1cdb
Parents: 49833b9 be3b380
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Oct 21 02:11:18 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Oct 21 02:11:18 2014 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/cql3/QueryProcessor.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0be66837/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------