ESQL: Fix function registry concurrency issues on constructor #123492
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
ivancea added >bug Team:Analytics 
Collaborator
| Hi @ivancea, I've created a changelog YAML for you. |
ivancea commented Feb 26, 2025
Contributor Author
There was a problem hiding this comment.
Is there a reason for this class to not be "static", and the instance getter to not always return the corresponding registry (snapshot or non-snapshot)?
Could be a fairly simple improvement, avoiding recreating those maps again and again
ivancea commented Feb 26, 2025
| ); | ||
| } | ||
| | ||
| protected void buildDataTypesForStringLiteralConversion(FunctionDefinition[]... groupFunctions) { |
Contributor Author
There was a problem hiding this comment.
This was just moved, as it's now protected, with the "register()" functions
ivancea commented Feb 26, 2025
| public class Delay extends UnaryScalarFunction { | ||
| public static final NamedWriteableRegistry.Entry ENTRY = new NamedWriteableRegistry.Entry(Expression.class, "Delay", Delay::new); | ||
| | ||
| @FunctionInfo(returnType = { "boolean" }, description = "Sleeps for a duration for every row. For debug purposes only.") |
Contributor Author
There was a problem hiding this comment.
This is needed within the buildDataTypesForStringLiteralConversion() -> description() chain.
It won't be used for anything, as this function has no documentation, but I'd rather have it here than changing the registry code for this case
Collaborator
| Pinging @elastic/es-analytical-engine (Team:Analytics) |
| private final Map<String, FunctionDefinition> defs = new LinkedHashMap<>(); | ||
| private final Map<String, String> aliases = new HashMap<>(); | ||
| private final Map<Class<? extends Function>, String> names = new HashMap<>(); | ||
| private final Map<Class<? extends Function>, List<DataType>> dataTypesForStringLiteralConversions = new LinkedHashMap<>(); |
idegtiarenko approved these changes Feb 26, 2025
fang-xing-esql approved these changes Feb 26, 2025
Member
fang-xing-esql left a comment
fang-xing-esql left a comment There was a problem hiding this comment.
LGTM, thank you @ivancea ! Just to be extra cautious, perhaps add test-releases label, as a call to snapshotRegistry is added.
This was referenced Feb 27, 2025
Collaborator
ivancea added a commit to ivancea/elasticsearch that referenced this pull request Feb 27, 2025
…c#123492) Fixes elastic#123430 There were 2 problems here: - We were filling a static field (used to auto-cast string literals) within a constructor, which is also called in multiple places - The field was only filled with non-snapshot functions, so snapshot function auto-casting wasn't possible Fixed both bugs by making the field non-static instead, and a fix to use the snapshot registry (if available) in the string casting rule.
ivancea added a commit to ivancea/elasticsearch that referenced this pull request Feb 27, 2025
…c#123492) Fixes elastic#123430 There were 2 problems here: - We were filling a static field (used to auto-cast string literals) within a constructor, which is also called in multiple places - The field was only filled with non-snapshot functions, so snapshot function auto-casting wasn't possible Fixed both bugs by making the field non-static instead, and a fix to use the snapshot registry (if available) in the string casting rule.
elasticsearchmachine pushed a commit that referenced this pull request Feb 27, 2025
… (#123584) Fixes #123430 There were 2 problems here: - We were filling a static field (used to auto-cast string literals) within a constructor, which is also called in multiple places - The field was only filled with non-snapshot functions, so snapshot function auto-casting wasn't possible Fixed both bugs by making the field non-static instead, and a fix to use the snapshot registry (if available) in the string casting rule.
elasticsearchmachine pushed a commit that referenced this pull request Feb 27, 2025
… (#123583) Fixes #123430 There were 2 problems here: - We were filling a static field (used to auto-cast string literals) within a constructor, which is also called in multiple places - The field was only filled with non-snapshot functions, so snapshot function auto-casting wasn't possible Fixed both bugs by making the field non-static instead, and a fix to use the snapshot registry (if available) in the string casting rule.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 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.
Fixes #123430
There were 2 problems here:
Fixed both bugs by making the field non-static instead, and a fix to use the snapshot registry (if available) in the string casting rule.