tomglk commented on a change in pull request #151: URL: https://github.com/apache/solr/pull/151#discussion_r655721332
########## File path: solr/core/src/java/org/apache/solr/handler/component/SortedHitQueueManager.java ########## @@ -0,0 +1,83 @@ +/* + * 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.handler.component; + +import org.apache.lucene.search.SortField; +import org.apache.solr.search.AbstractReRankQuery; +import org.apache.solr.search.RankQuery; +import org.apache.solr.search.SortSpec; + +/** + * This class is used to manage the possible multiple SortedHitQueues that we need during mergeIds( ). + * Multiple queues are needed, if reRanking is used. + * + * If reRanking is disabled, only the queue is used. + * If reRanking is enabled, the top reRankDocsSize documents are added to the reRankQueue, all other documents are + * collected in the queue. + */ +public class SortedHitQueueManager { + private final ShardFieldSortedHitQueue queue; + private final ShardFieldSortedHitQueue reRankQueue; + private final int reRankDocsSize; + + public SortedHitQueueManager(SortField[] sortFields, SortSpec ss, ResponseBuilder rb) { + final RankQuery rankQuery = rb.getRankQuery(); + + if(rb.getRankQuery() != null && rankQuery instanceof AbstractReRankQuery){ Review comment: Hi @cpoerschke , thank you for the different pointers for the documentation. :) You are right, the test coverage still is a ToDo. I like the approach of splitting the `SortedHitQueueManager`. But I do not think that the QueryComponent should know when to create which SortedHitQueueManager. So I moved the `newSortedHitQueueManager()` into the manager itself and changed the interface to an abstract class. ( bbf887f ) What do you think about that change? ########## File path: solr/core/src/java/org/apache/solr/handler/component/SortedHitQueueManager.java ########## @@ -0,0 +1,83 @@ +/* + * 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.handler.component; + +import org.apache.lucene.search.SortField; +import org.apache.solr.search.AbstractReRankQuery; +import org.apache.solr.search.RankQuery; +import org.apache.solr.search.SortSpec; + +/** + * This class is used to manage the possible multiple SortedHitQueues that we need during mergeIds( ). + * Multiple queues are needed, if reRanking is used. + * + * If reRanking is disabled, only the queue is used. + * If reRanking is enabled, the top reRankDocsSize documents are added to the reRankQueue, all other documents are + * collected in the queue. + */ +public class SortedHitQueueManager { + private final ShardFieldSortedHitQueue queue; + private final ShardFieldSortedHitQueue reRankQueue; + private final int reRankDocsSize; + + public SortedHitQueueManager(SortField[] sortFields, SortSpec ss, ResponseBuilder rb) { + final RankQuery rankQuery = rb.getRankQuery(); + + if(rb.getRankQuery() != null && rankQuery instanceof AbstractReRankQuery){ Review comment: Hi @cpoerschke , thank you for the different pointers for the documentation. :) You are right, the test coverage still is a ToDo. I like the approach of splitting the `SortedHitQueueManager`. But I do not think that the QueryComponent should know when to create which SortedHitQueueManager. So I moved the `newSortedHitQueueManager()` into the manager itself and changed the interface to an abstract class. (bbf887f) What do you think about that change? ########## File path: solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java ########## @@ -185,6 +187,8 @@ public void prepare(ResponseBuilder rb) throws IOException if(rq instanceof RankQuery) { RankQuery rankQuery = (RankQuery)rq; rb.setRankQuery(rankQuery); + // we always need the score for reRanking + rb.setFieldFlags(rb.getFieldFlags() | GET_SCORES); Review comment: That looks good to me! :) One thing that I stumbled upon while looking at your change is, that we actually override the flags instead of just adding the score, because we start with this: ```java int flags = 0; ``` A comment why we do this instead of starting with ```java int flags = rb.getFieldFlags(); ``` would be great, I think. -- 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 --------------------------------------------------------------------- To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org For additional commands, e-mail: issues-h...@solr.apache.org
