From b3e9a64cebf5c8eef8ce314d6b7df2c6b35dac90 Mon Sep 17 00:00:00 2001
From: carlosdelest <carlos.delgado@elastic.co>
Date: Fri, 13 Dec 2024 19:26:07 +0100
Subject: [PATCH] Fix tests

---
 .../xpack/esql/plugin/MatchFunctionIT.java    | 28 +++++++++----------
 .../xpack/esql/plugin/MatchOperatorIT.java    |  3 +-
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchFunctionIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchFunctionIT.java
index 6eac495c105de..d02201457575f 100644
--- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchFunctionIT.java
+++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchFunctionIT.java
@@ -168,7 +168,7 @@ public void testWhereMatchWithScoringNoSort() {
         var query = """
             FROM test
             METADATA _score
-            | WHERE content:"fox"
+            | WHERE match(content, "fox")
             | KEEP id, _score
             """;
 
@@ -182,7 +182,7 @@ public void testWhereMatchWithScoringNoSort() {
     public void testNonExistingColumn() {
         var query = """
             FROM test
-            | WHERE something:"fox"
+            | WHERE match(something, "fox")
             """;
 
         var error = expectThrows(VerificationException.class, () -> run(query));
@@ -193,14 +193,14 @@ public void testWhereMatchEvalColumn() {
         var query = """
             FROM test
             | EVAL upper_content = to_upper(content)
-            | WHERE upper_content:"FOX"
+            | WHERE match(upper_content, "FOX")
             | KEEP id
             """;
 
         var error = expectThrows(VerificationException.class, () -> run(query));
         assertThat(
             error.getMessage(),
-            containsString("[:] operator cannot operate on [upper_content], which is not a field from an index mapping")
+            containsString("[MATCH] function cannot operate on [upper_content], which is not a field from an index mapping")
         );
     }
 
@@ -209,13 +209,13 @@ public void testWhereMatchOverWrittenColumn() {
             FROM test
             | DROP content
             | EVAL content = CONCAT("document with ID ", to_str(id))
-            | WHERE content:"document"
+            | WHERE match(content, "document")
             """;
 
         var error = expectThrows(VerificationException.class, () -> run(query));
         assertThat(
             error.getMessage(),
-            containsString("[:] operator cannot operate on [content], which is not a field from an index mapping")
+            containsString("[MATCH] function cannot operate on [content], which is not a field from an index mapping")
         );
     }
 
@@ -223,7 +223,7 @@ public void testWhereMatchAfterStats() {
         var query = """
             FROM test
             | STATS count(*)
-            | WHERE content:"fox"
+            | WHERE match(content, "fox")
             """;
 
         var error = expectThrows(VerificationException.class, () -> run(query));
@@ -233,14 +233,14 @@ public void testWhereMatchAfterStats() {
     public void testWhereMatchWithFunctions() {
         var query = """
             FROM test
-            | WHERE content:"fox" OR to_upper(content) == "FOX"
+            | WHERE match(content, "fox") OR to_upper(content) == "FOX"
             """;
         var error = expectThrows(ElasticsearchException.class, () -> run(query));
         assertThat(
             error.getMessage(),
             containsString(
-                "Invalid condition [content:\"fox\" OR to_upper(content) == \"FOX\"]. "
-                    + "[:] operator can be used in an OR condition, but only if just full text functions are used in the OR condition"
+                "Invalid condition [match(content, \"fox\") OR to_upper(content) == \"FOX\"]. "
+                    + "[MATCH] function can be used in an OR condition, but only if just full text functions are used in the OR condition"
             )
         );
     }
@@ -248,24 +248,24 @@ public void testWhereMatchWithFunctions() {
     public void testWhereMatchWithRow() {
         var query = """
             ROW content = "a brown fox"
-            | WHERE content:"fox"
+            | WHERE match(content, "fox")
             """;
 
         var error = expectThrows(ElasticsearchException.class, () -> run(query));
         assertThat(
             error.getMessage(),
-            containsString("[:] operator cannot operate on [\"a brown fox\"], which is not a field from an index mapping")
+            containsString("[MATCH] function cannot operate on [\"a brown fox\"], which is not a field from an index mapping")
         );
     }
 
     public void testMatchWithinEval() {
         var query = """
             FROM test
-            | EVAL matches_query = content:"fox"
+            | EVAL matches_query = match(content, "fox")
             """;
 
         var error = expectThrows(VerificationException.class, () -> run(query));
-        assertThat(error.getMessage(), containsString("[:] operator is only supported in WHERE commands"));
+        assertThat(error.getMessage(), containsString("[MATCH] function is only supported in WHERE commands"));
     }
 
     private void createAndPopulateIndex() {
diff --git a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchOperatorIT.java b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchOperatorIT.java
index b3df2bb99eea6..6ae2ae96842b0 100644
--- a/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchOperatorIT.java
+++ b/x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchOperatorIT.java
@@ -215,7 +215,8 @@ public void testWhereMatchWithFunctions() {
         assertThat(
             error.getMessage(),
             containsString(
-                "Invalid condition [content:\"fox\" OR to_upper(content) == \"FOX\"]. " + "[:] operator can't be used in an OR condition"
+                "Invalid condition [content:\"fox\" OR to_upper(content) == \"FOX\"]. "
+                    + "[:] operator can be used in an OR condition, but only if just full text functions are used in the OR condition"
             )
         );
     }