From 47be335a28b7c1a69320e49d59320a06e81e2d29 Mon Sep 17 00:00:00 2001 From: carlosdelest Date: Thu, 12 Dec 2024 17:41:27 +0100 Subject: [PATCH] Add capabilities to tests --- .../main/resources/match-function.csv-spec | 2 + .../main/resources/match-operator.csv-spec | 56 ++++++++++--------- 2 files changed, 31 insertions(+), 27 deletions(-) diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/match-function.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/match-function.csv-spec index 97da74f2fbfac..c3599f55b57e4 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/match-function.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/match-function.csv-spec @@ -117,6 +117,7 @@ book_no:keyword | title:text matchWithDisjunction required_capability: match_function +required_capability: full_text_functions_disjunctions from books | where match(author, "Vonnegut") or match(author, "Guinane") @@ -133,6 +134,7 @@ book_no:keyword | author:text matchWithDisjunctionAndFiltersConjunction required_capability: match_function +required_capability: full_text_functions_disjunctions from books | where (match(author, "Vonnegut") or match(author, "Guinane")) and year > 1997 diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/match-operator.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/match-operator.csv-spec index 89bb0c988a43b..46771dc843f4a 100644 --- a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/match-operator.csv-spec +++ b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/match-operator.csv-spec @@ -104,7 +104,8 @@ book_no:keyword | title:text matchWithDisjunction -required_capability: match_operator +required_capability: match_operator_colon +required_capability: full_text_functions_disjunctions from books | where author : "Vonnegut" or author : "Guinane" @@ -120,7 +121,8 @@ book_no:keyword | author:text ; matchWithDisjunctionAndFiltersConjunction -required_capability: match_operator +required_capability: match_operator_colon +required_capability: full_text_functions_disjunctions from books | where (author : "Vonnegut" or author : "Guinane") and year > 1997 @@ -133,7 +135,7 @@ book_no:keyword | author:text | year:integer ; matchWithDisjunctionAndConjunction -required_capability: match_operator +required_capability: match_operator_colon required_capability: full_text_functions_disjunctions from books @@ -145,7 +147,7 @@ book_no:keyword ; matchWithDisjunctionIncludingConjunction -required_capability: match_operator +required_capability: match_operator_colon required_capability: full_text_functions_disjunctions from books @@ -278,7 +280,7 @@ count(*): long | author.keyword:keyword ; testMatchBooleanField -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from employees @@ -294,7 +296,7 @@ Amabile | true | 2.09 ; testMatchIntegerField -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from employees @@ -306,7 +308,7 @@ emp_no:integer | first_name:keyword ; testMatchDoubleField -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from employees @@ -318,7 +320,7 @@ emp_no:integer | salary_change:double ; testMatchLongField -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from date_nanos @@ -330,7 +332,7 @@ num:long ; testMatchUnsignedLongField -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from ul_logs @@ -342,7 +344,7 @@ bytes_out:unsigned_long ; testMatchIpFieldAsString -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from sample_data @@ -354,7 +356,7 @@ client_ip:ip | message:keyword ; testMatchDateFieldAsString -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from date_nanos @@ -366,7 +368,7 @@ millis:date ; testMatchDateNanosFieldAsString -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from date_nanos @@ -378,7 +380,7 @@ nanos:date_nanos ; testMatchBooleanFieldAsString -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from employees @@ -394,7 +396,7 @@ Amabile | true | 2.09 ; testMatchIntegerFieldAsString -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from employees @@ -406,7 +408,7 @@ emp_no:integer | first_name:keyword ; testMatchDoubleFieldAsString -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from employees @@ -418,7 +420,7 @@ emp_no:integer | salary_change:double ; testMatchLongFieldAsString -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from date_nanos @@ -430,7 +432,7 @@ num:long ; testMatchUnsignedLongFieldAsString -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from ul_logs @@ -442,7 +444,7 @@ bytes_out:unsigned_long ; testMatchVersionFieldAsString -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from apps @@ -454,7 +456,7 @@ bbbbb | 2.1 ; testMatchIntegerAsDouble -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from employees @@ -467,7 +469,7 @@ emp_no:integer | first_name:keyword ; testMatchDoubleAsIntegerField -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from employees @@ -482,7 +484,7 @@ emp_no:integer | height:double ; testMatchMultipleFieldTypes -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from employees,employees_incompatible @@ -499,7 +501,7 @@ emp_as_int:integer | name_as_kw:keyword testMatchMultipleFieldTypesKeywordText -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from employees,employees_incompatible @@ -514,7 +516,7 @@ Kazuhito ; testMatchMultipleFieldTypesDoubleFloat -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from employees,employees_incompatible @@ -533,7 +535,7 @@ emp_no:integer | height_dbl:double ; testMatchMultipleFieldTypesBooleanKeyword -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from employees,employees_incompatible @@ -550,7 +552,7 @@ true ; testMatchMultipleFieldTypesLongUnsignedLong -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from employees,employees_incompatible @@ -565,7 +567,7 @@ avg_worked_seconds_ul:unsigned_long ; testMatchMultipleFieldTypesDateNanosDate -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from employees,employees_incompatible @@ -580,7 +582,7 @@ hire_date_nanos:date_nanos ; testMatchWithWrongFieldValue -required_capability: match_operator +required_capability: match_operator_colon required_capability: match_additional_types from employees,employees_incompatible