dsmiley commented on code in PR #2489: URL: https://github.com/apache/solr/pull/2489#discussion_r1630219623
########## solr/core/src/java/org/apache/solr/search/combining/QueriesCombiner.java: ########## @@ -0,0 +1,92 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.solr.search.combining; + +import static org.apache.solr.common.params.CombinerParams.RECIPROCAl_RANK_FUSION; + +import java.io.IOException; +import java.util.List; +import org.apache.lucene.search.Explanation; +import org.apache.lucene.search.Query; +import org.apache.solr.common.SolrException; +import org.apache.solr.common.params.CombinerParams; +import org.apache.solr.common.params.SolrParams; +import org.apache.solr.common.util.NamedList; +import org.apache.solr.schema.IndexSchema; +import org.apache.solr.search.DocList; +import org.apache.solr.search.QueryResult; +import org.apache.solr.search.SolrIndexSearcher; + +/** + * Combining considers two or more query rankedLists: resultA, resultB ...<br> + * For a given query, each query result is a ranked list of documents La = (a1,a2,...), Lb = (b1, + * b2, ...)...<br> + * A combining algorithm creates a unique ranked list I = (i1, i2, ...).<br> + * This list is created by combining elements from the lists la and lb as described by the + * implementation algorithm.<br> + */ +public abstract class QueriesCombiner { Review Comment: I like the API. Maybe add @version 9.7. Also mention in javadoc Used by {@link QueryComponent}. ########## solr/core/src/java/org/apache/solr/search/combining/QueriesCombiner.java: ########## @@ -0,0 +1,92 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.solr.search.combining; + +import static org.apache.solr.common.params.CombinerParams.RECIPROCAl_RANK_FUSION; + +import java.io.IOException; +import java.util.List; +import org.apache.lucene.search.Explanation; +import org.apache.lucene.search.Query; +import org.apache.solr.common.SolrException; +import org.apache.solr.common.params.CombinerParams; +import org.apache.solr.common.params.SolrParams; +import org.apache.solr.common.util.NamedList; +import org.apache.solr.schema.IndexSchema; +import org.apache.solr.search.DocList; +import org.apache.solr.search.QueryResult; +import org.apache.solr.search.SolrIndexSearcher; + +/** + * Combining considers two or more query rankedLists: resultA, resultB ...<br> + * For a given query, each query result is a ranked list of documents La = (a1,a2,...), Lb = (b1, + * b2, ...)...<br> + * A combining algorithm creates a unique ranked list I = (i1, i2, ...).<br> + * This list is created by combining elements from the lists la and lb as described by the + * implementation algorithm.<br> + */ +public abstract class QueriesCombiner { + + protected int upTo; + + public QueriesCombiner(SolrParams requestParams) { + this.upTo = + requestParams.getInt(CombinerParams.COMBINER_UP_TO, CombinerParams.COMBINER_UP_TO_DEFAULT); + } + + public abstract QueryResult combine(QueryResult[] rankedLists); + + QueryResult initCombinedResult(QueryResult[] rankedLists) { Review Comment: mark protected ########## solr/solrj/src/java/org/apache/solr/common/params/CombinerParams.java: ########## @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.solr.common.params; + +/** Defines the request parameters used by all combiners. */ +public interface CombinerParams { + String COMBINER = "combiner"; + + String COMBINER_ALGORITHM = COMBINER + ".algorithm"; + + String COMBINER_KEYS = COMBINER + ".keys"; Review Comment: WDYT of instead do `combine.q` multi-valued, so just supply each query as another value? One less indirection and thing to name. ########## solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java: ########## @@ -173,22 +175,51 @@ public void prepare(ResponseBuilder rb) throws IOException { // get it from the response builder to give a different component a chance // to set it. - String queryString = rb.getQueryString(); - if (queryString == null) { - // this is the normal way it's set. - queryString = params.get(CommonParams.Q); - rb.setQueryString(queryString); + List<String> unparsedQueries; + rb.isCombined = params.getBool(CombinerParams.COMBINER, false); + if (rb.isCombinedSearch()) { + String[] queriesToCombineKeys = params.getParams(CombinerParams.COMBINER_KEYS); + unparsedQueries = new ArrayList<>(queriesToCombineKeys.length); + rb.queriesCombiningStrategy = QueriesCombiner.getImplementation(params); + for (String queryKey : queriesToCombineKeys) { + unparsedQueries.add(params.get(queryKey)); + } + } else { + unparsedQueries = new ArrayList<>(1); Review Comment: It'd be nicer to use List.of(oneThing) or List.of() instead but whatever. -- 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. To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
