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

Jump to bottom

SQL: Fix issue regarding INTERVAL * number #42014

Merged
merged 3 commits into from
May 15, 2019
Merged

SQL: Fix issue regarding INTERVAL * number #42014

merged 3 commits into from
May 15, 2019

Conversation

matriv
Copy link
Contributor

@matriv matriv commented May 9, 2019

Interval * integer number is a valid operation which previously was
only supported for foldables (literals) and not when a field was
involved. That was because:

  1. There was no common type returned for that combination
  2. The BinaryArithmeticOperation was permitting the multiplication
    (called by fold()) but the BinaryArithmeticProcessor didn't allow it

Moreover the error message for invalid arithmetic operations was wrong
because of the issue with the overloading methods of
LoggerMessageFormat.format.

Fixes: #41239

@matriv
SQL: Fix issue regarding INTERVAL * number
542d1ee 
Interval * integer number is a valid operation which previously was
only supported for foldables (literals) and not when a field was
involved. That was because:

1. There was no common type returned for that combination
2. The `BinaryArithmeticOperation` was permitting the multiplication
(called by fold()) but the BinaryArithmeticProcessor didn't allow it

Moreover the error message for invalid arithmetic operations was wrong
because of the issue with the overloading methods of
`LoggerMessageFormat.format`.

Fixes: elastic#41239
@matriv matriv requested review from costin and astefan May 9, 2019 13:21
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-search

@matriv
Copy link
Contributor Author

matriv commented May 9, 2019

Also fixes: #41200

astefan
astefan approved these changes May 10, 2019
View reviewed changes
Copy link
Contributor

@astefan astefan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Left one comment.

...icsearch/xpack/sql/expression/predicate/operator/arithmetic/DateTimeArithmeticOperation.java Outdated
DataType l = left().dataType();
DataType r = right().dataType();

if (!(r.isDateOrTimeBased() || DataTypes.isInterval(r))) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

elasticsearch/x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/expression/predicate/operator/arithmetic/DateTimeArithmeticOperation.java

Lines 60 to 65 in 542d1ee

if (!(r.isDateOrTimeBased() || DataTypes.isInterval(r))) {
return new TypeResolution(format(null, "[{}] has arguments with incompatible types [{}] and [{}]", symbol(), l, r));
}
if (!(l.isDateOrTimeBased() || DataTypes.isInterval(l))) {
return new TypeResolution(format(null, "[{}] has arguments with incompatible types [{}] and [{}]", symbol(), l, r));
}

The code here seems a duplicate. You could combine the two conditions, no?

costin
costin approved these changes May 10, 2019
View reviewed changes
Copy link
Member

@costin costin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.
Could you add a test with one and multiple negative values to see how the sign is being handled?

Thanks,

@matriv
Copy link
Contributor Author

matriv commented May 11, 2019 •
edited
Loading

@costin could you please explain a bit more? What do you mean with one and multiple negative values?

@costin
Copy link
Member

costin commented May 11, 2019

INTERVAL '1' MINUTE * -20
- INTERVAL '1' MINUTE * 20
- INTERVAL '1' MINUTE * -20

@matriv matriv merged commit 91039ba into elastic:master May 15, 2019
@matriv matriv deleted the fix-41239 branch May 15, 2019 20:06
matriv added a commit that referenced this pull request May 15, 2019
@matriv
SQL: Fix issue regarding INTERVAL * number (#42014)
7473742 
Interval * integer number is a valid operation which previously was
only supported for foldables (literals) and not when a field was
involved. That was because:

1. There was no common type returned for that combination
2. The `BinaryArithmeticOperation` was permitting the multiplication
(called by fold()) but the BinaryArithmeticProcessor didn't allow it

Moreover the error message for invalid arithmetic operations was wrong
because of the issue with the overloading methods of
`LoggerMessageFormat.format`.

Fixes: #41239
Fixes: #41200
(cherry picked from commit 91039ba)
matriv added a commit that referenced this pull request May 15, 2019
@matriv
SQL: Fix issue regarding INTERVAL * number (#42014)
08d38da 
Interval * integer number is a valid operation which previously was
only supported for foldables (literals) and not when a field was
involved. That was because:

1. There was no common type returned for that combination
2. The `BinaryArithmeticOperation` was permitting the multiplication
(called by fold()) but the BinaryArithmeticProcessor didn't allow it

Moreover the error message for invalid arithmetic operations was wrong
because of the issue with the overloading methods of
`LoggerMessageFormat.format`.

Fixes: #41239
Fixes: #41200
(cherry picked from commit 91039ba)
matriv added a commit that referenced this pull request May 15, 2019
@matriv
SQL: Fix issue regarding INTERVAL * number (#42014)
3a20503 
Interval * integer number is a valid operation which previously was
only supported for foldables (literals) and not when a field was
involved. That was because:

1. There was no common type returned for that combination
2. The `BinaryArithmeticOperation` was permitting the multiplication
(called by fold()) but the BinaryArithmeticProcessor didn't allow it

Moreover the error message for invalid arithmetic operations was wrong
because of the issue with the overloading methods of
`LoggerMessageFormat.format`.

Fixes: #41239
Fixes: #41200
(cherry picked from commit 91039ba)
gurkankaymak pushed a commit to gurkankaymak/elasticsearch that referenced this pull request May 27, 2019
@matriv
SQL: Fix issue regarding INTERVAL * number (elastic#42014)
4b8f32b 
Interval * integer number is a valid operation which previously was
only supported for foldables (literals) and not when a field was
involved. That was because:

1. There was no common type returned for that combination
2. The `BinaryArithmeticOperation` was permitting the multiplication
(called by fold()) but the BinaryArithmeticProcessor didn't allow it

Moreover the error message for invalid arithmetic operations was wrong
because of the issue with the overloading methods of
`LoggerMessageFormat.format`.

Fixes: elastic#41239
Fixes: elastic#41200
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@astefan astefan astefan approved these changes

@costin costin costin approved these changes

Assignees
No one assigned
Labels
:Analytics/SQL SQL querying >bug v6.8.0 v7.1.0 v7.2.0 v8.0.0-alpha1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

SQL: NullPointerException when GROUPing BY
5 participants
@matriv @elasticmachine @costin @astefan @jakelandis