From commits-return-13447-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Mon Jun 18 14:17:02 2012 Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-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 940BF92ED for ; Mon, 18 Jun 2012 14:17:02 +0000 (UTC) Received: (qmail 47921 invoked by uid 500); 18 Jun 2012 14:17:02 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 47893 invoked by uid 500); 18 Jun 2012 14:17:02 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 47886 invoked by uid 99); 18 Jun 2012 14:17:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Jun 2012 14:17:02 +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; Mon, 18 Jun 2012 14:17:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 49CA02388C36; Mon, 18 Jun 2012 14:16:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1351356 - /jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/stats/QueryStatCoreTest.java Date: Mon, 18 Jun 2012 14:16:39 -0000 To: commits@jackrabbit.apache.org From: alexparvulescu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120618141639.49CA02388C36@eris.apache.org> Author: alexparvulescu Date: Mon Jun 18 14:16:38 2012 New Revision: 1351356 URL: http://svn.apache.org/viewvc?rev=1351356&view=rev Log: JCR-3346 JMX Popular Queries size issue Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/stats/QueryStatCoreTest.java Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/stats/QueryStatCoreTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/stats/QueryStatCoreTest.java?rev=1351356&r1=1351355&r2=1351356&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/stats/QueryStatCoreTest.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/stats/QueryStatCoreTest.java Mon Jun 18 14:16:38 2012 @@ -18,10 +18,8 @@ package org.apache.jackrabbit.core.stats import static javax.jcr.query.Query.JCR_SQL2; -import javax.jcr.query.QueryManager; +import java.util.concurrent.atomic.AtomicLong; -import org.apache.jackrabbit.core.JackrabbitRepositoryStub; -import org.apache.jackrabbit.core.RepositoryContext; import org.apache.jackrabbit.test.AbstractJCRTest; /** @@ -30,27 +28,23 @@ import org.apache.jackrabbit.test.Abstra public class QueryStatCoreTest extends AbstractJCRTest { private QueryStatCore queryStat; - private QueryManager qm; + + private AtomicLong token = new AtomicLong(System.currentTimeMillis()); protected void setUp() throws Exception { super.setUp(); - RepositoryContext context = JackrabbitRepositoryStub - .getRepositoryContext(superuser.getRepository()); - queryStat = context.getStatManager().getQueryStat(); + queryStat = new QueryStatImpl(); queryStat.setEnabled(true); - - qm = superuser.getWorkspace().getQueryManager(); } protected void tearDown() throws Exception { - qm = null; super.tearDown(); } private void runRandomQuery() throws Exception { String sql = "SELECT * FROM [nt:unstructured] as t where CONTAINS(t, '" - + System.currentTimeMillis() + "') "; - qm.createQuery(sql, JCR_SQL2).execute(); + + token.getAndIncrement() + "') "; + queryStat.logQuery(JCR_SQL2, sql, 5); } public void testPopularQuery() throws Exception {