Populate cross cluster info after index resolution #137317
Draft
+150
−118
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
idegtiarenko
requested review from
craigtaverner,
fang-xing-esql,
luigidellaquila and
smalyshev
idegtiarenko
added
>non-issue
Team:Analytics
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
idegtiarenko
commented
Oct 29, 2025
| preAnalysis.useAggregateMetricDoubleWhenNotSupported(), | ||
| preAnalysis.useDenseVectorWhenNotSupported(), | ||
| listener.delegateFailureAndWrap((l, indexResolution) -> { | ||
| EsqlCCSUtils.initCrossClusterInfo(indicesExpressionGrouper, verifier.licenseState(), indexPattern, executionInfo); |
There was a problem hiding this comment.
Here the state will be populated from field caps resolvedTo data structure if that is available.
We will keep existing approach for responses from older clusters that do not have this information available.
idegtiarenko
commented
Oct 29, 2025
| final String indexExpr = Strings.arrayToCommaDelimitedString(entry.getValue().indices()); | ||
| groupedIndices.forEach((clusterAlias, indexGroup) -> { | ||
| executionInfo.swapCluster(clusterAlias, (k, v) -> { | ||
| assert v == null : "No cluster for " + clusterAlias + " should have been added to ExecutionInfo yet"; |
There was a problem hiding this comment.
This is not longer the case. We could have 2 distinct views targeting the same remote. In such case, their expressions are going to be concatenated.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Today we populate cross cluster state in esql execution info before performing main field caps.
This has several issues:
logs-*,-*2024+metrics-*,-*2025would incorrectly exclude logs-2025 and metrics-2024. This in turn can exclude the entire remote if those are the only indices on it).org.elasticsearch.indices.IndicesExpressionGrouper#groupIndicesthat could not correctly expand flat/cps expressions.This change moves cross cluster info population to after main field caps result is received.