madrob commented on a change in pull request #529:
URL: https://github.com/apache/solr/pull/529#discussion_r789791743
##########
File path: solr/CHANGES.txt
##########
@@ -72,6 +72,10 @@ New Features
Improvements
----------------------
+* SOLR-15257: Add DocSetQuery in lieu of DocSet.getTopFilter. This issue led
to removing
Review comment:
We typically add changes entires to the end of the section rather than
the beginning.
##########
File path:
solr/core/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java
##########
@@ -35,7 +37,7 @@
/**
* RangeFilter over a ValueSource.
*/
-public class ValueSourceRangeFilter extends SolrFilter {
Review comment:
@dsmiley - It kind of is though, if Filter and SolrFilter go away then
this has to change?
##########
File path: solr/core/src/java/org/apache/solr/search/FunctionRangeQuery.java
##########
@@ -42,7 +43,12 @@ public FunctionRangeQuery(ValueSourceRangeFilter filter) {
@Override
public DelegatingCollector getFilterCollector(IndexSearcher searcher) {
Map<Object,Object> fcontext = ValueSource.newContext(searcher);
- Weight weight = rangeFilt.createWeight(searcher, ScoreMode.COMPLETE, 1);
+ Weight weight = null;
+ try {
+ weight = rangeFilt.createWeight(searcher, ScoreMode.COMPLETE, 1);
+ } catch (IOException e) {
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
+ }
Review comment:
nit: indentation here seems inconsistent.
##########
File path: solr/core/src/java/org/apache/solr/search/DocSetQuery.java
##########
@@ -0,0 +1,86 @@
+/*
+ * 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.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;
+
+public class DocSetQuery extends SolrConstantScoreQuery implements
DocSetProducer{
+ DocSet docSet;
+
+ public DocSetQuery(DocSet docSet) {
+ super();
+ this.docSet = docSet;
+ }
+
+ public DocSetQuery() {
+ }
+
+ @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) && Objects.equals(docSet,
getClass().cast(obj).docSet);
+ }
+
+ @Override
+ public int hashCode() {
+ return classHash() * 31 + docSet.hashCode();
+ }
+
+ @Override
+ public DocSet createDocSet(SolrIndexSearcher searcher) throws IOException {
+ return null;
+ }
+
+ @Override
+ public Weight createWeight(IndexSearcher searcher, ScoreMode scoreMode,
float boost) throws IOException {
+ return new ConstantScoreWeight(this, boost) {
+ @Override
+ public Scorer scorer(LeafReaderContext context) throws IOException
{
+ DocIdSetIterator disi = docSet.iterator(context);
+ if (disi == null) {
+ return null;
+ }
+ return new ConstantScoreScorer(this, score(), scoreMode, disi);
Review comment:
nit: indentation here is off.
--
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]
