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 2018/02/09 17:09:25 UTC
[1/2] lucene-solr:master: SOLR-11349: Rename ResponseBuilder's
getQueryCommand to createQueryCommand.
Repository: lucene-solr
Updated Branches:
refs/heads/master 5a2638142 -> b6f683d30
SOLR-11349: Rename ResponseBuilder's getQueryCommand to createQueryCommand.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d39751a7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d39751a7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d39751a7
Branch: refs/heads/master
Commit: d39751a754bfed0fad04bd857e1d9b0f071031b3
Parents: 5a26381
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Feb 9 16:47:36 2018 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Feb 9 16:50:28 2018 +0000
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../org/apache/solr/handler/component/QueryComponent.java | 2 +-
.../org/apache/solr/handler/component/ResponseBuilder.java | 7 ++++++-
solr/core/src/java/org/apache/solr/request/SimpleFacets.java | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d39751a7/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7e03200..3212a6f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -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.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d39751a7/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 71ac9c0..2385533 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
@@ -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));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d39751a7/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java b/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java
index 8e9477b..22d0465 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java
@@ -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())
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d39751a7/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
index cc5559d..0b5a082 100644
--- a/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
+++ b/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
@@ -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);
[2/2] lucene-solr:master: SOLR-11349: Remove deprecated
ResponseBuilder.getQueryCommand() method.
Posted by cp...@apache.org.
SOLR-11349: Remove deprecated ResponseBuilder.getQueryCommand() method.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b6f683d3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b6f683d3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b6f683d3
Branch: refs/heads/master
Commit: b6f683d30ba18276ca1d8547e1250dbdc29b8157
Parents: d39751a
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Feb 9 16:50:04 2018 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Feb 9 16:50:34 2018 +0000
----------------------------------------------------------------------
.../java/org/apache/solr/handler/component/ResponseBuilder.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b6f683d3/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java b/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java
index 22d0465..df0623e 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java
@@ -421,11 +421,6 @@ public class ResponseBuilder
}
}
- @Deprecated
- public QueryCommand getQueryCommand() {
- return createQueryCommand();
- }
-
/**
* Creates a SolrIndexSearcher.QueryCommand from this
* ResponseBuilder. TimeAllowed is left unset.