You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2018/05/23 05:42:46 UTC
lucene-solr:master: SOLR-3567: Spellcheck custom parameters not being
passed through due to wrong prefix creation
Repository: lucene-solr
Updated Branches:
refs/heads/master 0a730d4c1 -> 9b1cb6646
SOLR-3567: Spellcheck custom parameters not being passed through due to wrong prefix creation
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9b1cb664
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9b1cb664
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9b1cb664
Branch: refs/heads/master
Commit: 9b1cb6646f5e7ab13df2b95e38b2a862bde87e0c
Parents: 0a730d4
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Wed May 23 11:12:39 2018 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Wed May 23 11:12:39 2018 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../org/apache/solr/handler/component/SpellCheckComponent.java | 6 +++---
.../apache/solr/handler/component/SpellCheckComponentTest.java | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9b1cb664/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index bac5b42..5be0a93 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -230,6 +230,9 @@ Bug Fixes
* SOLR-12377: Don't spin off overseer when Zk controller is closed (Mikhail Khludnev)
+* SOLR-3567: Spellcheck custom parameters not being passed through due to wrong prefix creation.
+ (Josh Lucas via shalin)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9b1cb664/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
index c881aa6..fd5c512 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java
@@ -339,10 +339,10 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
protected SolrParams getCustomParams(String dictionary, SolrParams params) {
ModifiableSolrParams result = new ModifiableSolrParams();
Iterator<String> iter = params.getParameterNamesIterator();
- String prefix = SpellingParams.SPELLCHECK_PREFIX + "." + dictionary + ".";
- while (iter.hasNext()){
+ String prefix = SpellingParams.SPELLCHECK_PREFIX + dictionary + ".";
+ while (iter.hasNext()) {
String nxt = iter.next();
- if (nxt.startsWith(prefix)){
+ if (nxt.startsWith(prefix)) {
result.add(nxt.substring(prefix.length()), params.getParams(nxt));
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9b1cb664/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
index d3b0828..eebb4e4 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java
@@ -160,7 +160,7 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 {
@Test
public void testPerDictionary() throws Exception {
assertJQ(req("json.nl","map", "qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", SpellingParams.SPELLCHECK_BUILD, "true", "q","documemt"
- , SpellingParams.SPELLCHECK_DICT, "perDict", SpellingParams.SPELLCHECK_PREFIX + ".perDict.foo", "bar", SpellingParams.SPELLCHECK_PREFIX + ".perDict.bar", "foo")
+ , SpellingParams.SPELLCHECK_DICT, "perDict", SpellingParams.SPELLCHECK_PREFIX + "perDict.foo", "bar", SpellingParams.SPELLCHECK_PREFIX + "perDict.bar", "foo")
,"/spellcheck/suggestions/bar=={'numFound':1, 'startOffset':0, 'endOffset':1, 'suggestion':['foo']}"
,"/spellcheck/suggestions/foo=={'numFound':1, 'startOffset':2, 'endOffset':3, 'suggestion':['bar']}"
);