Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-7689: ReRankQuery rewrite method can change the QueryResultKey causing cache misses 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1686213 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joel Bernstein 2015-06-18 13:27:53 +00:00
parent 35c0ff0ec6
commit 3c8d9f7524
2 changed files with 61 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
View File

@ -161,8 +161,18 @@ public class ReRankQParserPlugin extends QParserPlugin {
}
public Query rewrite(IndexReader reader) throws IOException {
return wrap(this.mainQuery.rewrite(reader));
Query q = mainQuery.rewrite(reader);
if(q == mainQuery) {
return this;
} else {
return clone().wrap(q);
}
}
public ReRankQuery clone() {
ReRankQuery clonedQuery = new ReRankQuery(reRankQuery, reRankDocs, reRankWeight, length);
clonedQuery.setBoost(getBoost());
return clonedQuery;
}
public Weight createWeight(IndexSearcher searcher, boolean needsScores) throws IOException{

46
solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
View File

@ -20,6 +20,9 @@ package org.apache.solr.search;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrInfoMBean;
import org.apache.solr.util.RefCounted;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@ -233,6 +236,9 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
"//result/doc[6]/float[@name='id'][.='3.0']"
);
params = new ModifiableSolrParams();
params.add("rq", "{!rerank reRankQuery=$rqq reRankDocs=4 reRankWeight=2}");
params.add("q", "{!edismax bq=$bqq1}*:*");
@ -359,7 +365,12 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
"//result/doc[5]/float[@name='id'][.='2.0']"
);
SolrInfoMBean info = h.getCore().getInfoRegistry().get("queryResultCache");
NamedList stats = info.getStatistics();
long inserts = (Long) stats.get("inserts");
assertTrue(inserts > 0);
//Test range query
params = new ModifiableSolrParams();
@ -378,6 +389,39 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
"//result/doc[5]/float[@name='id'][.='1.0']"
);
info = h.getCore().getInfoRegistry().get("queryResultCache");
stats = info.getStatistics();
long inserts1 = (Long) stats.get("inserts");
//Last query was added to the cache
assertTrue(inserts1 > inserts);
//Run same query and see if it was cached. This tests the query result cache hit with rewritten queries
params = new ModifiableSolrParams();
params.add("rq", "{!rerank reRankQuery=$rqq reRankDocs=6}");
params.add("q", "test_ti:[0 TO 2000]");
params.add("rqq", "id:1^10 id:2^20 id:3^30 id:4^40 id:5^50 id:6^60");
params.add("fl", "id,score");
params.add("start", "0");
params.add("rows", "6");
assertQ(req(params), "*[count(//doc)=5]",
"//result/doc[1]/float[@name='id'][.='6.0']",
"//result/doc[2]/float[@name='id'][.='5.0']",
"//result/doc[3]/float[@name='id'][.='4.0']",
"//result/doc[4]/float[@name='id'][.='2.0']",
"//result/doc[5]/float[@name='id'][.='1.0']"
);
info = h.getCore().getInfoRegistry().get("queryResultCache");
stats = info.getStatistics();
long inserts2 = (Long) stats.get("inserts");
//Last query was NOT added to the cache
assertTrue(inserts1 == inserts2);
//Test range query embedded in larger query
params = new ModifiableSolrParams();
params.add("rq", "{!rerank reRankQuery=$rqq reRankDocs=6}");
@ -411,6 +455,7 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
"//result/doc[2]/float[@name='id'][.='1.0']"
);
//Test ReRankDocs > docs returned
params = new ModifiableSolrParams();
@ -540,4 +585,5 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
assertTrue(e.code() == SolrException.ErrorCode.BAD_REQUEST.code);
}
}
}