You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2018/11/01 19:08:30 UTC
lucene-solr:branch_7x: SOLR-12882: Eliminate excessive lambda
allocation in json facet FacetFieldProcessorByHashDV.collectValFirstPhase
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 50e10d327 -> 1320db356
SOLR-12882: Eliminate excessive lambda allocation in json facet FacetFieldProcessorByHashDV.collectValFirstPhase
(cherry picked from commit cf445ba54998710466a7c6cb489d3162d20d127a)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1320db35
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1320db35
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1320db35
Branch: refs/heads/branch_7x
Commit: 1320db356833a6e4823e29416c388593b027948b
Parents: 50e10d3
Author: Tim Underwood <ti...@gmail.com>
Authored: Thu Nov 1 15:05:16 2018 -0400
Committer: David Smiley <ds...@apache.org>
Committed: Thu Nov 1 15:08:24 2018 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../search/facet/FacetFieldProcessorByHashDV.java | 16 ++++++++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1320db35/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ee7f3c7..b857a07 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -172,6 +172,8 @@ Improvements
* SOLR-12892: MapWriter to use CharSequence instead of String (noble)
+* SOLR-12882: Eliminate excessive lambda allocation in json facets FacetFieldProcessorByHashDV (Tim Underwood)
+
================== 7.5.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1320db35/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorByHashDV.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorByHashDV.java b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorByHashDV.java
index 441780c..4d79740 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorByHashDV.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorByHashDV.java
@@ -429,12 +429,20 @@ class FacetFieldProcessorByHashDV extends FacetFieldProcessor {
// Our countAcc is virtual, so this is not needed:
// countAcc.incrementCount(slot, 1);
- super.collectFirstPhase(segDoc, slot, slotNum -> {
- Comparable value = calc.bitsToValue(val);
- return new SlotContext(sf.getType().getFieldQuery(null, sf, calc.formatValue(value)));
- });
+ super.collectFirstPhase(segDoc, slot, slotContext);
}
+ /**
+ * SlotContext to use during all {@link SlotAcc} collection.
+ *
+ * This avoids a memory allocation for each invocation of collectValFirstPhase.
+ */
+ private IntFunction<SlotContext> slotContext = (slotNum) -> {
+ long val = table.vals[slotNum];
+ Comparable value = calc.bitsToValue(val);
+ return new SlotContext(sf.getType().getFieldQuery(null, sf, calc.formatValue(value)));
+ };
+
private void doRehash(LongCounts table) {
if (collectAcc == null && allBucketsAcc == null) return;