You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/02/06 15:57:21 UTC
lucene-solr:branch_6x: SOLR-9800: Factor out
FacetComponent.newSimpleFacets method. (Jonny Marks via Christine Poerschke)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x d3a2ed848 -> be87c9b89
SOLR-9800: Factor out FacetComponent.newSimpleFacets method. (Jonny Marks via Christine Poerschke)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/be87c9b8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/be87c9b8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/be87c9b8
Branch: refs/heads/branch_6x
Commit: be87c9b892c016e58ad981fd900e1a5024a70967
Parents: d3a2ed8
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Feb 6 15:49:38 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Feb 6 16:40:24 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../org/apache/solr/handler/component/FacetComponent.java | 8 +++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/be87c9b8/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0b40947..57cc5ba 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -100,6 +100,8 @@ Other Changes
SolrSuggester.build() now throws SolrCoreState.CoreIsClosedException when interrupted
by a core reload/shutdown. (Steve Rowe)
+* SOLR-9800: Factor out FacetComponent.newSimpleFacets method. (Jonny Marks via Christine Poerschke)
+
================== 6.4.1 ==================
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/be87c9b8/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
index 1cc05ab..4497e26 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
@@ -48,6 +48,7 @@ import org.apache.solr.request.SimpleFacets;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.FieldType;
import org.apache.solr.search.QueryParsing;
+import org.apache.solr.search.DocSet;
import org.apache.solr.search.SyntaxError;
import org.apache.solr.search.facet.FacetDebugInfo;
import org.apache.solr.util.RTimer;
@@ -101,6 +102,11 @@ public class FacetComponent extends SearchComponent {
}
}
+ /* Custom facet components can return a custom SimpleFacets object */
+ protected SimpleFacets newSimpleFacets(SolrQueryRequest req, DocSet docSet, SolrParams params, ResponseBuilder rb) {
+ return new SimpleFacets(req, docSet, params, rb);
+ }
+
/**
* Encapsulates facet ranges and facet queries such that their parameters
* are parsed and cached for efficient re-use.
@@ -251,7 +257,7 @@ public class FacetComponent extends SearchComponent {
if (rb.doFacets) {
SolrParams params = rb.req.getParams();
- SimpleFacets f = new SimpleFacets(rb.req, rb.getResults().docSet, params, rb);
+ SimpleFacets f = newSimpleFacets(rb.req, rb.getResults().docSet, params, rb);
RTimer timer = null;
FacetDebugInfo fdebug = null;