You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dp...@apache.org on 2017/01/05 00:14:09 UTC
lucene-solr:branch_6x: SOLR-5616: Simplifies grouping code to use
ResponseBuilder.needDocList() to determine if it needs to generate a doc list
for grouped results.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 973a48e3e -> b1ce38530
SOLR-5616: Simplifies grouping code to use ResponseBuilder.needDocList() to determine if it needs to generate a doc list for grouped results.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b1ce3853
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b1ce3853
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b1ce3853
Branch: refs/heads/branch_6x
Commit: b1ce385302d055e53e51f364d88482cf7e24ad6f
Parents: 973a48e
Author: Dennis Gove <dp...@gmail.com>
Authored: Wed Jan 4 19:13:16 2017 -0500
Committer: Dennis Gove <dp...@gmail.com>
Committed: Wed Jan 4 19:13:16 2017 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../java/org/apache/solr/handler/component/DebugComponent.java | 1 +
.../org/apache/solr/handler/component/HighlightComponent.java | 1 +
.../org/apache/solr/handler/component/MoreLikeThisComponent.java | 3 +++
.../java/org/apache/solr/handler/component/QueryComponent.java | 2 +-
5 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b1ce3853/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 29256b6..fa78fb9 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -330,6 +330,9 @@ Other Changes
* SOLR-3990: Moves getIndexSize() from ReplicationHandler to SolrCore (Shawn Heisey)
+* SOLR-5616: Simplifies grouping code to use ResponseBuilder.needDocList() to determine if it needs to
+ generate a doc list for grouped results. (Steven Bower, Keith Laban, Dennis Gove)
+
================== 6.3.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/b1ce3853/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java b/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
index 949d2b8..42d21e0 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java
@@ -82,6 +82,7 @@ public class DebugComponent extends SearchComponent
public void prepare(ResponseBuilder rb) throws IOException
{
if(rb.isDebugTrack() && rb.isDistrib) {
+ rb.setNeedDocList(true);
doDebugTrack(rb);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b1ce3853/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
index 413fcb2..00ed4ef 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
@@ -113,6 +113,7 @@ public class HighlightComponent extends SearchComponent implements PluginInfoIni
SolrParams params = rb.req.getParams();
rb.doHighlights = solrConfigHighlighter.isHighlightingEnabled(params);
if(rb.doHighlights){
+ rb.setNeedDocList(true);
String hlq = params.get(HighlightParams.Q);
String hlparser = Objects.firstNonNull(params.get(HighlightParams.QPARSER),
params.get(QueryParsing.DEFTYPE, QParserPlugin.DEFAULT_QTYPE));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b1ce3853/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java b/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
index 0f8b4ae..7cf6d39 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java
@@ -64,6 +64,9 @@ public class MoreLikeThisComponent extends SearchComponent {
@Override
public void prepare(ResponseBuilder rb) throws IOException {
+ if (rb.req.getParams().getBool(MoreLikeThisParams.MLT, false)) {
+ rb.setNeedDocList(true);
+ }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b1ce3853/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
index a3e226e..80b6048 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
@@ -502,7 +502,7 @@ public class QueryComponent extends SearchComponent
}
}
- if (rb.doHighlights || rb.isDebug() || params.getBool(MoreLikeThisParams.MLT, false)) {
+ if( rb.isNeedDocList() || rb.isDebug() ){
// we need a single list of the returned docs
cmd.setFlags(SolrIndexSearcher.GET_DOCLIST);
}