lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctarg...@apache.org
Subject [lucene-solr] 11/38: SOLR-15057: avoid unnecessary object retention in FacetRangeProcessor (#2160)
Date Fri, 15 Jan 2021 21:45:22 GMT
This is an automated email from the ASF dual-hosted git repository.

ctargett pushed a commit to branch jira/solr-13105-toMerge
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 2b39ea3a7c850f0309c54a2b1c8b054e0917f0bc
Author: Christine Poerschke <cpoerschke@apache.org>
AuthorDate: Thu Jan 7 18:45:46 2021 +0000

    SOLR-15057: avoid unnecessary object retention in FacetRangeProcessor (#2160)
---
 solr/CHANGES.txt                                   |  2 ++
 .../solr/search/facet/FacetRangeProcessor.java     | 41 +++++++++++++---------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a8555a2..f9d5293 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -327,6 +327,8 @@ Other Changes
 
 * SOLR-14951: Upgrade Angular JS 1.7.9 to 1.8.0 (Kevin Risden)
 
+* SOLR-15057: Avoid unnecessary object retention in FacetRangeProcessor. (Christine Poerschke)
+
 ==================  8.7.0 ==================
 
 Consult the lucene/CHANGES.txt file for additional, low level, changes in this release.
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetRangeProcessor.java b/solr/core/src/java/org/apache/solr/search/facet/FacetRangeProcessor.java
index dd7fc77..844b2f3 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetRangeProcessor.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetRangeProcessor.java
@@ -484,19 +484,26 @@ class FacetRangeProcessor extends FacetProcessor<FacetRange> {
   @SuppressWarnings({"unchecked", "rawtypes"})
   private  SimpleOrderedMap getRangeCountsIndexed() throws IOException {
 
+    final boolean hasSubFacets = !freq.getSubFacets().isEmpty();
+
     int slotCount = rangeList.size() + otherList.size();
-    intersections = new DocSet[slotCount];
-    filters = new Query[slotCount];
+    if (hasSubFacets) {
+      intersections = new DocSet[slotCount];
+      filters = new Query[slotCount];
+    } else {
+      intersections = null;
+      filters = null;
+    }
 
 
     createAccs(fcontext.base.size(), slotCount);
 
     for (int idx = 0; idx<rangeList.size(); idx++) {
-      rangeStats(rangeList.get(idx), idx);
+      rangeStats(rangeList.get(idx), idx, hasSubFacets);
     }
 
     for (int idx = 0; idx<otherList.size(); idx++) {
-      rangeStats(otherList.get(idx), rangeList.size() + idx);
+      rangeStats(otherList.get(idx), rangeList.size() + idx, hasSubFacets);
     }
 
 
@@ -511,7 +518,7 @@ class FacetRangeProcessor extends FacetProcessor<FacetRange> {
       buckets.add(bucket);
       bucket.add("val", range.label);
       addStats(bucket, idx);
-      doSubs(bucket, idx);
+      if (hasSubFacets) doSubs(bucket, idx);
     }
 
     for (int idx = 0; idx<otherList.size(); idx++) {
@@ -520,7 +527,7 @@ class FacetRangeProcessor extends FacetProcessor<FacetRange> {
       SimpleOrderedMap bucket = new SimpleOrderedMap();
       res.add(range.label.toString(), bucket);
       addStats(bucket, rangeList.size() + idx);
-      doSubs(bucket, rangeList.size() + idx);
+      if (hasSubFacets) doSubs(bucket, rangeList.size() + idx);
     }
 
     if (null != actual_end) {
@@ -532,7 +539,7 @@ class FacetRangeProcessor extends FacetProcessor<FacetRange> {
 
   private Query[] filters;
   private DocSet[] intersections;
-  private void rangeStats(Range range, int slot) throws IOException {
+  private void rangeStats(Range range, int slot, boolean hasSubFacets) throws IOException
{
     final Query rangeQ;
     {
       final Query rangeQuery = sf.getType().getRangeQuery(null, sf, range.low == null ? null
: calc.formatValue(range.low), range.high==null ? null : calc.formatValue(range.high), range.includeLower,
range.includeUpper);
@@ -549,8 +556,10 @@ class FacetRangeProcessor extends FacetProcessor<FacetRange> {
     }
     // TODO: specialize count only
     DocSet intersection = fcontext.searcher.getDocSet(rangeQ, fcontext.base);
-    filters[slot] = rangeQ;
-    intersections[slot] = intersection;  // save for later  // TODO: only save if number
of slots is small enough?
+    if (hasSubFacets) {
+      filters[slot] = rangeQ;
+      intersections[slot] = intersection;  // save for later  // TODO: only save if number
of slots is small enough?
+    }
     long num = collect(intersection, slot, slotNum -> { return new SlotAcc.SlotContext(rangeQ);
});
     countAcc.incrementCount(slot, num); // TODO: roll this into collect()
   }
@@ -558,14 +567,12 @@ class FacetRangeProcessor extends FacetProcessor<FacetRange> {
   @SuppressWarnings({"unchecked", "rawtypes"})
   private void doSubs(SimpleOrderedMap bucket, int slot) throws IOException {
     // handle sub-facets for this bucket
-    if (freq.getSubFacets().size() > 0) {
-      DocSet subBase = intersections[slot];
-      try {
-        processSubs(bucket, filters[slot], subBase, false, null);
-      } finally {
-        // subContext.base.decref();  // OFF-HEAP
-        // subContext.base = null;  // do not modify context after creation... there may
be deferred execution (i.e. streaming)
-      }
+    DocSet subBase = intersections[slot];
+    try {
+      processSubs(bucket, filters[slot], subBase, false, null);
+    } finally {
+      // subContext.base.decref();  // OFF-HEAP
+      // subContext.base = null;  // do not modify context after creation... there may be
deferred execution (i.e. streaming)
     }
   }
 


Mime
View raw message