Skip to content

Commit f0eb7d8

Browse files
committed
Fix capabilities
1 parent ce30c76 commit f0eb7d8

File tree

6 files changed

+15
-10
lines changed

6 files changed

+15
-10
lines changed

x-pack/plugin/esql/qa/testFixtures/src/main/resources/kql-function.csv-spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ emp_no:integer | first_name:keyword | last_name:keyword
154154

155155
testKqlWithNonPushableDisjunctions
156156
required_capability: kql_function
157-
required_capability: full_text_functions_disjunctions
157+
required_capability: full_text_functions_disjunctions_compute_engine
158158

159159
from books
160160
| where kql("title:lord") or length(title) > 130
@@ -172,7 +172,7 @@ book_no:keyword
172172

173173
testKqlWithNonPushableDisjunctionsOnComplexExpressions
174174
required_capability: kql_function
175-
required_capability: full_text_functions_disjunctions
175+
required_capability: full_text_functions_disjunctions_compute_engine
176176

177177
from books
178178
| where (kql("title:lord") and ratings > 4.5) or (kql("author:dostoevsky") and length(title) > 50)

x-pack/plugin/esql/qa/testFixtures/src/main/resources/match-function.csv-spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -676,7 +676,7 @@ host:keyword | semantic_text_field:text
676676

677677
testMatchWithNonPushableDisjunctions
678678
required_capability: match_function
679-
required_capability: full_text_functions_disjunctions
679+
required_capability: full_text_functions_disjunctions_compute_engine
680680

681681
from books
682682
| where match(title, "lord") or length(title) > 130
@@ -694,7 +694,7 @@ book_no:keyword
694694

695695
testMatchWithNonPushableDisjunctionsOnComplexExpressions
696696
required_capability: match_function
697-
required_capability: full_text_functions_disjunctions
697+
required_capability: full_text_functions_disjunctions_compute_engine
698698

699699
from books
700700
| where (match(title, "lord") and ratings > 4.5) or (match(author, "dostoevsky") and length(title) > 50)

x-pack/plugin/esql/qa/testFixtures/src/main/resources/match-operator.csv-spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ host:keyword | semantic_text_field:text
686686

687687
testMatchWithNonPushableDisjunctions
688688
required_capability: match_operator_colon
689-
required_capability: full_text_functions_disjunctions
689+
required_capability: full_text_functions_disjunctions_compute_engine
690690

691691
from books
692692
| where title:"lord" or length(title) > 130
@@ -704,7 +704,7 @@ book_no:keyword
704704

705705
testMatchWithNonPushableDisjunctionsOnComplexExpressions
706706
required_capability: match_operator_colon
707-
required_capability: full_text_functions_disjunctions
707+
required_capability: full_text_functions_disjunctions_compute_engine
708708

709709
from books
710710
| where (title:"lord" and ratings > 4.5) or (author:"dostoevsky" and length(title) > 50)

x-pack/plugin/esql/qa/testFixtures/src/main/resources/qstr-function.csv-spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ emp_no:integer | first_name:keyword | last_name:keyword
153153

154154
testQstrWithNonPushableDisjunctions
155155
required_capability: qstr_function
156-
required_capability: full_text_functions_disjunctions
156+
required_capability: full_text_functions_disjunctions_compute_engine
157157

158158
from books
159159
| where qstr("title:lord") or length(title) > 130
@@ -171,7 +171,7 @@ book_no:keyword
171171

172172
testQstrWithNonPushableDisjunctionsOnComplexExpressions
173173
required_capability: qstr_function
174-
required_capability: full_text_functions_disjunctions
174+
required_capability: full_text_functions_disjunctions_compute_engine
175175

176176
from books
177177
| where (qstr("title:lord") and ratings > 4.5) or (qstr("author:dostoevsky") and length(title) > 50)

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,12 @@ public enum Cap {
738738
/**
739739
* Support named argument for function in map format.
740740
*/
741-
OPTIONAL_NAMED_ARGUMENT_MAP_FOR_FUNCTION(Build.current().isSnapshot());
741+
OPTIONAL_NAMED_ARGUMENT_MAP_FOR_FUNCTION(Build.current().isSnapshot()),
742+
743+
/**
744+
* Full text functions can be used in disjunctions as they are implemented in compute engine
745+
*/
746+
FULL_TEXT_FUNCTIONS_DISJUNCTIONS_COMPUTE_ENGINE;
742747

743748
private final boolean enabled;
744749

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/180_match_operator.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ setup:
176176
- method: POST
177177
path: /_query
178178
parameters: [ method, path, parameters, capabilities ]
179-
capabilities: [ full_text_functions_disjunctions ]
179+
capabilities: [ full_text_functions_disjunctions_compute_engine ]
180180
reason: "Full text functions disjunctions support"
181181
- do:
182182
allowed_warnings_regex:

0 commit comments

Comments
 (0)