Add back snapshot build restriction for match and qstr functions (#115253)

Author: carlosdelest

docs/changelog/114482.yaml

@@ -14,6 +14,9 @@
 import org.elasticsearch.xpack.esql.VerificationException;
 import org.elasticsearch.xpack.esql.action.AbstractEsqlIntegTestCase;
 import org.elasticsearch.xpack.esql.action.ColumnInfoImpl;
+import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
+import org.elasticsearch.xpack.esql.action.EsqlQueryRequest;
+import org.elasticsearch.xpack.esql.action.EsqlQueryResponse;
 import org.elasticsearch.xpack.esql.core.type.DataType;
 import org.junit.Before;
 
@@ -33,6 +36,12 @@ public void setupIndex() {
         createAndPopulateIndex();
     }
 
+    @Override
+    protected EsqlQueryResponse run(EsqlQueryRequest request) {
+        assumeTrue("qstr function available in snapshot builds only", EsqlCapabilities.Cap.QSTR_FUNCTION.isEnabled());
+        return super.run(request);
+    }
+
     public void testSimpleQueryString() {
         var query = """
             FROM test

docs/reference/esql/functions/kibana/definition/match.json

@@ -208,7 +208,7 @@ ASTERISK : '*';
 SLASH : '/';
 PERCENT : '%';
 
-MATCH : 'match';
+DEV_MATCH : {this.isDevVersion()}? 'match';
 NESTED_WHERE : WHERE -> type(WHERE);
 
 NAMED_OR_POSITIONAL_PARAM

docs/reference/esql/functions/kibana/definition/qstr.json

@@ -77,7 +77,7 @@ regexBooleanExpression
     ;
 
 matchBooleanExpression
-    : valueExpression MATCH queryString=string
+    : valueExpression DEV_MATCH queryString=string
     ;
 
 valueExpression
@@ -106,7 +106,7 @@ functionExpression
 
 functionName
     // Additional function identifiers that are already a reserved word in the language
-    : MATCH
+    : {this.isDevVersion()}? DEV_MATCH
     | identifierOrParameter
     ;
 

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

@@ -360,12 +360,12 @@ public enum Cap {
         /**
          * QSTR function
          */
-        QSTR_FUNCTION,
+        QSTR_FUNCTION(true),
 
         /**
          * MATCH function
          */
-        MATCH_FUNCTION,
+        MATCH_FUNCTION(true),
 
         /**
          * Don't optimize CASE IS NOT NULL function by not requiring the fields to be not null as well.

x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.g4

@@ -388,17 +388,18 @@ private FunctionDefinition[][] functions() {
                 def(MvSlice.class, MvSlice::new, "mv_slice"),
                 def(MvZip.class, MvZip::new, "mv_zip"),
                 def(MvSum.class, MvSum::new, "mv_sum"),
-                def(Split.class, Split::new, "split") },
-            // fulltext functions
-            new FunctionDefinition[] { def(Match.class, Match::new, "match"), def(QueryString.class, QueryString::new, "qstr") } };
+                def(Split.class, Split::new, "split") } };
 
     }
 
     private static FunctionDefinition[][] snapshotFunctions() {
         return new FunctionDefinition[][] {
             new FunctionDefinition[] {
+                def(Rate.class, Rate::withUnresolvedTimestamp, "rate"),
                 def(Categorize.class, Categorize::new, "categorize"),
-                def(Rate.class, Rate::withUnresolvedTimestamp, "rate") } };
+                // Full text functions
+                def(QueryString.class, QueryString::new, "qstr"),
+                def(Match.class, Match::new, "match") } };
     }
 
     public EsqlFunctionRegistry snapshotRegistry() {