ES-10936 Include project ID in enrich cache key #128908
Merged
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
This prevents collisions in the enrich cache for different projects. Collisions would be unlikely without this chance, since the key includes the index name, and the index name includes a millisecond-precision timestamp, so it would only happen if two projects executed enrich policies with the same name at the same time, or if one project manipulated the alias to match the timestamp of the other project. However, collisions would have serious consequences (allowing read-across of data between projects). This change closes that gap.
PeteGillinElastic
force-pushed
the
ES-10936-mp-enrich-cache
branch
from
7ebab8d to
a7c4467
Compare
elasticsearchmachine
added
the
needs:triage
PeteGillinElastic
added
>non-issue
:Data Management/Ingest Node
elasticsearchmachine
added
the
Team:Data Management
Collaborator
|
Pinging @elastic/es-data-management (Team:Data Management) |
nielsbauman
approved these changes
Jun 4, 2025
| */ | ||
| // Visibility for testing | ||
| record CacheKey(String enrichIndex, Object lookupValue, int maxMatches) { | ||
| record CacheKey(String enrichIndex, ProjectId projectId, Object lookupValue, int maxMatches) { |
Contributor
There was a problem hiding this comment.
Tiniest nit ever: intuitively, I would have put the project ID as the first parameter because it has the largest "scope". Maybe that's just a weird personal preference I have, so this is definitely optional.
Member
Author
There was a problem hiding this comment.
No, that makes sense. Done, and thanks.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
This prevents collisions in the enrich cache for different projects.
Collisions would be unlikely without this chance, since the key includes the index name, and the index name includes a millisecond-precision timestamp, so it would only happen if two projects executed enrich policies with the same name at the same time, or if one project manipulated the alias to match the timestamp of the other project.
However, collisions would have serious consequences (allowing read-across of data between projects). This change closes that gap.