Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-12964: Use DocValuesIterator.advanceExact() instead of the advance()/docID() pattern

This commit is contained in:
Tim Underwood 2018-11-08 14:34:17 -05:00 committed by David Smiley
parent 1b084db901
commit 243a8a668a
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -293,6 +293,9 @@ Improvements
* LUCENE-8557: Some internal LeafReader.getFieldInfos implementations were being re-computed on-demand instead of * LUCENE-8557: Some internal LeafReader.getFieldInfos implementations were being re-computed on-demand instead of
once up front leading to some slowdowns in places like JSON Facets and field collapsing. (Tim Underwood, David Smiley) once up front leading to some slowdowns in places like JSON Facets and field collapsing. (Tim Underwood, David Smiley)
* SOLR-12964: Json Facets: use DocValuesIterator advanceExact() instead of advance() in FacetFieldProcessorByHashDV and
UniqueSinglevaluedSlotAcc. (Tim Underwood)
================== 7.5.0 ================== ================== 7.5.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

5
solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessorByHashDV.java
View File

@ -361,10 +361,7 @@ class FacetFieldProcessorByHashDV extends FacetFieldProcessor {
@Override @Override
public void collect(int segDoc) throws IOException { public void collect(int segDoc) throws IOException {
if (segDoc > docValues.docID()) { if (docValues.advanceExact(segDoc)) {
docValues.advance(segDoc);
}
if (segDoc == docValues.docID()) {
long val = toGlobal.get(docValues.ordValue()); long val = toGlobal.get(docValues.ordValue());
collectValFirstPhase(segDoc, val); collectValFirstPhase(segDoc, val);
} }

5
solr/core/src/java/org/apache/solr/search/facet/UniqueSinglevaluedSlotAcc.java
View File

@ -75,10 +75,7 @@ class UniqueSinglevaluedSlotAcc extends UniqueSlotAcc {
@Override @Override
public void collect(int doc, int slotNum, IntFunction<SlotContext> slotContext) throws IOException { public void collect(int doc, int slotNum, IntFunction<SlotContext> slotContext) throws IOException {
if (doc > subDv.docID()) { if (subDv.advanceExact(doc)) {
subDv.advance(doc);
}
if (doc == subDv.docID()) {
int segOrd = subDv.ordValue(); int segOrd = subDv.ordValue();
int ord = toGlobal==null ? segOrd : (int)toGlobal.get(segOrd); int ord = toGlobal==null ? segOrd : (int)toGlobal.get(segOrd);