[GitHub] [solr] madrob commented on a change in pull request #767: SOLR-16120: avoid SolrDocumentFetcher.getStoredHighlightFieldNames() call for glob-free hl.fl

[GitBox <gi...@apache.org>]

madrob commented on a change in pull request #767:
URL: https://github.com/apache/solr/pull/767#discussion_r837527547



##########
File path: solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java
##########
@@ -91,13 +87,25 @@ protected boolean emptyArray(String[] arr) {
     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) {
+  private static String[] expandWildcardsInFields(
+      Supplier<Collection<String>> availableFieldNamesSupplier, String... fields) {
+    Set<String> expandedFields = new LinkedHashSet<String>();
+    for (String field : fields) {
+      expandWildcardsInFields(
+          expandedFields, availableFieldNamesSupplier, SolrPluginUtils.split(field));
+    }
+    return expandedFields.toArray(new String[] {});
+  }
+
+  private static void expandWildcardsInFields(
+      Set<String> expandedFields,
+      Supplier<Collection<String>> availableFieldNamesSupplier,
+      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) {
+        for (String storedFieldName : availableFieldNamesSupplier.get()) {

Review comment:
       In case of multiple wildcard fields, I think this will call `getDocFetcher().getStoredHighlightFieldNames()` multiple times, whereas before it would only be called once. I'm not sure how common this use case is, or how much more common the no-wildcard case is.




-- 
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: issues-unsubscribe@solr.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@solr.apache.org
For additional commands, e-mail: issues-help@solr.apache.org