You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/07/20 15:52:39 UTC
[07/10] lucene-solr:jira/solr-12509: SOLR-12553: Check local params
in SignificantTerms Query Parser
SOLR-12553: Check local params in SignificantTerms Query Parser
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f6e9d00b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f6e9d00b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f6e9d00b
Branch: refs/heads/jira/solr-12509
Commit: f6e9d00b90ac624b05586b225b9cda7eb7ea60ae
Parents: 9d3cc1e
Author: Alexandre Rafalovitch <ar...@apache.org>
Authored: Thu Jul 19 22:12:22 2018 -0400
Committer: Alexandre Rafalovitch <ar...@apache.org>
Committed: Thu Jul 19 22:12:22 2018 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../solr/search/SignificantTermsQParserPlugin.java | 14 ++++++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f6e9d00b/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 925f4aa..449f91d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -157,6 +157,8 @@ Bug Fixes
* SOLR-12343: Fixed a bug in JSON Faceting that could cause incorrect counts/stats when using non default
sort options. This also adds a new configurable "overrefine" option. (Yonik Seeley, hossman)
+* SOLR-12553: Allow SignificantTerms Query Parser to use local parameters (Alexandre Rafalovitch)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f6e9d00b/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java
index 93500a0..58335f1 100644
--- a/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/SignificantTermsQParserPlugin.java
@@ -55,12 +55,18 @@ public class SignificantTermsQParserPlugin extends QParserPlugin {
@Override
public Query parse() throws SyntaxError {
String field = getParam("field");
- int numTerms = Integer.parseInt(params.get("numTerms", "20"));
- float minDocs = Float.parseFloat(params.get("minDocFreq", "5"));
- float maxDocs = Float.parseFloat(params.get("maxDocFreq", ".3"));
- int minTermLength = Integer.parseInt(params.get("minTermLength", "4"));
+ int numTerms = Integer.parseInt(getParamWithDefault("numTerms", "20"));
+ float minDocs = Float.parseFloat(getParamWithDefault("minDocFreq", "5"));
+ float maxDocs = Float.parseFloat(getParamWithDefault("maxDocFreq", ".3"));
+ int minTermLength = Integer.parseInt(getParamWithDefault("minTermLength", "4"));
+
return new SignificantTermsQuery(field, numTerms, minDocs, maxDocs, minTermLength);
}
+
+ private String getParamWithDefault(String paramName, String defaultValue) {
+ String result = getParam(paramName);
+ return (result != null)? result: defaultValue;
+ }
}
private static class SignificantTermsQuery extends AnalyticsQuery {