Apache Solr open-source search software
SOLR-16120: optimise hl.fl expansion (#767)
Christine Poerschke29bd686ee0c3
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txtindex 22c0497a394..1dab9f342fd 100644--- a/solr/CHANGES.txt+++ b/solr/CHANGES.txt@@ -43,7 +43,7 @@ ImprovementsOptimizations----------------------(No changes)+SOLR-16120: Optimise hl.fl expansion. (Christine Poerschke, David Smiley, Mike Drob)Bug Fixes---------------------diff --git a/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java b/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.javaindex 3e67fe31e9a..ff5ca982711 100644--- a/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java+++ b/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java@@ -20,6 +20,8 @@ import java.io.IOException;import java.util.Collection;import java.util.LinkedHashSet;import java.util.Set;+import java.util.function.Supplier;+import java.util.regex.Pattern;import org.apache.lucene.search.Query;import org.apache.solr.common.params.CommonParams;import org.apache.solr.common.params.HighlightParams;@@ -69,14 +71,9 @@ public abstract class SolrHighlighter {fields = defaultFields;}} else {- Set<String> expandedFields = new LinkedHashSet<String>();- Collection<String> storedHighlightFieldNames =- request.getSearcher().getDocFetcher().getStoredHighlightFieldNames();- for (String field : fields) {- expandWildcardsInHighlightFields(- expandedFields, storedHighlightFieldNames, SolrPluginUtils.split(field));- }- fields = expandedFields.toArray(new String[] {});+ fields =+ expandWildcardsInFields(+ () -> request.getSearcher().getDocFetcher().getStoredHighlightFieldNames(), fields);}// Trim them now in case they haven't been yet. Not needed for all code-paths above but do it@@ -91,21 +88,29 @@ public abstract class SolrHighlighter {return (arr == null || arr.length == 0 || arr[0] == null || arr[0].trim().length() == 0);}- private static void expandWildcardsInHighlightFields(- Set<String> expandedFields, Collection<String> storedHighlightFieldNames, String... fields) {- for (String field : fields) {- if (field.contains("*")) {- // create a Java regular expression from the wildcard string- String fieldRegex = field.replaceAll("\\*", ".*");- for (String storedFieldName : storedHighlightFieldNames) {- if (storedFieldName.matches(fieldRegex)) {- expandedFields.add(storedFieldName);+ private static String[] expandWildcardsInFields(+ Supplier<Collection<String>> availableFieldNamesSupplier, String... inFields) {+ Set<String> expandedFields = new LinkedHashSet<String>();+ Collection<String> availableFieldNames = null;+ for (String inField : inFields) {+ for (String field : SolrPluginUtils.split(inField)) {+ if (field.contains("*")) {+ // create a Java regular expression from the wildcard string+ Pattern fieldRegex = Pattern.compile(field.replaceAll("\\*", ".*"));+ if (availableFieldNames == null) {+ availableFieldNames = availableFieldNamesSupplier.get();+ }+ for (String availableFieldName : availableFieldNames) {+ if (fieldRegex.matcher(availableFieldName).matches()) {+ expandedFields.add(availableFieldName);+ }}+ } else {+ expandedFields.add(field);}- } else {- expandedFields.add(field);}}+ return expandedFields.toArray(new String[] {});}/**