Apache Solr open-source search software
SolrIndexSearcher.getDocList[AndSet]NC style: more final local variables (#2258)
Christine Poerschke18db1af11c87
diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.javaindex 2520c9ed01b..c1da90a7a67 100644--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java@@ -1802,29 +1802,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.getFilterList());+ final ProcessedFilter pf = getProcessedFilter(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 =@@ -1881,11 +1881,11 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrImaxScoreCollector = 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 {@@ -1920,22 +1920,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.getFilterList());+ final ProcessedFilter pf = getProcessedFilter(cmd.getFilterList());final Query query =QueryUtils.combineQueryAndFilter(QueryUtils.makeQueryable(cmd.getQuery()), pf.filter);@@ -1943,7 +1943,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrIif (lastDocRequested <= 0) {final float[] topscore = new float[] {Float.NEGATIVE_INFINITY};- Collector collector;+ final Collector collector;final DocSetCollector setCollector = new DocSetCollector(maxDoc);if (!needScores) {@@ -1987,7 +1987,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrIqr.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));@@ -1996,7 +1996,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrIcollectors.add(maxScoreCollector);}- Collector collector = MultiCollector.wrap(collectors);+ final Collector collector = MultiCollector.wrap(collectors);buildAndRunCollectorChain(qr, query, collector, cmd, pf.postFilter);@@ -2005,7 +2005,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrItotalHits = 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) {