mirror of https://github.com/apache/lucene.git
SOLR-9972: SpellCheckComponent collations and suggestions returned as a JSON object rather than a list
(Christine Poerschke in response to bug report from Ricky Oktavianus Lazuardy)
This commit is contained in:
Christine Poerschke
parent
cd1be78e2c
commit
4cd3d15da8
|
|
@ -69,6 +69,9 @@ Other Changes
|
|||
----------------------
|
||||
* SOLR-9980: Expose configVersion in core admin status (Jessica Cheng Mallet via Tomás Fernández Löbbe)
|
||||
|
||||
* SOLR-9972: SpellCheckComponent collations and suggestions returned as a JSON object rather than a list
|
||||
(Christine Poerschke in response to bug report from Ricky Oktavianus Lazuardy)
|
||||
|
||||
================== 6.4.1 ==================
|
||||
|
||||
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
|
||||
|
|
|
|||
|
|
@ -199,8 +199,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
|
|||
boolean isCorrectlySpelled = hits > (maxResultsForSuggest==null ? 0 : maxResultsForSuggest);
|
||||
|
||||
NamedList response = new SimpleOrderedMap();
|
||||
NamedList suggestions = toNamedList(shardRequest, spellingResult, q, extendedResults);
|
||||
response.add("suggestions", suggestions);
|
||||
response.add("suggestions", toNamedList(shardRequest, spellingResult, q, extendedResults));
|
||||
|
||||
if (extendedResults) {
|
||||
response.add("correctlySpelled", isCorrectlySpelled);
|
||||
|
|
@ -300,7 +299,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
|
|||
//even in cases when the internal rank is the same.
|
||||
Collections.sort(collations);
|
||||
|
||||
NamedList collationList = new NamedList();
|
||||
NamedList collationList = new SimpleOrderedMap();
|
||||
for (SpellCheckCollation collation : collations) {
|
||||
if (collationExtendedResults) {
|
||||
NamedList extendedResult = new SimpleOrderedMap();
|
||||
|
|
@ -424,8 +423,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
|
|||
|
||||
NamedList response = new SimpleOrderedMap();
|
||||
|
||||
NamedList suggestions = toNamedList(false, result, origQuery, extendedResults);
|
||||
response.add("suggestions", suggestions);
|
||||
response.add("suggestions", toNamedList(false, result, origQuery, extendedResults));
|
||||
|
||||
if (extendedResults) {
|
||||
response.add("correctlySpelled", isCorrectlySpelled);
|
||||
|
|
@ -436,7 +434,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
|
|||
.toArray(new SpellCheckCollation[mergeData.collations.size()]);
|
||||
Arrays.sort(sortedCollations);
|
||||
|
||||
NamedList collations = new NamedList();
|
||||
NamedList collations = new SimpleOrderedMap();
|
||||
int i = 0;
|
||||
while (i < maxCollations && i < sortedCollations.length) {
|
||||
SpellCheckCollation collation = sortedCollations[i];
|
||||
|
|
@ -636,7 +634,7 @@ public class SpellCheckComponent extends SearchComponent implements SolrCoreAwar
|
|||
|
||||
protected NamedList toNamedList(boolean shardRequest,
|
||||
SpellingResult spellingResult, String origQuery, boolean extendedResults) {
|
||||
NamedList result = new NamedList();
|
||||
NamedList result = new SimpleOrderedMap();
|
||||
Map<Token,LinkedHashMap<String,Integer>> suggestions = spellingResult
|
||||
.getSuggestions();
|
||||
boolean hasFreqInfo = spellingResult.hasTokenFrequencyInfo();
|
||||
|
|
|
|||
|
|
@ -82,77 +82,62 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 {
|
|||
public void testMaximumResultsForSuggest() throws Exception {
|
||||
assertJQ(req("qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", SpellingParams.SPELLCHECK_BUILD, "true", "q","lowerfilt:(this OR brwn)",
|
||||
SpellingParams.SPELLCHECK_COUNT,"5", SpellingParams.SPELLCHECK_EXTENDED_RESULTS,"false", SpellingParams.SPELLCHECK_MAX_RESULTS_FOR_SUGGEST, "7")
|
||||
,"/spellcheck/suggestions/[0]=='brwn'"
|
||||
,"/spellcheck/suggestions/[1]/numFound==1"
|
||||
,"/spellcheck/suggestions/brwn/numFound==1"
|
||||
);
|
||||
try {
|
||||
assertJQ(req("qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", SpellingParams.SPELLCHECK_BUILD, "true", "q","lowerfilt:(this OR brwn)",
|
||||
SpellingParams.SPELLCHECK_COUNT,"5", SpellingParams.SPELLCHECK_EXTENDED_RESULTS,"false", SpellingParams.SPELLCHECK_MAX_RESULTS_FOR_SUGGEST, "6")
|
||||
,"/spellcheck/suggestions/[1]/numFound==1"
|
||||
);
|
||||
fail("there should have been no suggestions (6<7)");
|
||||
} catch(Exception e) {
|
||||
//correctly threw exception
|
||||
}
|
||||
|
||||
assertJQ(req("qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", SpellingParams.SPELLCHECK_BUILD, "true", "q","lowerfilt:(this OR brwn)",
|
||||
SpellingParams.SPELLCHECK_COUNT,"5", SpellingParams.SPELLCHECK_EXTENDED_RESULTS,"false", SpellingParams.SPELLCHECK_MAX_RESULTS_FOR_SUGGEST, "6")
|
||||
,"/spellcheck/suggestions=={}");
|
||||
// there should have been no suggestions (6<7)
|
||||
|
||||
assertJQ(req("qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", SpellingParams.SPELLCHECK_BUILD, "true", "q","lowerfilt:(this OR brwn)",
|
||||
"fq", "id:[0 TO 9]", /*returns 10, less selective */ "fq", "lowerfilt:th*", /* returns 8, most selective */
|
||||
SpellingParams.SPELLCHECK_COUNT,"5", SpellingParams.SPELLCHECK_EXTENDED_RESULTS,"false", SpellingParams.SPELLCHECK_MAX_RESULTS_FOR_SUGGEST, ".90")
|
||||
,"/spellcheck/suggestions/[0]=='brwn'"
|
||||
,"/spellcheck/suggestions/[1]/numFound==1"
|
||||
,"/spellcheck/suggestions/brwn/numFound==1"
|
||||
);
|
||||
try {
|
||||
assertJQ(req("qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", SpellingParams.SPELLCHECK_BUILD, "true", "q","lowerfilt:(this OR brwn)",
|
||||
"fq", "id:[0 TO 9]", /*returns 10, less selective */ "fq", "lowerfilt:th*", /* returns 8, most selective */
|
||||
SpellingParams.SPELLCHECK_COUNT,"5", SpellingParams.SPELLCHECK_EXTENDED_RESULTS,"false", SpellingParams.SPELLCHECK_MAX_RESULTS_FOR_SUGGEST, ".80")
|
||||
,"/spellcheck/suggestions/[1]/numFound==1"
|
||||
);
|
||||
fail("there should have been no suggestions ((.8 * 8)<7)");
|
||||
} catch(Exception e) {
|
||||
//correctly threw exception
|
||||
}
|
||||
|
||||
assertJQ(req("qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", SpellingParams.SPELLCHECK_BUILD, "true", "q","lowerfilt:(this OR brwn)",
|
||||
"fq", "id:[0 TO 9]", /*returns 10, less selective */ "fq", "lowerfilt:th*", /* returns 8, most selective */
|
||||
SpellingParams.SPELLCHECK_COUNT,"5", SpellingParams.SPELLCHECK_EXTENDED_RESULTS,"false", SpellingParams.SPELLCHECK_MAX_RESULTS_FOR_SUGGEST, ".80")
|
||||
,"/spellcheck/suggestions=={}");
|
||||
// there should have been no suggestions ((.8 * 8)<7)
|
||||
|
||||
|
||||
assertJQ(req("qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", SpellingParams.SPELLCHECK_BUILD, "true", "q","lowerfilt:(this OR brwn)",
|
||||
"fq", "id:[0 TO 9]", SpellingParams.SPELLCHECK_MAX_RESULTS_FOR_SUGGEST_FQ, "id:[0 TO 9]",
|
||||
SpellingParams.SPELLCHECK_COUNT,"5", SpellingParams.SPELLCHECK_EXTENDED_RESULTS,"false", SpellingParams.SPELLCHECK_MAX_RESULTS_FOR_SUGGEST, ".70")
|
||||
,"/spellcheck/suggestions/[0]=='brwn'"
|
||||
,"/spellcheck/suggestions/[1]/numFound==1"
|
||||
,"/spellcheck/suggestions/brwn/numFound==1"
|
||||
);
|
||||
try {
|
||||
assertJQ(req("qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", SpellingParams.SPELLCHECK_BUILD, "true", "q","lowerfilt:(this OR brwn)",
|
||||
"fq", "id:[0 TO 9]", SpellingParams.SPELLCHECK_MAX_RESULTS_FOR_SUGGEST_FQ, "lowerfilt:th*",
|
||||
SpellingParams.SPELLCHECK_COUNT,"5", SpellingParams.SPELLCHECK_EXTENDED_RESULTS,"false", SpellingParams.SPELLCHECK_MAX_RESULTS_FOR_SUGGEST, ".64")
|
||||
,"/spellcheck/suggestions/[1]/numFound==1"
|
||||
);
|
||||
fail("there should have been no suggestions ((.64 * 10)<7)");
|
||||
} catch(Exception e) {
|
||||
//correctly threw exception
|
||||
}
|
||||
|
||||
assertJQ(req("qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", SpellingParams.SPELLCHECK_BUILD, "true", "q","lowerfilt:(this OR brwn)",
|
||||
"fq", "id:[0 TO 9]", SpellingParams.SPELLCHECK_MAX_RESULTS_FOR_SUGGEST_FQ, "lowerfilt:th*",
|
||||
SpellingParams.SPELLCHECK_COUNT,"5", SpellingParams.SPELLCHECK_EXTENDED_RESULTS,"false", SpellingParams.SPELLCHECK_MAX_RESULTS_FOR_SUGGEST, ".64")
|
||||
,"/spellcheck/suggestions=={}");
|
||||
// there should have been no suggestions ((.64 * 10)<7)
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testExtendedResultsCount() throws Exception {
|
||||
assertJQ(req("qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", SpellingParams.SPELLCHECK_BUILD, "true", "q","bluo", SpellingParams.SPELLCHECK_COUNT,"5", SpellingParams.SPELLCHECK_EXTENDED_RESULTS,"false")
|
||||
,"/spellcheck/suggestions/[0]=='bluo'"
|
||||
,"/spellcheck/suggestions/[1]/numFound==5"
|
||||
,"/spellcheck/suggestions/bluo/numFound==5"
|
||||
);
|
||||
|
||||
assertJQ(req("qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", "q","bluo", SpellingParams.SPELLCHECK_COUNT,"3", SpellingParams.SPELLCHECK_EXTENDED_RESULTS,"true")
|
||||
,"/spellcheck/suggestions/[1]/suggestion==[{'word':'blud','freq':1}, {'word':'blue','freq':1}, {'word':'blee','freq':1}]"
|
||||
,"/spellcheck/suggestions/bluo/suggestion==[{'word':'blud','freq':1}, {'word':'blue','freq':1}, {'word':'blee','freq':1}]"
|
||||
);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test() throws Exception {
|
||||
assertJQ(req("qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", "q","documemt")
|
||||
,"/spellcheck=={'suggestions':['documemt',{'numFound':1,'startOffset':0,'endOffset':8,'suggestion':['document']}]}"
|
||||
,"/spellcheck=={'suggestions':{'documemt':{'numFound':1,'startOffset':0,'endOffset':8,'suggestion':['document']}}}"
|
||||
);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testNumericQuery() throws Exception {
|
||||
assertJQ(req("qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", "q","12346")
|
||||
,"/spellcheck=={'suggestions':['12346',{'numFound':1,'startOffset':0,'endOffset':5,'suggestion':['12345']}]}"
|
||||
,"/spellcheck=={'suggestions':{'12346':{'numFound':1,'startOffset':0,'endOffset':5,'suggestion':['12345']}}}"
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -186,13 +171,21 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 {
|
|||
@Test
|
||||
public void testCollateExtendedResultsWithJsonNl() throws Exception {
|
||||
final String q = "documemtsss broens";
|
||||
final String jsonNl = "map";
|
||||
final String jsonNl = (random().nextBoolean() ? "map" : "arrntv");
|
||||
final boolean collateExtendedResults = random().nextBoolean();
|
||||
final List<String> testsList = new ArrayList<String>();
|
||||
if (collateExtendedResults) {
|
||||
testsList.add("/spellcheck/collations/collation/collationQuery=='document brown'");
|
||||
testsList.add("/spellcheck/collations/collation/hits==0");
|
||||
switch (jsonNl) {
|
||||
case "arrntv":
|
||||
testsList.add("/spellcheck/collations/collation/misspellingsAndCorrections/[0]/name=='documemtsss'");
|
||||
testsList.add("/spellcheck/collations/collation/misspellingsAndCorrections/[0]/type=='str'");
|
||||
testsList.add("/spellcheck/collations/collation/misspellingsAndCorrections/[0]/value=='document'");
|
||||
testsList.add("/spellcheck/collations/collation/misspellingsAndCorrections/[1]/name=='broens'");
|
||||
testsList.add("/spellcheck/collations/collation/misspellingsAndCorrections/[1]/type=='str'");
|
||||
testsList.add("/spellcheck/collations/collation/misspellingsAndCorrections/[1]/value=='brown'");
|
||||
break;
|
||||
case "map":
|
||||
testsList.add("/spellcheck/collations/collation/misspellingsAndCorrections/documemtsss=='document'");
|
||||
testsList.add("/spellcheck/collations/collation/misspellingsAndCorrections/broens=='brown'");
|
||||
|
|
@ -311,11 +304,11 @@ public class SpellCheckComponentTest extends SolrTestCaseJ4 {
|
|||
//while "document" is present.
|
||||
|
||||
assertJQ(req("qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", "q","documenq", SpellingParams.SPELLCHECK_DICT, "threshold", SpellingParams.SPELLCHECK_COUNT,"5", SpellingParams.SPELLCHECK_EXTENDED_RESULTS,"true")
|
||||
,"/spellcheck/suggestions/[1]/suggestion==[{'word':'document','freq':2}]"
|
||||
,"/spellcheck/suggestions/documenq/suggestion==[{'word':'document','freq':2}]"
|
||||
);
|
||||
|
||||
assertJQ(req("qt",rh, SpellCheckComponent.COMPONENT_NAME, "true", "q","documenq", SpellingParams.SPELLCHECK_DICT, "threshold_direct", SpellingParams.SPELLCHECK_COUNT,"5", SpellingParams.SPELLCHECK_EXTENDED_RESULTS,"true")
|
||||
,"/spellcheck/suggestions/[1]/suggestion==[{'word':'document','freq':2}]"
|
||||
,"/spellcheck/suggestions/documenq/suggestion==[{'word':'document','freq':2}]"
|
||||
);
|
||||
|
||||
//TODO: how do we make this into a 1-liner using "assertQ()" ???
|
||||
|
|
|
|||
Loading…
Reference in New Issue