[8.19] [ES|QL] Add MATCH_PHRASE (#127661) #129215

kderusso · 2025-06-10T17:41:35Z

Backport

This will backport the following commits from main to 8.19:

Questions ?

Please refer to the Backport tool documentation

* Initial commit of match_phrase * Add MatchPhraseQueryTests * First pass at CSV specs * Update docs/changelog/127661.yaml * Refactor so MatchPhrase doesn't use all fulltext test cases, just text only * Fix tests * Add some CSV test cases * Fix test * Update changelog * Update tests * Comment out MATCH_PHRASE in search-functions Markdown * Minor PR feedback * PR feedback - refactor/consolidate code * Add some more tests * Fix some tests * [CI] Auto commit changes from spotless * Fix tests * PR feedback - add tests, support boost and numeric data * Revert "PR feedback - add tests, support boost and numeric data" This reverts commit 4e7a699. * Apply testing/PR feedback outside numeric support only * Regenerate docs * Add negative test * Update x-pack/plugin/esql/qa/testFixtures/src/main/resources/match-phrase-function.csv-spec Co-authored-by: Carlos Delgado <6339205+carlosdelest@users.noreply.github.com> * Update x-pack/plugin/esql/qa/testFixtures/src/main/resources/match-phrase-function.csv-spec Co-authored-by: Carlos Delgado <6339205+carlosdelest@users.noreply.github.com> * Update x-pack/plugin/esql/qa/testFixtures/src/main/resources/match-phrase-function.csv-spec Co-authored-by: Carlos Delgado <6339205+carlosdelest@users.noreply.github.com> * PR feedback * Fix auto-commit error * Regenerate docs * Update x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/MatchPhrase.java Co-authored-by: Liam Thompson <32779855+leemthompo@users.noreply.github.com> * Remove non text field types * Fake test data * Remove tests that no longer should pass without ip/date/version support * Put real data in score tests now that I was able to engineer a failure * Realized the scoring test might be flakey because how it was written, updated * PR feedback * PR feedback * [CI] Auto commit changes from spotless * Add check to MatchPhrase tests * Fix merge errors * [CI] Auto commit changes from spotless * Test generated docs * Add additional verifier tests --------- Co-authored-by: elasticsearchmachine <infra-root+elasticsearchmachine@elastic.co> Co-authored-by: Carlos Delgado <6339205+carlosdelest@users.noreply.github.com> Co-authored-by: Liam Thompson <32779855+leemthompo@users.noreply.github.com> (cherry picked from commit eee423a) # Conflicts: # docs/reference/esql/functions/description/match_phrase.md # docs/reference/esql/functions/examples/match_phrase.md # docs/reference/esql/functions/kibana/definition/match_phrase.json # docs/reference/esql/functions/kibana/docs/match_phrase.md # docs/reference/query-languages/esql/_snippets/lists/search-functions.md # docs/reference/query-languages/esql/functions-operators/search-functions.md # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/EsqlFunctionRegistry.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/FullTextFunction.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/Match.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/QueryString.java # x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java

* Take match_phrase out of snapshot and make tech preview * Update docs/changelog/128925.yaml * PR feedback * Adding regenerated test data * Update docs/changelog/128925.yaml Co-authored-by: Carlos Delgado <6339205+carlosdelest@users.noreply.github.com> * [CI] Auto commit changes from spotless * Checkstyle * Correct docs * Hopefully fix docs build * Found one more bad docs link - here's hoping this now fixes the doc build * OMG bitten by - vs _ --------- Co-authored-by: Carlos Delgado <6339205+carlosdelest@users.noreply.github.com> Co-authored-by: elasticsearchmachine <infra-root+elasticsearchmachine@elastic.co> Co-authored-by: Aurélien FOUCRET <aurelien.foucret@gmail.com>

carlosdelest

LGTM, but for the fact that match_phrase should be non-snapshot as it is GA now

carlosdelest · 2025-06-11T05:50:17Z

...sql/src/main/java/org/elasticsearch/xpack/esql/expression/function/EsqlFunctionRegistry.java

@@ -454,7 +455,8 @@ private static FunctionDefinition[][] snapshotFunctions() {
                // This is an experimental function and can be removed without notice.
                def(Delay.class, Delay::new, "delay"),
                def(Rate.class, Rate::withUnresolvedTimestamp, "rate"),
-                def(Term.class, bi(Term::new), "term") } };
+                def(Term.class, bi(Term::new), "term"),
+                def(MatchPhrase.class, tri(MatchPhrase::new), "match_phrase") } };


