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 2012/11/20 20:01:51 UTC
svn commit: r1411798 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/suggest/
lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/
lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/
lucene/suggest/src/test/org/apache/lu...
Author: mikemccand
Date: Tue Nov 20 19:01:49 2012
New Revision: 1411798
URL: http://svn.apache.org/viewvc?rev=1411798&view=rev
Log:
LUCENE-4567: avoid NPE if no suggestions were built
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_4x/lucene/suggest/ (props changed)
lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java
lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java
lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java
lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java
lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/WFSTCompletionTest.java
Modified: lucene/dev/branches/branch_4x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/CHANGES.txt?rev=1411798&r1=1411797&r2=1411798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/lucene/CHANGES.txt Tue Nov 20 19:01:49 2012
@@ -131,6 +131,10 @@ Bug Fixes
allow 1+maxMergeCount merges threads to be created, instead of just
maxMergeCount (Radim Kolar, Mike McCandless)
+* LUCENE-4567: Fixed NullPointerException in analzying, fuzzy, and
+ WFST suggesters when no suggestions were added (selckin via Mike
+ McCandless)
+
Optimizations
* LUCENE-2221: oal.util.BitUtil was modified to use Long.bitCount and
Modified: lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java?rev=1411798&r1=1411797&r2=1411798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java (original)
+++ lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggester.java Tue Nov 20 19:01:49 2012
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.StringReader;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
@@ -530,6 +531,10 @@ public class AnalyzingSuggester extends
public boolean store(OutputStream output) throws IOException {
DataOutput dataOut = new OutputStreamDataOutput(output);
try {
+ if (fst == null) {
+ return false;
+ }
+
fst.save(dataOut);
dataOut.writeVInt(maxAnalyzedPathsForOneInput);
} finally {
@@ -557,6 +562,9 @@ public class AnalyzingSuggester extends
if (onlyMorePopular) {
throw new IllegalArgumentException("this suggester only works with onlyMorePopular=false");
}
+ if (fst == null) {
+ return Collections.emptyList();
+ }
//System.out.println("lookup key=" + key + " num=" + num);
final BytesRef utf8Key = new BytesRef(key);
Modified: lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java?rev=1411798&r1=1411797&r2=1411798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java (original)
+++ lucene/dev/branches/branch_4x/lucene/suggest/src/java/org/apache/lucene/search/suggest/fst/WFSTCompletionLookup.java Tue Nov 20 19:01:49 2012
@@ -147,6 +147,10 @@ public class WFSTCompletionLookup extend
throw new IllegalArgumentException("this suggester only works with onlyMorePopular=false");
}
+ if (fst == null) {
+ return Collections.emptyList();
+ }
+
BytesRef scratch = new BytesRef(key);
int prefixLength = scratch.length;
Arc<Long> arc = new Arc<Long>();
@@ -219,6 +223,9 @@ public class WFSTCompletionLookup extend
* or null if it does not exist.
*/
public Object get(CharSequence key) {
+ if (fst == null) {
+ return null;
+ }
Arc<Long> arc = new Arc<Long>();
Long result = null;
try {
Modified: lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java?rev=1411798&r1=1411797&r2=1411798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingSuggesterTest.java Tue Nov 20 19:01:49 2012
@@ -134,6 +134,15 @@ public class AnalyzingSuggesterTest exte
assertEquals(50, results.get(0).value, 0.01F);
}
+ public void testEmpty() throws Exception {
+ Analyzer standard = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, true, MockTokenFilter.ENGLISH_STOPSET, false);
+ AnalyzingSuggester suggester = new AnalyzingSuggester(standard);
+ suggester.build(new TermFreqArrayIterator(new TermFreq[0]));
+
+ List<LookupResult> result = suggester.lookup("a", false, 20);
+ assertTrue(result.isEmpty());
+ }
+
public void testNoSeps() throws Exception {
TermFreq[] keys = new TermFreq[] {
new TermFreq("ab cd", 0),
Modified: lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java?rev=1411798&r1=1411797&r2=1411798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/FuzzySuggesterTest.java Tue Nov 20 19:01:49 2012
@@ -263,8 +263,14 @@ public class FuzzySuggesterTest extends
assertEquals("wi fi network is fast", results.get(1).key);
assertEquals(10, results.get(1).value);
}
-
-
+
+ public void testEmpty() throws Exception {
+ FuzzySuggester suggester = new FuzzySuggester(new MockAnalyzer(random(), MockTokenizer.KEYWORD, false));
+ suggester.build(new TermFreqArrayIterator(new TermFreq[0]));
+
+ List<LookupResult> result = suggester.lookup("a", false, 20);
+ assertTrue(result.isEmpty());
+ }
public void testInputPathRequired() throws Exception {
Modified: lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/WFSTCompletionTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/WFSTCompletionTest.java?rev=1411798&r1=1411797&r2=1411798&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/WFSTCompletionTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/suggest/src/test/org/apache/lucene/search/suggest/fst/WFSTCompletionTest.java Tue Nov 20 19:01:49 2012
@@ -209,4 +209,12 @@ public class WFSTCompletionTest extends
new TermFreq(key2, 50),
}));
}
+
+ public void testEmpty() throws Exception {
+ WFSTCompletionLookup suggester = new WFSTCompletionLookup(false);
+
+ suggester.build(new TermFreqArrayIterator(new TermFreq[0]));
+ List<LookupResult> result = suggester.lookup("a", false, 20);
+ assertTrue(result.isEmpty());
+ }
}