Remove snapshot build restriction for match and qstr functions (elast…

…ic#114482)

docs/changelog/114482.yaml

@@ -0,0 +1,5 @@
+pr: 114482
+summary: Remove snapshot build restriction for match and qstr functions
+area: ES|QL
+type: feature
+issues: []

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

@@ -14,9 +14,6 @@
 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;
 
@@ -36,12 +33,6 @@ 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

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

@@ -208,7 +208,7 @@ ASTERISK : '*';
 SLASH : '/';
 PERCENT : '%';
 
-DEV_MATCH : {this.isDevVersion()}? 'match';
+MATCH : 'match';
 
 NAMED_OR_POSITIONAL_PARAM
     : PARAM (LETTER | UNDERSCORE) UNQUOTED_ID_BODY*

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

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

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

@@ -344,12 +344,12 @@ public enum Cap {
         /**
          * QSTR function
          */
-        QSTR_FUNCTION(true),
+        QSTR_FUNCTION,
 
         /**
          * MATCH function
          */
-        MATCH_FUNCTION(true),
+        MATCH_FUNCTION,
 
         /**
          * 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/java/org/elasticsearch/xpack/esql/expression/function/EsqlFunctionRegistry.java

@@ -386,18 +386,17 @@ 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") } };
+                def(Split.class, Split::new, "split") },
+            // fulltext functions
+            new FunctionDefinition[] { def(Match.class, Match::new, "match"), def(QueryString.class, QueryString::new, "qstr") } };
 
     }
 
     private static FunctionDefinition[][] snapshotFunctions() {
         return new FunctionDefinition[][] {
             new FunctionDefinition[] {
                 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") } };
+                def(Rate.class, Rate::withUnresolvedTimestamp, "rate") } };
     }
 
     public EsqlFunctionRegistry snapshotRegistry() {

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/fulltext/FullTextFunction.java

@@ -9,15 +9,13 @@
 
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
-import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
 import org.elasticsearch.xpack.esql.core.expression.Nullability;
 import org.elasticsearch.xpack.esql.core.expression.TypeResolutions;
 import org.elasticsearch.xpack.esql.core.expression.function.Function;
 import org.elasticsearch.xpack.esql.core.tree.Source;
 import org.elasticsearch.xpack.esql.core.type.DataType;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import static org.elasticsearch.common.logging.LoggerMessageFormat.format;
@@ -32,14 +30,7 @@
  */
 public abstract class FullTextFunction extends Function {
     public static List<NamedWriteableRegistry.Entry> getNamedWriteables() {
-        List<NamedWriteableRegistry.Entry> entries = new ArrayList<>();
-        if (EsqlCapabilities.Cap.QSTR_FUNCTION.isEnabled()) {
-            entries.add(QueryString.ENTRY);
-        }
-        if (EsqlCapabilities.Cap.MATCH_FUNCTION.isEnabled()) {
-            entries.add(Match.ENTRY);
-        }
-        return entries;
+        return List.of(QueryString.ENTRY, Match.ENTRY);
     }
 
     private final Expression query;