You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2013/08/06 20:26:27 UTC
svn commit: r1511064 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java
Author: hossman
Date: Tue Aug 6 18:26:27 2013
New Revision: 1511064
URL: http://svn.apache.org/r1511064
Log:
SOLR-5107: Fixed NPE when using numTerms=0 in LukeRequestHandler
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1511064&r1=1511063&r2=1511064&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Aug 6 18:26:27 2013
@@ -100,6 +100,9 @@ Bug Fixes
when generating collations involving multiple word-break corrections.
(James Dyer)
+* SOLR-5107: Fixed NPE when using numTerms=0 in LukeRequestHandler
+ (Ahmet Arslan, hossman)
+
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java?rev=1511064&r1=1511063&r2=1511064&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java Tue Aug 6 18:26:27 2013
@@ -576,7 +576,7 @@ public class LukeRequestHandler extends
throws IOException {
SolrParams params = req.getParams();
- int numTerms = params.getInt( NUMTERMS, DEFAULT_COUNT );
+ final int numTerms = params.getInt( NUMTERMS, DEFAULT_COUNT );
TopTermQueue tiq = new TopTermQueue(numTerms + 1); // Something to collect the top N terms in.
@@ -600,7 +600,7 @@ public class LukeRequestHandler extends
int freq = termsEnum.docFreq(); // This calculation seems odd, but it gives the same results as it used to.
int slot = 32 - Integer.numberOfLeadingZeros(Math.max(0, freq - 1));
buckets[slot] = buckets[slot] + 1;
- if (freq > tiq.minFreq) {
+ if (numTerms > 0 && freq > tiq.minFreq) {
UnicodeUtil.UTF8toUTF16(text, spare);
String t = spare.toString();
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java?rev=1511064&r1=1511063&r2=1511064&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java Tue Aug 6 18:26:27 2013
@@ -184,6 +184,29 @@ public class LukeRequestHandlerTest exte
}
}
+ public void testNumTerms() throws Exception {
+ final String f = "name";
+ for (String n : new String[] {"2", "3", "100", "99999"}) {
+ assertQ(req("qt", "/admin/luke", "fl", f, "numTerms", n),
+ field(f) + "lst[@name='topTerms']/int[@name='Apache']",
+ field(f) + "lst[@name='topTerms']/int[@name='Solr']",
+ "count("+field(f)+"lst[@name='topTerms']/int)=2");
+ }
+
+ assertQ(req("qt", "/admin/luke", "fl", f, "numTerms", "1"),
+ // no garuntee which one we find
+ "count("+field(f)+"lst[@name='topTerms']/int)=1");
+
+ assertQ(req("qt", "/admin/luke", "fl", f, "numTerms", "0"),
+ "count("+field(f)+"lst[@name='topTerms']/int)=0");
+
+ // field with no terms shouldn't error
+ for (String n : new String[] {"0", "1", "2", "100", "99999"}) {
+ assertQ(req("qt", "/admin/luke", "fl", "bogus_s", "numTerms", n),
+ "count("+field(f)+"lst[@name='topTerms']/int)=0");
+ }
+ }
+
public void testCopyFieldLists() throws Exception {
SolrQueryRequest req = req("qt", "/admin/luke", "show", "schema");