You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2013/02/26 20:39:57 UTC
svn commit: r1450369 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java
core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
Author: yonik
Date: Tue Feb 26 19:39:56 2013
New Revision: 1450369
URL: http://svn.apache.org/r1450369
Log:
SOLR-4480: edismax - fix trailing +-
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1450369&r1=1450368&r2=1450369&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Feb 26 19:39:56 2013
@@ -176,6 +176,10 @@ Bug Fixes
* SOLR-4504: Fixed CurrencyField range queries to correctly exclude
documents w/o values (hossman)
+* SOLR-4480: A trailing + or - caused the edismax parser to throw
+ an exception. (Fiona Tay, Jan Høydahl, yonik)
+
+
Optimizations
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java?rev=1450369&r1=1450368&r2=1450369&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java Tue Feb 26 19:39:56 2013
@@ -697,7 +697,7 @@ public class ExtendedDismaxQParser exten
start = pos;
- if (ch=='+' || ch=='-') {
+ if ((ch=='+' || ch=='-') && (pos+1)<end) {
clause.must = ch;
pos++;
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java?rev=1450369&r1=1450368&r2=1450369&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java Tue Feb 26 19:39:56 2013
@@ -18,6 +18,7 @@
package org.apache.solr.search;
import java.util.HashSet;
+import java.util.Random;
import java.util.Set;
import org.apache.lucene.search.BooleanClause;
@@ -26,6 +27,7 @@ import org.apache.lucene.search.Disjunct
import org.apache.lucene.search.FuzzyQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
@@ -35,20 +37,15 @@ import org.apache.solr.util.SolrPluginUt
import org.junit.BeforeClass;
import org.junit.Test;
-public class TestExtendedDismaxParser extends AbstractSolrTestCase {
+public class TestExtendedDismaxParser extends SolrTestCaseJ4 {
@BeforeClass
public static void beforeClass() throws Exception {
initCore("solrconfig.xml", "schema12.xml");
+ index();
}
- // public String getCoreName() { return "collection1"; }
-
- @Override
- public void setUp() throws Exception {
- // if you override setUp or tearDown, you better call
- // the super classes version
- super.setUp();
+ public static void index() throws Exception {
assertU(adoc("id", "42", "trait_ss", "Tool", "trait_ss", "Obnoxious",
"name", "Zapp Brannigan"));
assertU(adoc("id", "43" ,
@@ -82,13 +79,48 @@ public class TestExtendedDismaxParser ex
assertU(adoc("id", "61", "text_sw", "bazaaa")); // synonyms in an expansion group
assertU(commit());
}
- @Override
- public void tearDown() throws Exception {
- // if you override setUp or tearDown, you better call
- // the super classes version
- super.tearDown();
+
+
+ public void testTrailingOperators() throws Exception {
+ // really just test that exceptions aren't thrown by
+ // single + -
+
+ assertJQ(req("defType","edismax", "q","-")
+ ,"/response==");
+
+ assertJQ(req("defType","edismax", "q","+")
+ ,"/response==");
+
+ assertJQ(req("defType","edismax", "q","+ - +")
+ ,"/response==");
+
+ assertJQ(req("defType","edismax", "q","- + -")
+ ,"/response==");
+
+ assertJQ(req("defType","edismax", "q","id:47 +")
+ ,"/response/numFound==1");
+
+ assertJQ(req("defType","edismax", "q","id:47 -")
+ ,"/response/numFound==1");
+
+ Random r = random();
+ for (int i=0; i<100; i++) {
+ StringBuilder sb = new StringBuilder();
+ for (int j=0; j<r.nextInt(10); j++) {
+ switch (r.nextInt(3)) {
+ case 0: sb.append(' '); break;
+ case 1: sb.append('+'); break;
+ case 2: sb.append('-'); break;
+ case 3: sb.append((char)r.nextInt(127)); break;
+ }
+ }
+
+ String q = sb.toString();
+ assertJQ(req("defType","edismax", "q",q)
+ ,"/response==");
+ }
}
-
+
public void testLowercaseOperators() {
assertQ("Upper case operator",
@@ -637,10 +669,10 @@ public class TestExtendedDismaxParser ex
assertU(commit());
assertQ("default order assumption wrong",
- req("q", "foo bar",
- "qf", "phrase_sw",
- "bf", "boost_d",
- "fl", "score,*",
+ req("q", "foo bar",
+ "qf", "phrase_sw",
+ "bf", "boost_d",
+ "fl", "score,*",
"defType", "edismax"),
"//doc[1]/str[@name='id'][.='s3']",
"//doc[2]/str[@name='id'][.='s2']",
@@ -648,13 +680,13 @@ public class TestExtendedDismaxParser ex
"//doc[4]/str[@name='id'][.='s0']");
assertQ("pf not working",
- req("q", "foo bar",
- "qf", "phrase_sw",
- "pf", "phrase_sw^10",
- "bf", "boost_d",
- "fl", "score,*",
- "defType", "edismax"),
- "//doc[1]/str[@name='id'][.='s0']");
+ req("q", "foo bar",
+ "qf", "phrase_sw",
+ "pf", "phrase_sw^10",
+ "bf", "boost_d",
+ "fl", "score,*",
+ "defType", "edismax"),
+ "//doc[1]/str[@name='id'][.='s0']");
assertQ("pf2 not working",
req("q", "foo bar",