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

SOLR-7614: make pivotRefinementCounter specific to each top level request 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1683203 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2015-06-03 00:29:56 +00:00
parent dad3395af3
commit 1bf8cf7a7e
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solr/CHANGES.txt
View File

@ -389,6 +389,10 @@ Bug Fixes
* SOLR-7610: Fix VelocityResponseWriter's $resource.locale to accurately report locale in use.
(ehatcher)
* SOLR-7614: Distributed pivot facet refinement was broken due to a single correlation counter
used across multiple requests as if it was private to each request. (yonik)
Optimizations
----------------------

24
solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
View File

@ -65,12 +65,7 @@ public class FacetComponent extends SearchComponent {
private static final String PIVOT_KEY = "facet_pivot";
private static final String PIVOT_REFINE_PREFIX = "{!"+PivotFacet.REFINE_PARAM+"=";
/**
* Incremented counter used to track the values being refined in a given request.
* This counter is used in conjunction with {@link PivotFacet#REFINE_PARAM} to identify
* which refinement values are associated with which pivots.
*/
int pivotRefinementCounter = 0;
@Override
public void prepare(ResponseBuilder rb) throws IOException {
@ -271,14 +266,14 @@ public class FacetComponent extends SearchComponent {
if ( ! queuedRefinementsForShard.isEmpty() ) {
String fieldsKey = PivotFacet.REFINE_PARAM + pivotRefinementCounter;
String fieldsKey = PivotFacet.REFINE_PARAM + fi.pivotRefinementCounter;
String command;
if (pivotFacet.localParams != null) {
command = PIVOT_REFINE_PREFIX + pivotRefinementCounter + " "
command = PIVOT_REFINE_PREFIX + fi.pivotRefinementCounter + " "
+ pivotFacet.facetStr.substring(2);
} else {
command = PIVOT_REFINE_PREFIX + pivotRefinementCounter + "}"
command = PIVOT_REFINE_PREFIX + fi.pivotRefinementCounter + "}"
+ pivotFacet.getKey();
}
@ -290,7 +285,7 @@ public class FacetComponent extends SearchComponent {
}
}
pivotRefinementCounter++;
fi.pivotRefinementCounter++;
}
rb.addRequest(this, shardsRefineRequestPivot);
@ -981,13 +976,12 @@ public class FacetComponent extends SearchComponent {
@Override
public void finishStage(ResponseBuilder rb) {
pivotRefinementCounter = 0;
if (!rb.doFacets || rb.stage != ResponseBuilder.STAGE_GET_FIELDS) return;
// wait until STAGE_GET_FIELDS
// so that "result" is already stored in the response (for aesthetics)
FacetInfo fi = rb._facetInfo;
NamedList<Object> facet_counts = new SimpleOrderedMap<>();
NamedList<Number> facet_queries = new SimpleOrderedMap<>();
@ -1111,6 +1105,12 @@ public class FacetComponent extends SearchComponent {
* <b>This API is experimental and subject to change</b>
*/
public static class FacetInfo {
/**
* Incremented counter used to track the values being refined in a given request.
* This counter is used in conjunction with {@link PivotFacet#REFINE_PARAM} to identify
* which refinement values are associated with which pivots.
*/
int pivotRefinementCounter = 0;
public LinkedHashMap<String,QueryFacet> queryFacets;
public LinkedHashMap<String,DistribFieldFacet> facets;