Skip to content
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

Smarter field caps with subscribable listener #116755

Merged
merged 37 commits into from
Dec 3, 2024
Merged

Smarter field caps with subscribable listener #116755

Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
ae8962f
WIP
astefan Oct 28, 2024
1a9269e
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Oct 31, 2024
b91df0b
wip
astefan Nov 4, 2024
93124b8
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Nov 13, 2024
7c68f24
whatevs
astefan Nov 13, 2024
2b93f8a
Merge branch 'main' into smarter_field_caps_subscribableListener
elasticmachine Nov 13, 2024
249bba5
Small fix, big impact
astefan Nov 14, 2024
81b77ca
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Nov 14, 2024
a902f9c
Merge branch 'smarter_field_caps_subscribableListener' of https://git…
astefan Nov 14, 2024
f0b5b89
Fix some things and rewrite the listeners a bit
astefan Nov 15, 2024
d9a10d7
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Nov 15, 2024
8c3a05a
Link the original Listener to the Subscribable one, as well
astefan Nov 18, 2024
3a3a6c1
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Nov 18, 2024
c396424
Small fix
astefan Nov 18, 2024
06606d5
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Nov 18, 2024
9ef19a0
wip
astefan Nov 19, 2024
2d82e19
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Nov 21, 2024
d7bb130
Merge branch 'main' into smarter_field_caps_subscribableListener
elasticmachine Nov 21, 2024
95dfb2f
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Nov 25, 2024
baa6891
Fix after update from main
astefan Nov 25, 2024
5eb3dc6
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Nov 25, 2024
850c9aa
Merge branch 'smarter_field_caps_subscribableListener' of https://git…
astefan Nov 25, 2024
74185d4
Put back code that existed before update from main
astefan Nov 25, 2024
8d55211
Small fix
astefan Nov 26, 2024
f4fcfd3
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Nov 26, 2024
3be6c3b
spotless
astefan Nov 26, 2024
8e5e462
Add IT tests
astefan Nov 26, 2024
b55a9fa
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Nov 26, 2024
0b7111b
Don't run the tests in async as well; it's too unpredictable
astefan Nov 26, 2024
2789116
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Nov 26, 2024
1819f45
Update docs/changelog/116755.yaml
astefan Nov 26, 2024
41f3bf2
Merge branch 'main' into smarter_field_caps_subscribableListener
astefan Nov 27, 2024
ba3425c
Address reviews
astefan Dec 3, 2024
43b5d71
Merge branch 'main' of https://github.com/elastic/elasticsearch into …
astefan Dec 3, 2024
56af4c8
Merge branch 'smarter_field_caps_subscribableListener' of https://git…
astefan Dec 3, 2024
2e0493d
Minor change
astefan Dec 3, 2024
465aa3c
Merge branch 'main' into smarter_field_caps_subscribableListener
elasticmachine Dec 3, 2024
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
2 changes: 1 addition & 1 deletion ...k/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/enrich/EnrichPolicyResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ public void messageReceived(LookupRequest request, TransportChannel channel, Tas
}
try (ThreadContext.StoredContext ignored = threadContext.stashWithOrigin(ClientHelper.ENRICH_ORIGIN)) {
String indexName = EnrichPolicy.getBaseName(policyName);
indexResolver.resolveAsMergedMapping(indexName, IndexResolver.ALL_FIELDS, refs.acquire(indexResult -> {
indexResolver.resolveAsMergedMapping(indexName, IndexResolver.ALL_FIELDS, null, refs.acquire(indexResult -> {
if (indexResult.isValid() && indexResult.get().concreteIndices().size() == 1) {
EsIndex esIndex = indexResult.get();
var concreteIndices = Map.of(request.clusterAlias, Iterables.get(esIndex.concreteIndices(), 0));
Expand Down
Loading