Remove snapshot from match operator capability

Author: carlosdelest

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchOperatorIT.java

@@ -32,12 +32,6 @@ public void setupIndex() {
         createAndPopulateIndex();
     }
 
-    @Override
-    protected EsqlQueryResponse run(EsqlQueryRequest request) {
-        assumeTrue("match operator capability not available", EsqlCapabilities.Cap.MATCH_OPERATOR_COLON.isEnabled());
-        return super.run(request);
-    }
-
     public void testSimpleWhereMatch() {
         var query = """
             FROM test

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

@@ -302,7 +302,7 @@ public enum Cap {
         /**
          * Support for match operator as a colon. Previous support for match operator as MATCH has been removed
          */
-        MATCH_OPERATOR_COLON(Build.current().isSnapshot()),
+        MATCH_OPERATOR_COLON,
 
         /**
          * Removing support for the {@code META} keyword.

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/AnalyzerTests.java

@@ -2321,8 +2321,6 @@ public void testInvalidNamedParamsForIdentifierPatterns() {
     }
 
     public void testFromEnrichAndMatchColonUsage() {
-        assumeTrue("Match operator is available just for snapshots", EsqlCapabilities.Cap.MATCH_OPERATOR_COLON.isEnabled());
-
         LogicalPlan plan = analyze("""
             from *:test
             | EVAL x = to_string(languages)

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java

@@ -1159,8 +1159,6 @@ public void testMatchInsideEval() throws Exception {
     }
 
     public void testMatchFilter() throws Exception {
-        assumeTrue("Match operator is available just for snapshots", EsqlCapabilities.Cap.MATCH_OPERATOR_COLON.isEnabled());
-
         assertEquals(
             "1:19: first argument of [salary:\"100\"] must be [string], found value [salary] type [integer]",
             error("from test | where salary:\"100\"")
@@ -1190,7 +1188,6 @@ public void testMatchFunctionNotAllowedAfterCommands() throws Exception {
     }
 
     public void testMatchFunctionAndOperatorHaveCorrectErrorMessages() throws Exception {
-        assumeTrue("skipping because MATCH operator is not enabled", EsqlCapabilities.Cap.MATCH_OPERATOR_COLON.isEnabled());
         assertEquals(
             "1:24: [MATCH] function cannot be used after LIMIT",
             error("from test | limit 10 | where match(first_name, \"Anna\")")
@@ -1271,7 +1268,6 @@ public void testMatchFunctionOnlyAllowedInWhere() throws Exception {
     }
 
     public void testMatchOperatornOnlyAllowedInWhere() throws Exception {
-        assumeTrue("skipping because MATCH operator is not enabled", EsqlCapabilities.Cap.MATCH_OPERATOR_COLON.isEnabled());
         checkFullTextFunctionsOnlyAllowedInWhere(":", "first_name:\"Anna\"", "operator");
     }
 
@@ -1317,8 +1313,6 @@ public void testMatchFunctionWithDisjunctions() {
     }
 
     public void testMatchOperatorWithDisjunctions() {
-        assumeTrue("skipping because MATCH operator is not enabled", EsqlCapabilities.Cap.MATCH_OPERATOR_COLON.isEnabled());
-
         checkWithDisjunctions(":", "first_name : \"Anna\"", "operator");
     }
 
@@ -1374,7 +1368,6 @@ public void testMatchFunctionWithNonBooleanFunctions() {
     }
 
     public void testMatchOperatorWithNonBooleanFunctions() {
-        assumeTrue("skipping because MATCH operator is not enabled", EsqlCapabilities.Cap.MATCH_OPERATOR_COLON.isEnabled());
         checkFullTextFunctionsWithNonBooleanFunctions(":", "first_name:\"Anna\"", "operator");
     }
 
@@ -1452,8 +1445,6 @@ public void testMatchFunctionCurrentlyUnsupportedBehaviour() throws Exception {
             "1:68: Unknown column [first_name]",
             error("from test | stats max_salary = max(salary) by emp_no | where match(first_name, \"Anna\")")
         );
-
-        assumeTrue("skipping because MATCH operator is not enabled", EsqlCapabilities.Cap.MATCH_OPERATOR_COLON.isEnabled());
         assertEquals(
             "1:62: Unknown column [first_name]",
             error("from test | stats max_salary = max(salary) by emp_no | where first_name : \"Anna\"")
@@ -1473,8 +1464,6 @@ public void testMatchFunctionNullArgs() throws Exception {
 
     public void testMatchTargetsExistingField() throws Exception {
         assertEquals("1:39: Unknown column [first_name]", error("from test | keep emp_no | where match(first_name, \"Anna\")"));
-
-        assumeTrue("skipping because MATCH operator is not enabled", EsqlCapabilities.Cap.MATCH_OPERATOR_COLON.isEnabled());
         assertEquals("1:33: Unknown column [first_name]", error("from test | keep emp_no | where first_name : \"Anna\""));
     }
 

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/AbstractFunctionTestCase.java

@@ -816,6 +816,10 @@ private static String buildSignatureSvg(String name) throws IOException {
         if (unaryOperator != null) {
             return RailRoadDiagram.unaryOperator(unaryOperator);
         }
+        String searchOperator = searchOperator(name);
+        if (searchOperator != null) {
+            return RailRoadDiagram.searchOperator(searchOperator);
+        }
         FunctionDefinition definition = definition(name);
         if (definition != null) {
             return RailRoadDiagram.functionSignature(definition);
@@ -1253,7 +1257,6 @@ private static String binaryOperator(String name) {
             case "greater_than_or_equal" -> ">=";
             case "less_than" -> "<";
             case "less_than_or_equal" -> "<=";
-            case "match_operator" -> ":";
             case "mod" -> "%";
             case "mul" -> "*";
             case "not_equals" -> "!=";
@@ -1262,6 +1265,16 @@ private static String binaryOperator(String name) {
         };
     }
 
+    /**
+     * If this test is a for a search operator return its symbol, otherwise return {@code null}.
+     */
+    private static String searchOperator(String name) {
+        return switch (name) {
+            case "match_operator" -> ":";
+            default -> null;
+        };
+    }
+
     /**
      * If this tests is for a unary operator return its symbol, otherwise return {@code null}.
      * This is functionally the reverse of {@link ExpressionBuilder#visitArithmeticUnary}.

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/RailRoadDiagram.java

@@ -89,6 +89,18 @@ static String binaryOperator(String operator) throws IOException {
         return toSvg(new Sequence(expressions.toArray(Expression[]::new)));
     }
 
+    /**
+     * Generate a railroad diagram for a search operator. The output would look like
+     * {@code field : value}.
+     */
+    static String searchOperator(String operator) throws IOException {
+        List<Expression> expressions = new ArrayList<>();
+        expressions.add(new Literal("field"));
+        expressions.add(new Syntax(operator));
+        expressions.add(new Literal("value"));
+        return toSvg(new Sequence(expressions.toArray(Expression[]::new)));
+    }
+
     /**
      * Generate a railroad diagram for unary operator. The output would look like
      * {@code -v}.

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LocalPhysicalPlanOptimizerTests.java

@@ -1092,8 +1092,6 @@ public void testMissingFieldsDoNotGetExtracted() {
      *       estimatedRowSize[324]
      */
     public void testSingleMatchFilterPushdown() {
-        assumeTrue("skipping because MATCH operator is not enabled", EsqlCapabilities.Cap.MATCH_OPERATOR_COLON.isEnabled());
-
         var plan = plannerOptimizer.plan("""
             from test
             | where first_name:"Anna"
@@ -1124,8 +1122,6 @@ public void testSingleMatchFilterPushdown() {
      *         [_doc{f}#22], limit[1000], sort[[FieldSort[field=emp_no{f}#12, direction=ASC, nulls=LAST]]] estimatedRowSize[336]
      */
     public void testMultipleMatchFilterPushdown() {
-        assumeTrue("skipping because MATCH operator is not enabled", EsqlCapabilities.Cap.MATCH_OPERATOR_COLON.isEnabled());
-
         String query = """
             from test
             | where first_name:"Anna" and first_name:"Anneke"

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java

@@ -2300,7 +2300,6 @@ public void testMetricWithGroupKeyAsAgg() {
     }
 
     public void testMatchOperatorConstantQueryString() {
-        assumeTrue("skipping because MATCH operator is not enabled", EsqlCapabilities.Cap.MATCH_OPERATOR_COLON.isEnabled());
         var plan = statement("FROM test | WHERE field:\"value\"");
         var filter = as(plan, Filter.class);
         var match = (Match) filter.condition();
@@ -2310,7 +2309,6 @@ public void testMatchOperatorConstantQueryString() {
     }
 
     public void testInvalidMatchOperator() {
-        assumeTrue("skipping because MATCH operator is not enabled", EsqlCapabilities.Cap.MATCH_OPERATOR_COLON.isEnabled());
         expectError("from test | WHERE field:", "line 1:25: mismatched input '<EOF>' expecting {QUOTED_STRING, ");
         expectError(
             "from test | WHERE field:CONCAT(\"hello\", \"world\")",