ESQL: Add support for TEXT fields in comparison operators and SORT #98528
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,239 @@ | ||
| --- | ||
| setup: | ||
|
|
||
| - do: | ||
| indices.create: | ||
| index: test | ||
| body: | ||
| mappings: | ||
| properties: | ||
| "emp_no": | ||
| type: long | ||
| name: | ||
| type: keyword | ||
| job: | ||
| type: text | ||
| fields: | ||
| raw: | ||
| type: keyword | ||
| tag: | ||
| type: text | ||
|
|
||
| - do: | ||
| bulk: | ||
| index: test | ||
| refresh: true | ||
| body: | ||
| - { "index": { } } | ||
| - { "emp_no": 10, "name": "Jenny", "job": "IT Director", "tag": "foo bar" } | ||
| - { "index": { } } | ||
| - { "emp_no": 20, "name": "John", "job": "Payroll Specialist", "tag": "baz" } | ||
| --- | ||
| "filter by text": | ||
| - do: | ||
| esql.query: | ||
| body: | ||
| query: 'from test | where tag == "baz" | keep emp_no, name, job, tag' | ||
|
|
||
| - match: { columns.0.name: "emp_no" } | ||
| - match: { columns.0.type: "long" } | ||
| - match: { columns.1.name: "name" } | ||
| - match: { columns.1.type: "keyword" } | ||
| - match: { columns.2.name: "job" } | ||
| - match: { columns.2.type: "text" } | ||
| - match: { columns.3.name: "tag" } | ||
| - match: { columns.3.type: "text" } | ||
|
|
||
| - length: { values: 1 } | ||
| - match: { values.0: [ 20, "John", "Payroll Specialist", "baz"] } | ||
|
|
||
| --- | ||
| "like by text": | ||
| - do: | ||
| esql.query: | ||
| body: | ||
| query: 'from test | where tag LIKE "*az" | keep emp_no, name, job, tag' | ||
|
|
||
| - match: { columns.0.name: "emp_no" } | ||
| - match: { columns.0.type: "long" } | ||
| - match: { columns.1.name: "name" } | ||
| - match: { columns.1.type: "keyword" } | ||
| - match: { columns.2.name: "job" } | ||
| - match: { columns.2.type: "text" } | ||
| - match: { columns.3.name: "tag" } | ||
| - match: { columns.3.type: "text" } | ||
|
|
||
| - length: { values: 1 } | ||
| - match: { values.0: [ 20, "John", "Payroll Specialist", "baz"] } | ||
|
|
||
| --- | ||
| "rlike by text": | ||
| - do: | ||
| esql.query: | ||
| body: | ||
| query: 'from test | where tag RLIKE ".*az" | keep emp_no, name, job, tag' | ||
|
|
||
| - match: { columns.0.name: "emp_no" } | ||
| - match: { columns.0.type: "long" } | ||
| - match: { columns.1.name: "name" } | ||
| - match: { columns.1.type: "keyword" } | ||
| - match: { columns.2.name: "job" } | ||
| - match: { columns.2.type: "text" } | ||
| - match: { columns.3.name: "tag" } | ||
| - match: { columns.3.type: "text" } | ||
|
|
||
| - length: { values: 1 } | ||
| - match: { values.0: [ 20, "John", "Payroll Specialist", "baz"] } | ||
|
|
||
| --- | ||
| "eval and filter text": | ||
| - do: | ||
| esql.query: | ||
| body: | ||
| query: 'from test | eval x = tag | where x == "baz" | keep emp_no, name, job, x' | ||
|
|
||
| - match: { columns.0.name: "emp_no" } | ||
| - match: { columns.0.type: "long" } | ||
| - match: { columns.1.name: "name" } | ||
| - match: { columns.1.type: "keyword" } | ||
| - match: { columns.2.name: "job" } | ||
| - match: { columns.2.type: "text" } | ||
| - match: { columns.3.name: "x" } | ||
| - match: { columns.3.type: "text" } | ||
|
|
||
| - length: { values: 1 } | ||
| - match: { values.0: [ 20, "John", "Payroll Specialist", "baz"] } | ||
|
|
||
| --- | ||
| "filter on text multi-field": | ||
| - do: | ||
| esql.query: | ||
| body: | ||
| query: 'from test | where job == "IT Director" | keep emp_no, name, job, tag' | ||
|
|
||
| - match: { columns.0.name: "emp_no" } | ||
| - match: { columns.0.type: "long" } | ||
| - match: { columns.1.name: "name" } | ||
| - match: { columns.1.type: "keyword" } | ||
| - match: { columns.2.name: "job" } | ||
| - match: { columns.2.type: "text" } | ||
| - match: { columns.3.name: "tag" } | ||
| - match: { columns.3.type: "text" } | ||
|
|
||
| - length: { values: 1 } | ||
| - match: { values.0: [ 10, "Jenny", "IT Director", "foo bar"] } | ||
|
|
||
| --- | ||
| "like by multi-field text": | ||
| - do: | ||
| esql.query: | ||
| body: | ||
| query: 'from test | where job LIKE "*Specialist" | keep emp_no, name, job, tag' | ||
|
|
||
| - match: { columns.0.name: "emp_no" } | ||
| - match: { columns.0.type: "long" } | ||
| - match: { columns.1.name: "name" } | ||
| - match: { columns.1.type: "keyword" } | ||
| - match: { columns.2.name: "job" } | ||
| - match: { columns.2.type: "text" } | ||
| - match: { columns.3.name: "tag" } | ||
| - match: { columns.3.type: "text" } | ||
|
|
||
| - length: { values: 1 } | ||
| - match: { values.0: [ 20, "John", "Payroll Specialist", "baz"] } | ||
|
|
||
| --- | ||
| "rlike by multi-field text": | ||
| - do: | ||
| esql.query: | ||
| body: | ||
| query: 'from test | where job RLIKE ".*Specialist" | keep emp_no, name, job, tag' | ||
|
|
||
| - match: { columns.0.name: "emp_no" } | ||
| - match: { columns.0.type: "long" } | ||
| - match: { columns.1.name: "name" } | ||
| - match: { columns.1.type: "keyword" } | ||
| - match: { columns.2.name: "job" } | ||
| - match: { columns.2.type: "text" } | ||
| - match: { columns.3.name: "tag" } | ||
| - match: { columns.3.type: "text" } | ||
|
|
||
| - length: { values: 1 } | ||
| - match: { values.0: [ 20, "John", "Payroll Specialist", "baz"] } | ||
|
|
||
|
|
||
| --- | ||
| "sort by text": | ||
| - do: | ||
| esql.query: | ||
| body: | ||
| query: 'from test | sort tag | keep emp_no, name, job, tag' | ||
|
|
||
| - match: { columns.0.name: "emp_no" } | ||
| - match: { columns.0.type: "long" } | ||
| - match: { columns.1.name: "name" } | ||
| - match: { columns.1.type: "keyword" } | ||
| - match: { columns.2.name: "job" } | ||
| - match: { columns.2.type: "text" } | ||
| - match: { columns.3.name: "tag" } | ||
| - match: { columns.3.type: "text" } | ||
|
|
||
| - length: { values: 2 } | ||
| - match: { values.0: [ 20, "John", "Payroll Specialist", "baz"] } | ||
| - match: { values.1: [ 10, "Jenny", "IT Director", "foo bar"] } | ||
|
|
||
|
|
||
| --- | ||
| "sort by text multi-field": | ||
| - do: | ||
| esql.query: | ||
| body: | ||
| query: 'from test | sort job | keep emp_no, name, job, tag' | ||
|
|
||
| - match: { columns.0.name: "emp_no" } | ||
| - match: { columns.0.type: "long" } | ||
| - match: { columns.1.name: "name" } | ||
| - match: { columns.1.type: "keyword" } | ||
| - match: { columns.2.name: "job" } | ||
| - match: { columns.2.type: "text" } | ||
| - match: { columns.3.name: "tag" } | ||
| - match: { columns.3.type: "text" } | ||
|
|
||
| - length: { values: 2 } | ||
| - match: { values.0: [ 10, "Jenny", "IT Director", "foo bar"] } | ||
| - match: { values.1: [ 20, "John", "Payroll Specialist", "baz"] } | ||
|
|
||
| --- | ||
| "sort by text multi-field desc": | ||
| - do: | ||
| esql.query: | ||
| body: | ||
| query: 'from test | sort job desc | keep emp_no, name, job, tag' | ||
|
|
||
| - match: { columns.0.name: "emp_no" } | ||
| - match: { columns.0.type: "long" } | ||
| - match: { columns.1.name: "name" } | ||
| - match: { columns.1.type: "keyword" } | ||
| - match: { columns.2.name: "job" } | ||
| - match: { columns.2.type: "text" } | ||
| - match: { columns.3.name: "tag" } | ||
| - match: { columns.3.type: "text" } | ||
|
|
||
| - length: { values: 2 } | ||
| - match: { values.0: [ 20, "John", "Payroll Specialist", "baz"] } | ||
| - match: { values.1: [ 10, "Jenny", "IT Director", "foo bar"] } | ||
|
|
||
|
|
||
| --- | ||
| "text in functions": | ||
| - do: | ||
| esql.query: | ||
| body: | ||
| query: 'from test | sort name | eval description = concat(name, " - ", job) | keep description' | ||
|
|
||
| - match: { columns.0.name: "description" } | ||
| - match: { columns.0.type: "keyword" } | ||
|
|
||
| - length: { values: 2 } | ||
| - match: { values.0: [ "Jenny - IT Director"] } | ||
| - match: { values.1: [ "John - Payroll Specialist"] } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,8 @@ | |
| package org.elasticsearch.xpack.esql.analysis; | ||
|
|
||
| import org.elasticsearch.xpack.esql.expression.function.UnsupportedAttribute; | ||
| import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.Equals; | ||
| import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.NotEquals; | ||
| import org.elasticsearch.xpack.esql.plan.logical.Dissect; | ||
| import org.elasticsearch.xpack.esql.plan.logical.Eval; | ||
| import org.elasticsearch.xpack.esql.plan.logical.Grok; | ||
|
|
@@ -28,8 +30,6 @@ | |
| import org.elasticsearch.xpack.ql.expression.function.aggregate.AggregateFunction; | ||
| import org.elasticsearch.xpack.ql.expression.predicate.BinaryOperator; | ||
| import org.elasticsearch.xpack.ql.expression.predicate.operator.comparison.BinaryComparison; | ||
| import org.elasticsearch.xpack.ql.plan.logical.Aggregate; | ||
| import org.elasticsearch.xpack.ql.plan.logical.Filter; | ||
| import org.elasticsearch.xpack.ql.plan.logical.Limit; | ||
|
|
@@ -258,6 +258,9 @@ public static Failure validateBinaryComparison(BinaryComparison bc) { | |
| if (false == r.resolved()) { | ||
| return fail(bc, r.message()); | ||
| } | ||
| if (DataTypes.isString(bc.left().dataType()) && DataTypes.isString(bc.right().dataType())) { | ||
|
There was a problem hiding this comment. Why is this needed? Aren't the operators performing their own, full type resolution? There was a problem hiding this comment. See my comment above #98528 (comment) |
||
| return null; | ||
| } | ||
| if (bc.left().dataType() != bc.right().dataType()) { | ||
| return fail( | ||
| bc, | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.esql.expression; | ||
|
|
||
| import org.elasticsearch.xpack.ql.expression.Expression; | ||
| import org.elasticsearch.xpack.ql.tree.NodeInfo; | ||
| import org.elasticsearch.xpack.ql.tree.Source; | ||
| import org.elasticsearch.xpack.ql.type.DataTypes; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class Order extends org.elasticsearch.xpack.ql.expression.Order { | ||
| public Order(Source source, Expression child, OrderDirection direction, NullsPosition nulls) { | ||
| super(source, child, direction, nulls); | ||
| } | ||
|
|
||
| @Override | ||
| protected TypeResolution resolveType() { | ||
| if (DataTypes.isString(child().dataType())) { | ||
| return TypeResolution.TYPE_RESOLVED; | ||
| } | ||
| return super.resolveType(); | ||
| } | ||
|
|
||
| @Override | ||
| public Order replaceChildren(List<Expression> newChildren) { | ||
| return new Order(source(), newChildren.get(0), direction(), nullsPosition()); | ||
| } | ||
|
|
||
| @Override | ||
| protected NodeInfo<org.elasticsearch.xpack.ql.expression.Order> info() { | ||
| return NodeInfo.create(this, Order::new, child(), direction(), nullsPosition()); | ||
| } | ||
|
|
||
| } |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This rule made sense before since the comparison classes were part of QL - now that we have our own classes, the type validation should be within the comparison classes themselves.
There's no advantage of it being outside rather it's confusing since the classes inherit the QL behavior which is used inside resolution and then complemented through the Verifier, which is both redundant and error-prone (the type resolution and Verifier need to be kept in sync and not trip over one another).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did some tests, moving this logic inside the resolution flow; the fix is not complex, but it has some practical implications:
ResolveFunctionsrule) and fails if we keep the logic as it is. So we need to review the logic a bit.AbstractBinaryComparisonTestCasedoes not consider these automatic conversions (and today it makes no distinction between foldable and non-foldable expressions, see above), so we have to review that as well.If you don't mind, I'd prefer to address this problem with a follow-up PR and discuss the changes separately
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
WFM - please raise an issue that explains the follow-up items and link it here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
#99035