You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2015/01/31 10:42:30 UTC
svn commit: r1656174 - in /lucene/dev/branches/branch_5x/lucene: ./
suggest/src/java/org/apache/lucene/search/suggest/analyzing/
suggest/src/test/org/apache/lucene/search/suggest/analyzing/
Author: mikemccand
Date: Sat Jan 31 09:42:29 2015
New Revision: 1656174
URL: http://svn.apache.org/r1656174
Log:
LUCENE-6093: don't throw NPE when BlendedInfixSuggester.lookup doesn't have a prefix token
Modified:
lucene/dev/branches/branch_5x/lucene/CHANGES.txt
lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java
lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1656174&r1=1656173&r2=1656174&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Sat Jan 31 09:42:29 2015
@@ -469,6 +469,10 @@ Bug Fixes
high frequency terms in extremely large indices (Robert Muir, Mike
McCandless)
+* LUCENE-6093: Don't throw NullPointerException from
+ BlendedInfixSuggester for lookups that do not end in a prefix
+ token. (jane chang via Mike McCandless)
+
Documentation
* LUCENE-5392: Add/improve analysis package documentation to reflect
Modified: lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java?rev=1656174&r1=1656173&r2=1656174&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java Sat Jan 31 09:42:29 2015
@@ -611,7 +611,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 toke (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/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java?rev=1656174&r1=1656173&r2=1656174&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggester.java Sat Jan 31 09:42:29 2015
@@ -279,8 +279,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/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java?rev=1656174&r1=1656173&r2=1656174&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/BlendedInfixSuggesterTest.java Sat Jan 31 09:42:29 2015
@@ -165,6 +165,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)
+ };
+
+ Path tempDir = createTempDir("BlendedInfixSuggesterTest");
+
+ Analyzer a = new StandardAnalyzer(CharArraySet.EMPTY_SET);
+ BlendedInfixSuggester suggester = new BlendedInfixSuggester(newFSDirectory(tempDir), a, a,
+ AnalyzingInfixSuggester.DEFAULT_MIN_PREFIX_CHARS,
+ BlendedInfixSuggester.BlenderType.POSITION_LINEAR,
+ BlendedInfixSuggester.DEFAULT_NUM_FACTOR, false);
+ 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");