Apache Solr open-source search software
SOLR-18175: improve searcher access
David Smileycb93d2d9d3a3
diff --git a/solr/core/src/java/org/apache/solr/schema/FieldType.java b/solr/core/src/java/org/apache/solr/schema/FieldType.javaindex f9d276935a6..ce4dc99d92a 100644--- a/solr/core/src/java/org/apache/solr/schema/FieldType.java+++ b/solr/core/src/java/org/apache/solr/schema/FieldType.java@@ -1081,12 +1081,12 @@ public abstract class FieldType extends FieldProperties {}private static Query validateFieldExistsQuery(QParser parser, FieldExistsQuery query) {- if (parser == null || parser.getReq() == null || parser.getReq().getCore() == null) {+ if (parser == null || parser.getReq() == null || parser.getReq().getSearcher() == null) {return query;}try {- parser.getReq().getCore().withSearcher(searcher -> searcher.rewrite(query));+ parser.getReq().getSearcher().rewrite(query);} catch (IllegalStateException e) {// FieldExistsQuery.rewrite throws this if the field lacks doc values, norms, and vectors.throw new SolrException(ErrorCode.BAD_REQUEST, e);