Skip to content

Use dynamic max clause count for field expansion limit #22573

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
igoralex1992 wants to merge 2 commits into
base: main
Choose a base branch
from
+26 −2
Open

Use dynamic max clause count for field expansion limit #22573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daa5aec
Use dynamic max clause count for field expansion limit
Jul 27, 2026
0b0de65
Use dynamic max clause count for field expansion limit v.2
Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion server/src/main/java/org/opensearch/index/search/QueryParserHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@
* @opensearch.internal
*/
public final class QueryParserHelper {

private static SearchService searchService;

public static void setSearchService(SearchService service) {
if (searchService != null) {
return; // already initialized
}
searchService = service;
}

private QueryParserHelper() {}

/**
Expand Down Expand Up @@ -180,7 +190,7 @@ static Map<String, Float> resolveMappingField(
}

static void checkForTooManyFields(int numberOfFields, QueryShardContext context, @Nullable String inputPattern) {
int limit = SearchService.INDICES_MAX_CLAUSE_COUNT_SETTING.get(context.getIndexSettings().getSettings());
int limit = searchService.getFieldExpansionLimit();
if (numberOfFields > limit) {
StringBuilder errorMsg = new StringBuilder("field expansion ");
if (inputPattern != null) {
Expand Down
16 changes: 15 additions & 1 deletion server/src/main/java/org/opensearch/search/SearchService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@
import org.opensearch.threadpool.ThreadPool.Names;
import org.opensearch.transport.TransportRequest;
import org.opensearch.wlm.WorkloadGroupService;
import org.opensearch.index.search.QueryParserHelper;

import java.io.IOException;
import java.util.ArrayList;
Expand Down Expand Up @@ -515,6 +516,12 @@ public class SearchService extends AbstractLifecycleComponent implements IndexEv
private final Executor indexSearcherExecutor;
private final TaskResourceTrackingService taskResourceTrackingService;

private volatile int fieldExpansionLimit;

public int getFieldExpansionLimit() {
return fieldExpansionLimit;
}

private final List<SearchPlugin.ProfileMetricsProvider> pluginProfilers;

public SearchService(
Expand Down Expand Up @@ -583,7 +590,12 @@ public SearchService(
clusterService.getClusterSettings().addSettingsUpdateConsumer(LOW_LEVEL_CANCELLATION_SETTING, this::setLowLevelCancellation);

IndexSearcher.setMaxClauseCount(INDICES_MAX_CLAUSE_COUNT_SETTING.get(settings));
clusterService.getClusterSettings().addSettingsUpdateConsumer(INDICES_MAX_CLAUSE_COUNT_SETTING, IndexSearcher::setMaxClauseCount);
this.fieldExpansionLimit = INDICES_MAX_CLAUSE_COUNT_SETTING.get(clusterService.getSettings());
clusterService.getClusterSettings()
.addSettingsUpdateConsumer(INDICES_MAX_CLAUSE_COUNT_SETTING, value -> {
IndexSearcher.setMaxClauseCount(value);
this.fieldExpansionLimit = value;
});

QueryStringQueryParser.setMaxQueryStringLength(SEARCH_MAX_QUERY_STRING_LENGTH.get(settings));
clusterService.getClusterSettings()
Expand All @@ -600,6 +612,8 @@ public SearchService(

this.concurrentSearchDeciderFactories = concurrentSearchDeciderFactories;

QueryParserHelper.setSearchService(this);

this.pluginProfilers = pluginProfilers;

// Initialize QueryRewriterRegistry with cluster settings so TermsMergingRewriter
Expand Down
Loading