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

SOLR-9217: delay JoinUtil call to createWeight for score join

This commit is contained in:
Mikhail Khludnev 2017-04-23 00:28:20 +03:00
parent 99ce234162
commit a07ac63357
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -187,6 +187,9 @@ Optimizations
* SOLR-10499: facet.heatmap is now significantly faster when the docset (base query) matches everything and there are no * SOLR-10499: facet.heatmap is now significantly faster when the docset (base query) matches everything and there are no
deleted docs. It's also faster when the docset matches a small fraction of the index or none. (David Smiley) deleted docs. It's also faster when the docset matches a small fraction of the index or none. (David Smiley)
* SOLR-9217: Reduced heap consumption for filter({!join ... score=...})
(Andrey Kudryavtsev, Gopikannan Venugopalsamy via Mikhail Khludnev)
Bug Fixes Bug Fixes
---------------------- ----------------------
* SOLR-10281: ADMIN_PATHS is duplicated in two places and inconsistent. This can cause automatic * SOLR-10281: ADMIN_PATHS is duplicated in two places and inconsistent. This can cause automatic

11
solr/core/src/java/org/apache/solr/search/join/ScoreJoinQParserPlugin.java
View File

@ -21,8 +21,9 @@ import java.util.Map;
import java.util.Objects; import java.util.Objects;
import org.apache.lucene.index.DocValuesType; import org.apache.lucene.index.DocValuesType;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
import org.apache.lucene.search.Weight;
import org.apache.lucene.search.join.JoinUtil; import org.apache.lucene.search.join.JoinUtil;
import org.apache.lucene.search.join.ScoreMode; import org.apache.lucene.search.join.ScoreMode;
import org.apache.solr.cloud.ZkController; import org.apache.solr.cloud.ZkController;
@ -86,7 +87,7 @@ public class ScoreJoinQParserPlugin extends QParserPlugin {
} }
@Override @Override
public Query rewrite(IndexReader reader) throws IOException { public Weight createWeight(IndexSearcher searcher, boolean needsScores, float boost) throws IOException {
SolrRequestInfo info = SolrRequestInfo.getRequestInfo(); SolrRequestInfo info = SolrRequestInfo.getRequestInfo();
CoreContainer container = info.getReq().getCore().getCoreContainer(); CoreContainer container = info.getReq().getCore().getCoreContainer();
@ -106,7 +107,7 @@ public class ScoreJoinQParserPlugin extends QParserPlugin {
fromCore.close(); fromCore.close();
fromHolder.decref(); fromHolder.decref();
} }
return joinQuery.rewrite(reader); return joinQuery.rewrite(searcher.getIndexReader()).createWeight(searcher, needsScores, boost);
} }
@Override @Override
@ -156,11 +157,11 @@ public class ScoreJoinQParserPlugin extends QParserPlugin {
} }
@Override @Override
public Query rewrite(IndexReader reader) throws IOException { public Weight createWeight(IndexSearcher searcher, boolean needsScores, float boost) throws IOException {
SolrRequestInfo info = SolrRequestInfo.getRequestInfo(); SolrRequestInfo info = SolrRequestInfo.getRequestInfo();
final Query jq = JoinUtil.createJoinQuery(fromField, true, final Query jq = JoinUtil.createJoinQuery(fromField, true,
toField, fromQuery, info.getReq().getSearcher(), scoreMode); toField, fromQuery, info.getReq().getSearcher(), scoreMode);
return jq.rewrite(reader); return jq.rewrite(searcher.getIndexReader()).createWeight(searcher, needsScores, boost);
} }

7
solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java
View File

@ -170,10 +170,9 @@ public class TestScoreJoinQPNoScore extends SolrTestCaseJ4 {
{ {
final Query query = QParser.getParser(req.getParams().get("q"), req).getQuery(); final Query query = QParser.getParser(req.getParams().get("q"), req).getQuery();
final Query rewrittenQuery = query.rewrite(req.getSearcher().getIndexReader()); final Query rewrittenQuery = query.rewrite(req.getSearcher().getIndexReader());
assertTrue( assertEquals(rewrittenQuery+" is expected to be from Solr",
rewrittenQuery+" should be Lucene's", ScoreJoinQParserPlugin.class.getPackage().getName(),
rewrittenQuery.getClass().getPackage().getName() rewrittenQuery.getClass().getPackage().getName());
.startsWith("org.apache.lucene"));
} }
{ {
final Query query = QParser.getParser( final Query query = QParser.getParser(