Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@lucene.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: dsmiley@apache.org
To: commits@lucene.apache.org
Message-Id: <48f139aa4fac47d0984322dfc41f5ae9@git.apache.org>
Subject: lucene-solr:master: SOLR-9350: JSON Facet and method=stream: cacheDf
 threshold now gates use of the filter cache
Date: Mon,  8 Aug 2016 14:36:52 +0000 (UTC)
archived-at: Mon, 08 Aug 2016 14:36:54 -0000

Repository: lucene-solr
Updated Branches:
  refs/heads/master 153c27004 -> b63bb5167


SOLR-9350: JSON Facet and method=stream: cacheDf threshold now gates use of the filter cache


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b63bb516
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b63bb516
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b63bb516

Branch: refs/heads/master
Commit: b63bb5167abad6da30e09fa405f8b99e11a8ff21
Parents: 153c270
Author: David Smiley <dsmiley@apache.org>
Authored: Mon Aug 8 10:36:39 2016 -0400
Committer: David Smiley <dsmiley@apache.org>
Committed: Mon Aug 8 10:36:39 2016 -0400

----------------------------------------------------------------------
 solr/CHANGES.txt                                          |  4 ++++
 .../src/java/org/apache/solr/search/facet/FacetField.java | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b63bb516/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3d597b7..baae0e2 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -205,6 +205,10 @@ Optimizations
 * SOLR-9335: Solr cache/search/update stats counters now use LongAdder which are supposed to have higher throughput
   under high contention. (Varun Thacker)
 
+* SOLR-9350: JSON Facets: method="stream" will no longer always uses & populates the filter cache, likely
+  flushing it.  'cacheDf' can be configured to set a doc frequency threshold, now defaulting to 1/16th doc count.
+  Using -1 Disables use of the cache. (David Smiley, yonik)
+
 Other Changes
 ----------------------
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b63bb516/solr/core/src/java/org/apache/solr/search/facet/FacetField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetField.java b/solr/core/src/java/org/apache/solr/search/facet/FacetField.java
index 0e7e82a..a5ec1db 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetField.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetField.java
@@ -839,9 +839,13 @@ class FacetFieldProcessorStream extends FacetFieldProcessor implements Closeable
     createAccs(-1, 1);
 
     // Minimum term docFreq in order to use the filterCache for that term.
-    int defaultMinDf = Math.max(fcontext.searcher.maxDoc() >> 4, 3);  // (minimum of 3 is for test coverage purposes)
-    int minDfFilterCache = freq.cacheDf == 0 ? defaultMinDf : freq.cacheDf;
-    if (minDfFilterCache == -1) minDfFilterCache = Integer.MAX_VALUE;  // -1 means never cache
+    if (freq.cacheDf == -1) { // -1 means never cache
+      minDfFilterCache = Integer.MAX_VALUE;
+    } else if (freq.cacheDf == 0) { // default; compute as fraction of maxDoc
+      minDfFilterCache = Math.max(fcontext.searcher.maxDoc() >> 4, 3);  // (minimum of 3 is for test coverage purposes)
+    } else {
+      minDfFilterCache = freq.cacheDf;
+    }
 
     docs = fcontext.base;
     fastForRandomSet = null;