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 2016/10/17 22:18:37 UTC
lucene-solr:branch_6x: SOLR-9627: Add QParser.getSortSpec,
deprecate misleadingly named QParser.getSort (Judith Silverman,
Christine Poerschke)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 06ae3eb2e -> 30c9f4311
SOLR-9627: Add QParser.getSortSpec, deprecate misleadingly named QParser.getSort (Judith Silverman, 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/30c9f431
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/30c9f431
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/30c9f431
Branch: refs/heads/branch_6x
Commit: 30c9f4311a950d9387e5032b164a6a84ca1816c6
Parents: 06ae3eb
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Oct 17 17:13:32 2016 -0400
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Oct 17 18:04:40 2016 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../java/org/apache/solr/handler/MoreLikeThisHandler.java | 2 +-
.../org/apache/solr/handler/component/QueryComponent.java | 2 +-
.../java/org/apache/solr/search/LuceneQParserPlugin.java | 8 +++++++-
solr/core/src/java/org/apache/solr/search/QParser.java | 10 ++++++++++
5 files changed, 21 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/30c9f431/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 06f8c56..7a0057f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -248,6 +248,8 @@ Other Changes
* SOLR-9642: Refactor the core level snapshot cleanup mechanism to rely on Lucene (Hrishikesh Gadre via yonik)
+* SOLR-9627: Add QParser.getSortSpec, deprecate misleadingly named QParser.getSort (Judith Silverman, Christine Poerschke)
+
================== 6.2.1 ==================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/30c9f431/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
index 0132ce2..88b88c5 100644
--- a/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
@@ -117,7 +117,7 @@ public class MoreLikeThisHandler extends RequestHandlerBase
if (q != null) {
QParser parser = QParser.getParser(q, defType, req);
query = parser.getQuery();
- sortSpec = parser.getSort(true);
+ sortSpec = parser.getSortSpec(true);
}
String[] fqs = req.getParams().getParams(CommonParams.FQ);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/30c9f431/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 7d8c873..d8c8a74 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
@@ -185,7 +185,7 @@ public class QueryComponent extends SearchComponent
}
}
- rb.setSortSpec( parser.getSort(true) );
+ rb.setSortSpec( parser.getSortSpec(true) );
rb.setQparser(parser);
final String cursorStr = rb.req.getParams().get(CursorMarkParams.CURSOR_MARK_PARAM);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/30c9f431/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java
index 2aba02d..07b35ad 100644
--- a/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/LuceneQParserPlugin.java
@@ -77,8 +77,14 @@ class OldLuceneQParser extends LuceneQParser {
}
@Override
+ @Deprecated
public SortSpec getSort(boolean useGlobal) throws SyntaxError {
- SortSpec sort = super.getSort(useGlobal);
+ return getSortSpec(useGlobal);
+ }
+
+ @Override
+ public SortSpec getSortSpec(boolean useGlobal) throws SyntaxError {
+ SortSpec sort = super.getSortSpec(useGlobal);
if (sortStr != null && sortStr.length()>0 && sort.getSort()==null) {
SortSpec oldSort = SortSpecParsing.parseSortSpec(sortStr, getReq());
if( oldSort.getSort() != null ) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/30c9f431/solr/core/src/java/org/apache/solr/search/QParser.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/QParser.java b/solr/core/src/java/org/apache/solr/search/QParser.java
index 898fdf1..40605be 100644
--- a/solr/core/src/java/org/apache/solr/search/QParser.java
+++ b/solr/core/src/java/org/apache/solr/search/QParser.java
@@ -209,8 +209,18 @@ public abstract class QParser {
/**
* @param useGlobalParams look up sort, start, rows in global params if not in local params
* @return the sort specification
+ * @deprecated Use the not misleadingly named getSortSpec() function instead.
*/
+ @Deprecated
public SortSpec getSort(boolean useGlobalParams) throws SyntaxError {
+ return getSortSpec(useGlobalParams);
+ }
+
+ /**
+ * @param useGlobalParams look up sort, start, rows in global params if not in local params
+ * @return the sort specification
+ */
+ public SortSpec getSortSpec(boolean useGlobalParams) throws SyntaxError {
getQuery(); // ensure query is parsed first
String sortStr = null;