Enabling RERANK in non-snapshot build.

Author: afoucret

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestRerankTestCase.java

@@ -11,7 +11,6 @@
 import org.elasticsearch.client.ResponseException;
 import org.elasticsearch.test.rest.ESRestTestCase;
 import org.elasticsearch.xpack.esql.AssertWarnings;
-import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -29,14 +28,6 @@ public class RestRerankTestCase extends ESRestTestCase {
     @Rule(order = Integer.MIN_VALUE)
     public ProfileLogger profileLogger = new ProfileLogger();
 
-    @Before
-    public void skipWhenRerankDisabled() throws IOException {
-        assumeTrue(
-            "Requires RERANK capability",
-            RestEsqlTestCase.hasCapabilities(adminClient(), List.of(EsqlCapabilities.Cap.RERANK.capabilityName()))
-        );
-    }
-
     @Before
     @After
     public void assertRequestBreakerEmpty() throws Exception {

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

@@ -59,11 +59,11 @@ processingCommand
     | completionCommand
     | sampleCommand
     | forkCommand
+    | rerankCommand
     // in development
     | {this.isDevVersion()}? inlinestatsCommand
     | {this.isDevVersion()}? lookupCommand
     | {this.isDevVersion()}? insistCommand
-    | {this.isDevVersion()}? rerankCommand
     | {this.isDevVersion()}? fuseCommand
     ;
 
@@ -297,6 +297,10 @@ forkSubQueryProcessingCommand
     : processingCommand
     ;
 
+rerankCommand
+    : RERANK (targetField=qualifiedName ASSIGN)? queryText=constant ON rerankFields commandNamedParameters
+    ;
+
 completionCommand
     : COMPLETION (targetField=qualifiedName ASSIGN)? prompt=primaryExpression commandNamedParameters
     ;
@@ -319,7 +323,3 @@ insistCommand
 fuseCommand
     : DEV_FUSE
     ;
-
-rerankCommand
-    : DEV_RERANK (targetField=qualifiedName ASSIGN)? queryText=constant ON rerankFields commandNamedParameters
-    ;

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

@@ -14,14 +14,14 @@ DISSECT : 'dissect'           -> pushMode(EXPRESSION_MODE);
 EVAL : 'eval'                 -> pushMode(EXPRESSION_MODE);
 GROK : 'grok'                 -> pushMode(EXPRESSION_MODE);
 LIMIT : 'limit'               -> pushMode(EXPRESSION_MODE);
+RERANK : 'rerank'             -> pushMode(EXPRESSION_MODE);
 ROW : 'row'                   -> pushMode(EXPRESSION_MODE);
 SAMPLE : 'sample'             -> pushMode(EXPRESSION_MODE);
 SORT : 'sort'                 -> pushMode(EXPRESSION_MODE);
 STATS : 'stats'               -> pushMode(EXPRESSION_MODE);
 WHERE : 'where'               -> pushMode(EXPRESSION_MODE);
 
 DEV_INLINESTATS : {this.isDevVersion()}? 'inlinestats' -> pushMode(EXPRESSION_MODE);
-DEV_RERANK : {this.isDevVersion()}? 'rerank'           -> pushMode(EXPRESSION_MODE);
 
 
 mode EXPRESSION_MODE;

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

@@ -962,7 +962,7 @@ public enum Cap {
         /**
          * Support for RERANK command
          */
-        RERANK(Build.current().isSnapshot()),
+        RERANK,
 
         /**
          * Support for COMPLETION command