ESQL: Send version in spec tests (#107268)

For now this just sends a random version; later, we will want to specify
applicable versions in the csv tests themselves.

Author: alex-spies

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

@@ -9,6 +9,7 @@
 import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
 
 import org.apache.http.HttpEntity;
+import org.elasticsearch.Build;
 import org.elasticsearch.Version;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.ResponseException;
@@ -23,6 +24,7 @@
 import org.elasticsearch.xcontent.XContentType;
 import org.elasticsearch.xpack.esql.CsvTestUtils;
 import org.elasticsearch.xpack.esql.qa.rest.RestEsqlTestCase.RequestObjectBuilder;
+import org.elasticsearch.xpack.esql.version.EsqlVersion;
 import org.elasticsearch.xpack.ql.CsvSpecReader.CsvTestCase;
 import org.elasticsearch.xpack.ql.SpecReader;
 import org.junit.After;
@@ -35,6 +37,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import java.util.regex.Pattern;
 
 import static org.apache.lucene.geo.GeoEncodingUtils.decodeLatitude;
@@ -65,6 +68,7 @@ public abstract class EsqlSpecTestCase extends ESRestTestCase {
     private final Integer lineNumber;
     protected final CsvTestCase testCase;
     protected final Mode mode;
+    protected final Set<EsqlVersion> versions;
 
     public enum Mode {
         SYNC,
@@ -97,6 +101,8 @@ protected EsqlSpecTestCase(String fileName, String groupName, String testName, I
         this.lineNumber = lineNumber;
         this.testCase = testCase;
         this.mode = mode;
+        // TODO: Read applicable versions from csv-spec files/make it part of testCase.
+        this.versions = Build.current().isSnapshot() ? Set.of(EsqlVersion.values()) : Set.of(EsqlVersion.releasedAscending());
     }
 
     @Before
@@ -144,8 +150,10 @@ protected void shouldSkipTest(String testName) throws IOException {
 
     protected final void doTest() throws Throwable {
         RequestObjectBuilder builder = new RequestObjectBuilder(randomFrom(XContentType.values()));
+        EsqlVersion version = randomFrom(versions);
+        String versionString = randomBoolean() ? version.toString() : version.versionStringWithoutEmoji();
         Map<String, Object> answer = runEsql(
-            builder.query(testCase.query),
+            builder.query(testCase.query).version(versionString),
             testCase.expectedWarnings(false),
             testCase.expectedWarningsRegex()
         );

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

@@ -132,6 +132,11 @@ public RequestObjectBuilder query(String query) throws IOException {
             return this;
         }
 
+        public RequestObjectBuilder version(String version) throws IOException {
+            builder.field("version", version);
+            return this;
+        }
+
         public RequestObjectBuilder columnar(boolean columnar) throws IOException {
             builder.field("columnar", columnar);
             return this;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/version/EsqlVersion.java

@@ -23,6 +23,7 @@ public enum EsqlVersion implements VersionId<EsqlVersion> {
     ROCKET(2024, 4, "🚀");
 
     static final Map<String, EsqlVersion> VERSION_MAP_WITH_AND_WITHOUT_EMOJI = versionMapWithAndWithoutEmoji();
+    private static final EsqlVersion[] RELEASED_ASCENDING = createReleasedAscending();
 
     private static Map<String, EsqlVersion> versionMapWithAndWithoutEmoji() {
         Map<String, EsqlVersion> stringToVersion = new LinkedHashMap<>(EsqlVersion.values().length * 2);
@@ -35,6 +36,13 @@ private static Map<String, EsqlVersion> versionMapWithAndWithoutEmoji() {
         return stringToVersion;
     }
 
+    private static EsqlVersion[] createReleasedAscending() {
+        return Arrays.stream(EsqlVersion.values())
+            .filter(v -> v != SNAPSHOT)
+            .sorted(Comparator.comparingInt(EsqlVersion::id))
+            .toArray(EsqlVersion[]::new);
+    }
+
     private static void putVersionCheckNoDups(Map<String, EsqlVersion> stringToVersion, String versionString, EsqlVersion version) {
         EsqlVersion existingVersionForKey = stringToVersion.put(versionString, version);
         if (existingVersionForKey != null) {
@@ -50,8 +58,15 @@ public static EsqlVersion parse(String versionString) {
         return VERSION_MAP_WITH_AND_WITHOUT_EMOJI.get(versionString);
     }
 
+    /**
+     * Return the released versions in ascending order.
+     */
+    public static EsqlVersion[] releasedAscending() {
+        return RELEASED_ASCENDING;
+    }
+
     public static EsqlVersion latestReleased() {
-        return Arrays.stream(EsqlVersion.values()).filter(v -> v != SNAPSHOT).max(Comparator.comparingInt(EsqlVersion::id)).get();
+        return RELEASED_ASCENDING[RELEASED_ASCENDING.length - 1];
     }
 
     private int year;