Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-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 66FE71092F for ; Wed, 9 Sep 2015 09:53:54 +0000 (UTC) Received: (qmail 40322 invoked by uid 500); 9 Sep 2015 09:53:54 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 40293 invoked by uid 99); 9 Sep 2015 09:53:54 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Sep 2015 09:53:54 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 1B3DFAC009D for ; Wed, 9 Sep 2015 09:53:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1701967 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/CHANGES.txt lucene/core/ lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java Date: Wed, 09 Sep 2015 09:53:53 -0000 To: commits@lucene.apache.org From: jpountz@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150909095354.1B3DFAC009D@hades.apache.org> Author: jpountz Date: Wed Sep 9 09:53:53 2015 New Revision: 1701967 URL: http://svn.apache.org/r1701967 Log: LUCENE-6784: IndexSearcher's query caching is enabled by default. Modified: lucene/dev/branches/branch_5x/ (props changed) lucene/dev/branches/branch_5x/lucene/ (props changed) lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed) lucene/dev/branches/branch_5x/lucene/core/ (props changed) lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1701967&r1=1701966&r2=1701967&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original) +++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Wed Sep 9 09:53:53 2015 @@ -131,6 +131,9 @@ Changes in Runtime Behavior removes the collector that threw this exception from the list of sub collectors to collect. (Adrien Grand) +* LUCENE-6784: IndexSearcher's query caching is enabled by default. Run + indexSearcher.setQueryCache(null) to disable. (Adrien Grand) + ======================= Lucene 5.3.0 ======================= New Features Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java?rev=1701967&r1=1701966&r2=1701967&view=diff ============================================================================== --- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java (original) +++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java Wed Sep 9 09:53:53 2015 @@ -126,9 +126,14 @@ public class IndexSearcher { }; - // disabled by default - private static QueryCache DEFAULT_QUERY_CACHE = null; + private static QueryCache DEFAULT_QUERY_CACHE; private static QueryCachingPolicy DEFAULT_CACHING_POLICY = new UsageTrackingQueryCachingPolicy(); + static { + final int maxCachedQueries = 1000; + // min of 32MB or 5% of the heap size + final long maxRamBytesUsed = Math.min(1L << 25, Runtime.getRuntime().maxMemory() / 20); + DEFAULT_QUERY_CACHE = new LRUQueryCache(maxCachedQueries, maxRamBytesUsed); + } final IndexReader reader; // package private for testing!