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 2014/10/21 22:14:09 UTC
svn commit: r1633446 - in /lucene/dev/branches/lucene_solr_4_10: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/handler/component/
solr/core/src/test/org/apache/solr/handler/component/
Author: janhoy
Date: Tue Oct 21 20:14:08 2014
New Revision: 1633446
URL: http://svn.apache.org/r1633446
Log:
SOLR-6573: QueryElevationComponent now works with localParams in the query - backport from trunk
Modified:
lucene/dev/branches/lucene_solr_4_10/ (props changed)
lucene/dev/branches/lucene_solr_4_10/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt
lucene/dev/branches/lucene_solr_4_10/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
lucene/dev/branches/lucene_solr_4_10/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
Modified: lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt?rev=1633446&r1=1633445&r2=1633446&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/CHANGES.txt Tue Oct 21 20:14:08 2014
@@ -29,6 +29,7 @@ Bug Fixes
* SOLR-6530: Commits under network partitions can put any node in down state.
(Ramkumar Aiyengar, Alan Woodward, Mark Miller, shalin)
+* SOLR-6573: QueryElevationComponent now works with localParams in the query (janhoy)
Other Changes
----------------------
Modified: lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java?rev=1633446&r1=1633445&r2=1633446&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java Tue Oct 21 20:14:08 2014
@@ -51,6 +51,7 @@ import org.apache.solr.common.params.Que
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.schema.IndexSchema;
+import org.apache.solr.search.QueryParsing;
import org.apache.solr.search.grouping.GroupingSpecification;
import org.apache.solr.util.DOMUtil;
import org.apache.solr.common.util.NamedList;
@@ -393,7 +394,8 @@ public class QueryElevationComponent ext
String exStr = params.get(QueryElevationParams.EXCLUDE);
Query query = rb.getQuery();
- String qstr = rb.getQueryString();
+ SolrParams localParams = rb.getQparser().getLocalParams();
+ String qstr = localParams == null ? rb.getQueryString() : localParams.get(QueryParsing.V);
if (query == null || qstr == null) {
return;
}
Modified: lucene/dev/branches/lucene_solr_4_10/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java?rev=1633446&r1=1633445&r2=1633446&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java Tue Oct 21 20:14:08 2014
@@ -725,4 +725,36 @@ public class QueryElevationComponentTest
delete();
}
}
+
+ @Test
+ public void testWithLocalParam() throws Exception {
+ try {
+ init("schema11.xml");
+ clearIndex();
+ assertU(commit());
+ assertU(adoc("id", "7", "text", "AAAA", "str_s", "a"));
+ assertU(commit());
+
+ assertQ("", req(CommonParams.Q, "AAAA", CommonParams.QT, "/elevate",
+ CommonParams.FL, "id, score, [elevated]")
+ , "//*[@numFound='1']"
+ , "//result/doc[1]/float[@name='id'][.='7.0']"
+ , "//result/doc[1]/bool[@name='[elevated]'][.='true']"
+ );
+ assertQ("", req(CommonParams.Q, "{!q.op=AND}AAAA", CommonParams.QT, "/elevate",
+ CommonParams.FL, "id, score, [elevated]")
+ , "//*[@numFound='1']"
+ , "//result/doc[1]/float[@name='id'][.='7.0']"
+ , "//result/doc[1]/bool[@name='[elevated]'][.='true']"
+ );
+ assertQ("", req(CommonParams.Q, "{!q.op=AND v='AAAA'}", CommonParams.QT, "/elevate",
+ CommonParams.FL, "id, score, [elevated]")
+ , "//*[@numFound='1']"
+ , "//result/doc[1]/float[@name='id'][.='7.0']"
+ , "//result/doc[1]/bool[@name='[elevated]'][.='true']"
+ );
+ } finally {
+ delete();
+ }
+ }
}