You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2015/02/18 22:24:21 UTC
svn commit: r1660727 - in /lucene/dev/branches/lucene_solr_4_10: ./ lucene/
lucene/suggest/
lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/
lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/
Author: janhoy
Date: Wed Feb 18 21:24:21 2015
New Revision: 1660727
URL: http://svn.apache.org/r1660727
Log:
LUCENE-6093: BlendedInfixSuggester throws NullPointerException if there were discarded trailing characters in the query (backport)
Modified:
lucene/dev/branches/lucene_solr_4_10/ (props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/suggest/ (props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
lucene/dev/branches/lucene_solr_4_10/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java
lucene/dev/branches/lucene_solr_4_10/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt?rev=1660727&r1=1660726&r2=1660727&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt Wed Feb 18 21:24:21 2015
@@ -22,6 +22,10 @@ Bug fixes
sorted (set) doc values instance at the same time.
(Tom Shally, Robert Muir, Adrien Grand)
+* LUCENE-6093: Don't throw NullPointerException from
+ BlendedInfixSuggester for lookups that do not end in a prefix
+ token. (jane chang via Mike McCandless)
+
API Changes
* LUCENE-6212: Deprecate IndexWriter APIs that accept per-document Analyzer.
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java?rev=1660727&r1=1660726&r2=1660727&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java Wed Feb 18 21:24:21 2015
@@ -485,7 +485,11 @@ public class AnalyzingInfixSuggester ext
/**
* Create the results based on the search hits.
- * Can be overridden by subclass to add particular behavior (e.g. weight transformation)
+ * Can be overridden by subclass to add particular behavior (e.g. weight transformation).
+ * Note that there is no prefix token (the {@code prefixToken} argument will
+ * be null) whenever the final token in the incoming request was in fact finished
+ * (had trailing characters, such as white-space).
+ *
* @throws IOException If there are problems reading fields from the underlying Lucene index.
*/
protected List<LookupResult> createResults(IndexSearcher searcher, TopFieldDocs hits, int num,
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java?rev=1660727&r1=1660726&r2=1660727&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java Wed Feb 18 21:24:21 2015
@@ -232,8 +232,8 @@ public class BlendedInfixSuggester exten
String docTerm = term.utf8ToString();
- if (matchedTokens.contains(docTerm) || docTerm.startsWith(prefixToken)) {
-
+ if (matchedTokens.contains(docTerm) || (prefixToken != null && docTerm.startsWith(prefixToken))) {
+
DocsAndPositionsEnum docPosEnum = it.docsAndPositions(null, null, DocsAndPositionsEnum.FLAG_OFFSETS);
docPosEnum.nextDoc();
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java?rev=1660727&r1=1660726&r2=1660727&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java Wed Feb 18 21:24:21 2015
@@ -162,6 +162,33 @@ public class BlendedInfixSuggesterTest e
suggester.close();
}
+ /**
+ * Handle trailing spaces that result in no prefix token LUCENE-6093
+ */
+ public void testNullPrefixToken() throws IOException {
+
+ BytesRef payload = new BytesRef("lake");
+
+ Input keys[] = new Input[]{
+ new Input("top of the lake", 8, payload)
+ };
+
+ File tempDir = createTempDir("BlendedInfixSuggesterTest");
+
+ Analyzer a = new StandardAnalyzer(CharArraySet.EMPTY_SET);
+ BlendedInfixSuggester suggester = new BlendedInfixSuggester(TEST_VERSION_CURRENT, newFSDirectory(tempDir), a, a,
+ AnalyzingInfixSuggester.DEFAULT_MIN_PREFIX_CHARS,
+ BlendedInfixSuggester.BlenderType.POSITION_LINEAR,
+ BlendedInfixSuggester.DEFAULT_NUM_FACTOR);
+ suggester.build(new InputArrayIterator(keys));
+
+ getInResults(suggester, "of ", payload, 1);
+ getInResults(suggester, "the ", payload, 1);
+ getInResults(suggester, "lake ", payload, 1);
+
+ suggester.close();
+ }
+
public void /*testT*/rying() throws IOException {
BytesRef lake = new BytesRef("lake");