SQL: Implement data type verification for conditionals #35916
Merged
Conversation
This file contains 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
Add special verifier rule to check that the arguments of conditional functions are of the same or compatible types. This way the user gets a descriptive error message with line number and column indicating where is the offending argument. Closes: elastic#35907
|
Pinging @elastic/es-search |
astefan
reviewed
Nov 26, 2018
| e.forEachUp((ConditionalFunction greatest) -> { | ||
| int idx = 0; | ||
| DataType dt = DataType.NULL; | ||
| for (; idx < greatest.children().size(); idx++) { |
There was a problem hiding this comment.
Maybe add a one line comment here about this loop and the next one? (iterating until the first non-null value is found then continue and check for types equality)
costin
approved these changes
Nov 27, 2018
| @@ -282,14 +284,13 @@ private static Failure fail(Node<?> source, String message, Object... args) { | |||
| */ | |||
| private static boolean checkGroupBy(LogicalPlan p, Set<Failure> localFailures, | |||
| Map<String, Function> resolvedFunctions, Set<LogicalPlan> groupingFailures) { | |||
| return checkGroupByAgg(p, localFailures, groupingFailures, resolvedFunctions) | |||
| && checkGroupByOrder(p, localFailures, groupingFailures, resolvedFunctions) | |||
| return checkGroupByAgg(p, localFailures, resolvedFunctions) | |||
There was a problem hiding this comment.
I assume the removed parameters were not needed inside the methods?
| // Find the data type of the first non-null argument | ||
| for (; idx < cf.children().size(); idx++) { | ||
| DataType childDT = cf.children().get(idx).dataType(); | ||
| if (childDT != DataType.NULL) { |
There was a problem hiding this comment.
I opt for Expressions.isNull as it might catch null literals with a different type than NULL.
| } | ||
| } | ||
| // Compare the data type of the rest of the arguments with the data type of first non-null argument | ||
| for (; idx < cf.children().size(); idx++) { |
There was a problem hiding this comment.
the loops should be folded into one for-loop with an if/else:
DataType dt = DataType.NULL;
for (Expression child : cf.children()) {
if (dt == NULL) {
if (Expressions.isNull(child) == false) {
dt = child.dataType();
}
} else {
if (areTypesCompatible(...)) {
...
}
}
}
matriv
added a commit
that referenced
this pull request
Nov 27, 2018
Add special verifier rule to check that the arguments of conditional functions are of the same or compatible types. This way the user gets a descriptive error message with line number and column indicating where is the offending argument. Closes: #35907
|
Backported to |
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.
Add special verifier rule to check that the arguments of conditional
functions are of the same or compatible types. This way the user gets
a descriptive error message with line number and column indicating
where is the offending argument.
Closes: #35907