Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 416EF10F92 for ; Thu, 6 Feb 2014 14:30:09 +0000 (UTC) Received: (qmail 42325 invoked by uid 500); 6 Feb 2014 14:30:08 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 42299 invoked by uid 500); 6 Feb 2014 14:30:08 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 42291 invoked by uid 99); 6 Feb 2014 14:30:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Feb 2014 14:30:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Feb 2014 14:30:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 35B9123889CB; Thu, 6 Feb 2014 14:29:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1565277 - /jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryManagerImpl.java Date: Thu, 06 Feb 2014 14:29:47 -0000 To: oak-commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140206142947.35B9123889CB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Thu Feb 6 14:29:46 2014 New Revision: 1565277 URL: http://svn.apache.org/r1565277 Log: OAK-1338: Implement QueryStat from Jackrabbit API Implement repository statistics: query count and query duration Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryManagerImpl.java Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryManagerImpl.java?rev=1565277&r1=1565276&r2=1565277&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryManagerImpl.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/QueryManagerImpl.java Thu Feb 6 14:29:46 2014 @@ -18,6 +18,9 @@ */ package org.apache.jackrabbit.oak.jcr.query; +import static org.apache.jackrabbit.api.stats.RepositoryStatistics.Type.QUERY_COUNT; +import static org.apache.jackrabbit.api.stats.RepositoryStatistics.Type.QUERY_DURATION; + import java.text.ParseException; import java.util.ArrayList; import java.util.HashMap; @@ -25,6 +28,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.concurrent.atomic.AtomicLong; import javax.jcr.Node; import javax.jcr.RepositoryException; @@ -55,6 +59,8 @@ public class QueryManagerImpl implements private final QueryObjectModelFactoryImpl qomFactory; private final QueryEngine queryEngine; private final HashSet supportedQueryLanguages = new HashSet(); + private final AtomicLong queryCount; + private final AtomicLong queryDuration; public QueryManagerImpl(SessionContext sessionContext) { this.sessionDelegate = sessionContext.getSessionDelegate(); @@ -62,6 +68,8 @@ public class QueryManagerImpl implements qomFactory = new QueryObjectModelFactoryImpl(this, sessionContext); queryEngine = sessionDelegate.getQueryEngine(); supportedQueryLanguages.addAll(queryEngine.getSupportedQueryLanguages()); + queryCount = sessionContext.getCounter(QUERY_COUNT); + queryDuration = sessionContext.getCounter(QUERY_DURATION); } @Override @@ -120,12 +128,15 @@ public class QueryManagerImpl implements long limit, long offset, HashMap bindVariableMap) throws RepositoryException { try { Map bindMap = convertMap(bindVariableMap); - long t = System.nanoTime(); + long t0 = System.nanoTime(); Result r = queryEngine.executeQuery( statement, language, limit, offset, bindMap, sessionContext.getSessionLocalMappings()); + queryCount.incrementAndGet(); + long dt = (System.nanoTime() - t0) / 1000000; + queryDuration.addAndGet(dt); sessionContext.getStatisticManager() - .logQueryEvaluationTime(language, statement, (System.nanoTime() - t) / 1000000); + .logQueryEvaluationTime(language, statement, dt); return new QueryResultImpl(sessionContext, r); } catch (IllegalArgumentException e) { throw new InvalidQueryException(e);