It should be registered on non-snapshot functions, right?

Oh shoot, that made it in with the PR to take out of snapshot and into preview! I will spin up a PR for that first, thanks for the catch!

Didn't get that on the original PR 😢 , at least it's easy to fix!

carlosdelest · 2025-06-11T06:02:03Z

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/60_usage.yml

@@ -101,7 +101,7 @@ setup:
  - gt: {esql.functions.to_long: $functions_to_long}
  - match: {esql.functions.coalesce: $functions_coalesce}
  # Testing for the entire function set isn't feasible, so we just check that we return the correct count as an approximation.
-  - length: {esql.functions: 145} # check the "sister" test below for a likely update to the same esql.functions length check
+  - length: {esql.functions: 146} # check the "sister" test below for a likely update to the same esql.functions length check


The number should also increase in the non-snapshot version of the test, right?

…129255) * Register match_phrase as a function not a snapshot function * Update usage

carlosdelest

👍

kderusso added the backport label Jun 10, 2025

kderusso mentioned this pull request Jun 10, 2025

[ES|QL] Add MATCH_PHRASE #127661

Merged

elasticsearchmachine added the v8.19.0 label Jun 10, 2025

kderusso and others added 8 commits June 10, 2025 13:46

Remove null example for match_phrase (elastic#129173)

811d2df

Fix errors from merge

88917af

Fix more errors from merge

022442a

[CI] Auto commit changes from spotless

11d78c1

Fix compile errors introduced through cherry-pick

21ca71f

Fix test compilation

b3491a3

Generate docs

3de98e4

kderusso added >enhancement :Analytics/ES|QL AKA ESQL :SearchOrg/Relevance Label for the Search (solution/org) Relevance team labels Jun 10, 2025

kderusso requested review from afoucret, carlosdelest and ioanatia June 10, 2025 19:27

This was referenced Jun 10, 2025

Take match_phrase out of snapshot and make tech preview #128925

Merged

ES|QL: Remove null example for match_phrase #129173

Merged

carlosdelest reviewed Jun 11, 2025

View reviewed changes

kderusso mentioned this pull request Jun 11, 2025

Register match_phrase as a function not a snapshot function #129255

Merged

Register match_phrase as a function not a snapshot function (elastic#…

a923d44

…129255) * Register match_phrase as a function not a snapshot function * Update usage

kderusso requested a review from carlosdelest June 11, 2025 17:07

carlosdelest approved these changes Jun 12, 2025

View reviewed changes

kderusso added 3 commits June 12, 2025 08:19

Merge from main

780ed85

Fix usage

8ab2767

Merge branch '8.19' into backport/8.19/pr-127661

e67f43f

kderusso merged commit cecbe31 into elastic:8.19 Jun 12, 2025
16 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[8.19] [ES|QL] Add MATCH_PHRASE (#127661) #129215

[8.19] [ES|QL] Add MATCH_PHRASE (#127661) #129215

Uh oh!

kderusso commented Jun 10, 2025 •

edited

Loading

Uh oh!

carlosdelest left a comment

Uh oh!

carlosdelest Jun 11, 2025

Uh oh!

kderusso Jun 11, 2025 •

edited

Loading

Uh oh!

kderusso Jun 11, 2025

Uh oh!

carlosdelest Jun 11, 2025

Uh oh!

carlosdelest Jun 11, 2025

Uh oh!

carlosdelest left a comment

Uh oh!

Uh oh!

Uh oh!

[8.19] [ES|QL] Add MATCH_PHRASE (#127661) #129215

[8.19] [ES|QL] Add MATCH_PHRASE (#127661) #129215

Uh oh!

Conversation

kderusso commented Jun 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Backport

Questions ?

Uh oh!

carlosdelest left a comment

Choose a reason for hiding this comment

Uh oh!

carlosdelest Jun 11, 2025

Choose a reason for hiding this comment

Uh oh!

kderusso Jun 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kderusso Jun 11, 2025

Choose a reason for hiding this comment

Uh oh!

carlosdelest Jun 11, 2025

Choose a reason for hiding this comment

Uh oh!

carlosdelest Jun 11, 2025

Choose a reason for hiding this comment

Uh oh!

carlosdelest left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

kderusso commented Jun 10, 2025 •

edited

Loading

kderusso Jun 11, 2025 •

edited

Loading