[9.0] ESQL: Refactor Greatest and Least functions to use evaluator map (#114036) #128429
+73
−28
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 commit refactors the Greatest function to use an evaluator map for better code organization. The changes include: - Added EVALUATOR_MAP for evaluator factory mapping - Updated toEvaluator to use map-based lookup - Added NULL type validation - Updated error messages to use getWriteableName() The refactoring improves code readability and maintainability by: - Replacing if-else chains with a map-based lookup - Centralizing evaluator factory creation - Adding consistent NULL type validation - Using getWriteableName() for error messages Relates to elastic#114036
This commit refactors the Least function to use an evaluator map for better code organization. The changes include: - Added EVALUATOR_MAP for evaluator factory mapping - Updated toEvaluator to use map-based lookup - Added NULL type validation - Updated error messages to use getWriteableName() The refactoring improves code readability and maintainability by: - Replacing if-else chains with a map-based lookup - Centralizing evaluator factory creation - Adding consistent NULL type validation - Using getWriteableName() for error messages Relates to elastic#114036
This commit adds test cases for both Greatest and Least functions to verify: - All supported data types (boolean, double, integer, long, keyword, text, version, ip, datetime, date_nanos) - NULL value handling - String comparisons - Numeric comparisons - Boolean operations - Date/time comparisons The tests ensure that: - Both functions handle NULL values correctly - Type validation works as expected - Evaluator selection is correct for each data type - Results are computed correctly for all supported types Relates to elastic#114036
elasticsearchmachine
added
needs:triage
alex-spies
added
:Analytics/ES|QL
elasticsearchmachine
added
the
Team:Analytics
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
idegtiarenko
reviewed
Jun 3, 2025
| throw EsqlIllegalArgumentException.illegalDataType(dataType); | ||
| } | ||
|
|
||
| return evaluatorFactory.apply(factories); |
There was a problem hiding this comment.
I wonder if this is one of the things worth doing with java`s switch? Each data type is enum and compile time constant
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
ESQL: Refactor Greatest and Least functions to use evaluator map
Description
This PR refactors the
GreatestandLeastfunctions to use an evaluator map for better code organization and maintainability. The changes include:EVALUATOR_MAPto map data types to their corresponding evaluator factoriestoEvaluatormethod to use the map instead of if-else chainsChanges
Greatest.java:EVALUATOR_MAPfor evaluator factory mappingtoEvaluatorto use map-based lookupgetWriteableName()Least.java:EVALUATOR_MAPfor evaluator factory mappingtoEvaluatorto use map-based lookupgetWriteableName()Testing
All existing tests pass (
GreatestTests.java, LeastTests.java)GreatestTests.javaLeastTests.javaTest coverage includes:
Related Issues
Closes #114036
Checklist
Backport