You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by cp...@apache.org on 2024/02/14 09:32:59 UTC
(solr) branch branch_9x updated: SolrIndexSearcher.getDocList[AndSet]NC style: more final local variables (#2258)
This is an automated email from the ASF dual-hosted git repository.
cpoerschke pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 7049830ef67 SolrIndexSearcher.getDocList[AndSet]NC style: more final local variables (#2258)
7049830ef67 is described below
commit 7049830ef6764e27b593cdf67728f6e0f88426d5
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Wed Feb 14 09:26:36 2024 +0000
SolrIndexSearcher.getDocList[AndSet]NC style: more final local variables (#2258)
(cherry picked from commit 18db1af11c87bd9be240157fca45105b28f4bd3e)
Resolved Conflicts:
solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
---
.../org/apache/solr/search/SolrIndexSearcher.java | 54 +++++++++++-----------
1 file changed, 27 insertions(+), 27 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
index 82684fb1c0d..8696fbf2d95 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -1807,29 +1807,29 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
}
private void getDocListNC(QueryResult qr, QueryCommand cmd) throws IOException {
- int len = cmd.getSupersetMaxDoc();
+ final int len = cmd.getSupersetMaxDoc();
int last = len;
if (last < 0 || last > maxDoc()) last = maxDoc();
final int lastDocRequested = last;
- int nDocsReturned;
- int totalHits;
- float maxScore;
- int[] ids;
- float[] scores;
+ final int nDocsReturned;
+ final int totalHits;
+ final float maxScore;
+ final int[] ids;
+ final float[] scores;
- boolean needScores = (cmd.getFlags() & GET_SCORES) != 0;
+ final boolean needScores = (cmd.getFlags() & GET_SCORES) != 0;
- ProcessedFilter pf = getProcessedFilter(cmd.getFilter(), cmd.getFilterList());
+ final ProcessedFilter pf = getProcessedFilter(cmd.getFilter(), cmd.getFilterList());
final Query query =
QueryUtils.combineQueryAndFilter(QueryUtils.makeQueryable(cmd.getQuery()), pf.filter);
- Relation hitsRelation;
+ final Relation hitsRelation;
// handle zero case...
if (lastDocRequested <= 0) {
final float[] topscore = new float[] {Float.NEGATIVE_INFINITY};
final int[] numHits = new int[1];
- Collector collector;
+ final Collector collector;
if (!needScores) {
collector =
@@ -1886,11 +1886,11 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
maxScoreCollector = new MaxScoreCollector();
collector = MultiCollector.wrap(topCollector, maxScoreCollector);
}
- ScoreMode scoreModeUsed =
+ final ScoreMode scoreModeUsed =
buildAndRunCollectorChain(qr, query, collector, cmd, pf.postFilter).scoreMode();
totalHits = topCollector.getTotalHits();
- TopDocs topDocs = topCollector.topDocs(0, len);
+ final TopDocs topDocs = topCollector.topDocs(0, len);
if (scoreModeUsed == ScoreMode.COMPLETE || scoreModeUsed == ScoreMode.COMPLETE_NO_SCORES) {
hitsRelation = TotalHits.Relation.EQUAL_TO;
} else {
@@ -1925,22 +1925,22 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
// any DocSet returned is for the query only, without any filtering... that way it may
// be cached if desired.
private DocSet getDocListAndSetNC(QueryResult qr, QueryCommand cmd) throws IOException {
- int len = cmd.getSupersetMaxDoc();
+ final int len = cmd.getSupersetMaxDoc();
int last = len;
if (last < 0 || last > maxDoc()) last = maxDoc();
final int lastDocRequested = last;
- int nDocsReturned;
- int totalHits;
- float maxScore;
- int[] ids;
- float[] scores;
- DocSet set;
-
- boolean needScores = (cmd.getFlags() & GET_SCORES) != 0;
- int maxDoc = maxDoc();
+ final int nDocsReturned;
+ final int totalHits;
+ final float maxScore;
+ final int[] ids;
+ final float[] scores;
+ final DocSet set;
+
+ final boolean needScores = (cmd.getFlags() & GET_SCORES) != 0;
+ final int maxDoc = maxDoc();
cmd.setMinExactCount(Integer.MAX_VALUE); // We need the full DocSet
- ProcessedFilter pf = getProcessedFilter(cmd.getFilter(), cmd.getFilterList());
+ final ProcessedFilter pf = getProcessedFilter(cmd.getFilter(), cmd.getFilterList());
final Query query =
QueryUtils.combineQueryAndFilter(QueryUtils.makeQueryable(cmd.getQuery()), pf.filter);
@@ -1948,7 +1948,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
if (lastDocRequested <= 0) {
final float[] topscore = new float[] {Float.NEGATIVE_INFINITY};
- Collector collector;
+ final Collector collector;
final DocSetCollector setCollector = new DocSetCollector(maxDoc);
if (!needScores) {
@@ -1992,7 +1992,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
qr.setNextCursorMark(cmd.getCursorMark());
} else {
final TopDocsCollector<? extends ScoreDoc> topCollector = buildTopDocsCollector(len, cmd);
- DocSetCollector setCollector = new DocSetCollector(maxDoc);
+ final DocSetCollector setCollector = new DocSetCollector(maxDoc);
MaxScoreCollector maxScoreCollector = null;
List<Collector> collectors = new ArrayList<>(Arrays.asList(topCollector, setCollector));
@@ -2001,7 +2001,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
collectors.add(maxScoreCollector);
}
- Collector collector = MultiCollector.wrap(collectors);
+ final Collector collector = MultiCollector.wrap(collectors);
buildAndRunCollectorChain(qr, query, collector, cmd, pf.postFilter);
@@ -2010,7 +2010,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
totalHits = topCollector.getTotalHits();
assert (totalHits == set.size()) || qr.isPartialResults();
- TopDocs topDocs = topCollector.topDocs(0, len);
+ final TopDocs topDocs = topCollector.topDocs(0, len);
if (cmd.getSort() != null
&& !(cmd.getQuery() instanceof RankQuery)
&& (cmd.getFlags() & GET_SCORES) != 0) {