dsmiley commented on a change in pull request #1171: SOLR-13892: Add 'top-level' docValues Join implementation URL: https://github.com/apache/lucene-solr/pull/1171#discussion_r370282592
########## File path: solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java ########## @@ -59,67 +60,124 @@ import org.apache.solr.search.join.ScoreJoinQParserPlugin; import org.apache.solr.util.RTimer; import org.apache.solr.util.RefCounted; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class JoinQParserPlugin extends QParserPlugin { + private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); + public static final String NAME = "join"; + /** Choose the internal algorithm */ + private static final String METHOD = "method"; + + private static class JoinParams { + final String fromField; + final String fromCore; + final Query fromQuery; + final long fromCoreOpenTime; + final String toField; + + public JoinParams(String fromField, String fromCore, Query fromQuery, long fromCoreOpenTime, String toField) { + this.fromField = fromField; + this.fromCore = fromCore; + this.fromQuery = fromQuery; + this.fromCoreOpenTime = fromCoreOpenTime; + this.toField = toField; + } + } + + private enum Method { + index { + @Override + Query makeFilter(QParser qparser) throws SyntaxError { + final JoinParams jParams = parseJoin(qparser); + final JoinQuery q = new JoinQuery(jParams.fromField, jParams.toField, jParams.fromCore, jParams.fromQuery); + q.fromCoreOpenTime = jParams.fromCoreOpenTime; + return q; + } + }, + dvWithScore { + @Override + Query makeFilter(QParser qparser) throws SyntaxError { + return new ScoreJoinQParserPlugin().createParser(qparser.qstr, qparser.localParams, qparser.params, qparser.req).parse(); + } + }, + topLevelDV { + @Override + Query makeFilter(QParser qparser) throws SyntaxError { + final JoinParams jParams = parseJoin(qparser); + final JoinQuery q = new TopLevelJoinQuery(jParams.fromField, jParams.toField, jParams.fromCore, jParams.fromQuery); + q.fromCoreOpenTime = jParams.fromCoreOpenTime; + return q; + } + }; + + abstract Query makeFilter(QParser qparser) throws SyntaxError; + + JoinParams parseJoin(QParser qparser) throws SyntaxError { + final String fromField = qparser.getParam("from"); + final String fromIndex = qparser.getParam("fromIndex"); + final String toField = qparser.getParam("to"); + final String v = qparser.localParams.get("v"); + final String coreName; + + Query fromQuery; + long fromCoreOpenTime = 0; + + if (fromIndex != null && !fromIndex.equals(qparser.req.getCore().getCoreDescriptor().getName()) ) { + CoreContainer container = qparser.req.getCore().getCoreContainer(); + + // if in SolrCloud mode, fromIndex should be the name of a single-sharded collection + coreName = ScoreJoinQParserPlugin.getCoreName(fromIndex, container); + + final SolrCore fromCore = container.getCore(coreName); + if (fromCore == null) { + throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, + "Cross-core join: no such core " + coreName); + } + + RefCounted<SolrIndexSearcher> fromHolder = null; + LocalSolrQueryRequest otherReq = new LocalSolrQueryRequest(fromCore, qparser.params); + try { Review comment: Can you use try-with-resources style for SolrCore and otherReq? You might need to create a static method that gets the core and throws if non-null so that you are able to have a one-liner fetch of the core in the "try". I generally like to use try-with-resources when possible as it's easier to reason to guarantee things get closed, and it's sometimes less code. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org For additional commands, e-mail: issues-h...@lucene.apache.org