dsmiley commented on a change in pull request #529: URL: https://github.com/apache/solr/pull/529#discussion_r803130966
########## File path: solr/core/src/java/org/apache/solr/search/DocSetQuery.java ########## @@ -0,0 +1,99 @@ +/* + * 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; + +import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.search.ConstantScoreScorer; +import org.apache.lucene.search.ConstantScoreWeight; +import org.apache.lucene.search.DocIdSetIterator; +import org.apache.lucene.search.IndexSearcher; +import org.apache.lucene.search.Query; +import org.apache.lucene.search.QueryVisitor; +import org.apache.lucene.search.ScoreMode; +import org.apache.lucene.search.Scorer; +import org.apache.lucene.search.Weight; + +import java.io.IOException; +import java.util.Objects; + +/** + * A class that accesses Queries based on a DocSet + * + * Refer SOLR-15257 + */ +public class DocSetQuery extends Query implements DocSetProducer{ + private final DocSet docSet; + + public DocSetQuery(DocSet docSet) { + super(); + this.docSet = docSet; + } + + @Override + public String toString(String field) { + return "DocSetQuery(" + field + ")"; + } + + @Override + public void visit(QueryVisitor visitor) { + visitor.visitLeaf(this); + } + + @Override + public boolean equals(Object obj) { + return sameClassAs(obj) && equalsTo(getClass().cast(obj)); + } + + private boolean equalsTo(DocSetQuery other) { + return Objects.equals(docSet, other.docSet); + } + + @Override + public int hashCode() { + return classHash() * 31 + (docSet != null ? docSet.hashCode() : 0); + } + + /** + * @param searcher is not used because we already have a DocSet created in DocSetQuery + * @return the DocSet created in DocSetQuery + */ + @Override + public DocSet createDocSet(SolrIndexSearcher searcher) throws IOException { + return docSet; + } + + @Override + public Weight createWeight(IndexSearcher searcher, ScoreMode scoreMode, float boost) throws IOException { + //This should probably use the provided boost as scorer. However, that causes + // TestSolrQueryParser.testFilter to fail. Review comment: SolrConstantScoreQuery allowed boostable (non-zero) scores; so removing it in this PR but keeping the 0 here on DocSetQuery (formerly Filter) is making the use of 0 score wider/worse. Code paths that used SolrConstantScoreQuery were getting this and now if they use DocSetQuery, they have 0 score. These cases are not tested as it's an obscure matter. Any way; I'd be happy to clean this up in SOLR-14800 this weekend if you want to just let this be in this PR. ########## File path: solr/core/src/java/org/apache/solr/search/FunctionRangeQuery.java ########## @@ -73,4 +86,25 @@ protected void doSetNextReader(LeafReaderContext context) throws IOException { scorer = dv.getRangeScorer(weight, context, rangeFilt.getLowerVal(), rangeFilt.getUpperVal(), rangeFilt.isIncludeLower(), rangeFilt.isIncludeUpper()); } } + + @Override + public String toString(String field) { + return "FunctionRangeQuery(" + field + ")"; + } + + @Override + public void visit(QueryVisitor visitor) { + visitor.visitLeaf(this); + } + + @Override + public boolean equals(Object obj) { Review comment: Nice to see equals & hashCode added! -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
