Skip to content

Concurrent lookup index resolution #132242

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

Closed
wants to merge 1 commit into from
Closed

Concurrent lookup index resolution #132242

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 17 additions & 13 deletions x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/session/EsqlSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.fieldcaps.FieldCapabilitiesFailure;
import org.elasticsearch.action.search.ShardSearchFailure;
import org.elasticsearch.action.support.RefCountingListener;
import org.elasticsearch.action.support.SubscribableListener;
import org.elasticsearch.common.collect.Iterators;
import org.elasticsearch.common.lucene.BytesRefs;
Expand Down Expand Up @@ -85,6 +86,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;

Expand Down Expand Up @@ -402,11 +404,15 @@ public void analyzedPlan(
preAnalysis.inferencePlans,
l.map(preAnalysisResult::withInferenceResolution)
)
);
// first resolve the lookup indices, then the main indices
for (var index : preAnalysis.lookupIndices) {
listener = listener.andThen((l, preAnalysisResult) -> preAnalyzeLookupIndex(index, preAnalysisResult, executionInfo, l));
}
)
// first resolve the lookup indices, then the main indices
.<PreAnalysisResult>andThen((l, preAnalysisResult) -> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A comment wouldn't hurt to make more clear that this runs for all lookup indices in parallel.

try (var refs = new RefCountingListener(l.map(ignored -> preAnalysisResult))) {
for (var index : preAnalysis.lookupIndices) {
preAnalyzeLookupIndex(index, preAnalysisResult, executionInfo, refs.acquire());
}
}
});
listener.<PreAnalysisResult>andThen((l, result) -> {
// resolve the main indices
preAnalyzeMainIndices(preAnalysis, executionInfo, result, requestFilter, l);
Expand Down Expand Up @@ -448,7 +454,7 @@ private void preAnalyzeLookupIndex(
IndexPattern lookupIndexPattern,
PreAnalysisResult result,
EsqlExecutionInfo executionInfo,
ActionListener<PreAnalysisResult> listener
ActionListener<Void> listener
) {
String localPattern = lookupIndexPattern.indexPattern();
assert RemoteClusterAware.isRemoteIndexName(localPattern) == false
Expand All @@ -469,12 +475,10 @@ private void preAnalyzeLookupIndex(
return;
}
// call the EsqlResolveFieldsAction (field-caps) to resolve indices and get field types
indexResolver.resolveAsMergedMapping(
patternWithRemotes,
fieldNames,
null,
listener.map(indexResolution -> receiveLookupIndexResolution(result, localPattern, executionInfo, indexResolution))
);
indexResolver.resolveAsMergedMapping(patternWithRemotes, fieldNames, null, listener.map(indexResolution -> {
receiveLookupIndexResolution(result, localPattern, executionInfo, indexResolution);
return null;
}));
}

private void skipClusterOrError(String clusterAlias, EsqlExecutionInfo executionInfo, String message) {
Expand Down Expand Up @@ -812,7 +816,7 @@ public record PreAnalysisResult(
) {

public PreAnalysisResult(EnrichResolution enrichResolution, Set<String> fieldNames, Set<String> wildcardJoinIndices) {
this(null, new HashMap<>(), enrichResolution, fieldNames, wildcardJoinIndices, InferenceResolution.EMPTY);
this(null, new ConcurrentHashMap<>(), enrichResolution, fieldNames, wildcardJoinIndices, InferenceResolution.EMPTY);
}

PreAnalysisResult withInferenceResolution(InferenceResolution newInferenceResolution) {
Expand Down