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

SOLR-11349: Rename ResponseBuilder's getQueryCommand to createQueryCommand.

This commit is contained in:
Christine Poerschke 2018-02-09 16:47:36 +00:00
parent 5a26381424
commit d39751a754
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -268,6 +268,8 @@ Other Changes
* SOLR-11933: Make DIH UI page safer by not default checking the clean checkbox (Eric Pugh via Tomás Fernández Löbbe)
* SOLR-11349: Rename ResponseBuilder's getQueryCommand to createQueryCommand. (Christine Poerschke)
================== 7.2.1 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

2
solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
View File

@ -337,7 +337,7 @@ public class QueryComponent extends SearchComponent
CursorMarkParams.CURSOR_MARK_PARAM + " and " + CommonParams.TIME_ALLOWED);
}
QueryCommand cmd = rb.getQueryCommand();
QueryCommand cmd = rb.createQueryCommand();
cmd.setTimeAllowed(timeAllowed);
req.getContext().put(SolrIndexSearcher.STATS_SOURCE, statsCache.get(req));

7
solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java
View File

@ -421,11 +421,16 @@ public class ResponseBuilder
}
}
@Deprecated
public QueryCommand getQueryCommand() {
return createQueryCommand();
}
/**
* Creates a SolrIndexSearcher.QueryCommand from this
* ResponseBuilder. TimeAllowed is left unset.
*/
public QueryCommand getQueryCommand() {
public QueryCommand createQueryCommand() {
QueryCommand cmd = new QueryCommand();
cmd.setQuery(wrap(getQuery()))
.setFilterList(getFilters())

2
solr/core/src/java/org/apache/solr/request/SimpleFacets.java
View File

@ -259,7 +259,7 @@ public class SimpleFacets {
// get the new base docset for this facet
DocSet base = searcher.getDocSet(qlist);
if (rb.grouping() && rb.getGroupingSpec().isTruncateGroups()) {
Grouping grouping = new Grouping(searcher, null, rb.getQueryCommand(), false, 0, false);
Grouping grouping = new Grouping(searcher, null, rb.createQueryCommand(), false, 0, false);
grouping.setWithinGroupSort(rb.getGroupingSpec().getSortWithinGroup());
if (rb.getGroupingSpec().getFields().length > 0) {
grouping.addFieldCommand(rb.getGroupingSpec().getFields()[0], req);