TEMP

Author: GalLalouche

rest-api-spec/src/main/resources/rest-api-spec/api/esql.get_query.json

@@ -0,0 +1,31 @@
+{
+  "esql.get_query": {
+    "documentation": {
+      "description": "Executes a get ESQL query request"
+    },
+    "stability": "experimental",
+    "visibility": "public",
+    "headers": {
+      "accept": [],
+      "content_type": [
+        "application/json"
+      ]
+    },
+    "url": {
+      "paths": [
+        {
+          "path": "/_query/queries/{id}",
+          "methods": [
+            "GET"
+          ],
+          "parts": {
+            "id": {
+              "type": "string",
+              "description": "The query ID"
+            }
+          }
+        }
+      ]
+    }
+  }
+}

rest-api-spec/src/main/resources/rest-api-spec/api/esql.list_queries.json

@@ -0,0 +1,25 @@
+{
+  "esql.list_queries": {
+    "documentation": {
+      "description": "Executes a list ESQL queries request"
+    },
+    "stability": "experimental",
+    "visibility": "public",
+    "headers": {
+      "accept": [],
+      "content_type": [
+        "application/json"
+      ]
+    },
+    "url": {
+      "paths": [
+        {
+          "path": "/_query/queries",
+          "methods": [
+            "GET"
+          ]
+        }
+      ]
+    }
+  }
+}

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

@@ -55,7 +55,7 @@ public void ensureExchangesAreReleased() throws Exception {
             ExchangeService exchangeService = esqlQueryAction.exchangeService();
             assertBusy(() -> {
                 if (exchangeService.lifecycleState() == Lifecycle.State.STARTED) {
-                    assertTrue("Leftover exchanges " + exchangeService + " on taskId " + node, exchangeService.isEmpty());
+                    assertTrue("Leftover exchanges " + exchangeService + " on node " + node, exchangeService.isEmpty());
                 }
             });
         }
@@ -98,7 +98,7 @@ public void ensureBlocksReleased() {
                             )
                             .toList()
                     );
-                    assertThat("Request breaker not reset to 0 on taskId: " + node, reqBreaker.getUsed(), equalTo(0L));
+                    assertThat("Request breaker not reset to 0 on node: " + node, reqBreaker.getUsed(), equalTo(0L));
                 });
             } catch (Exception e) {
                 throw new RuntimeException("failed waiting for breakers to clear", e);

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

@@ -67,7 +67,7 @@ public void testRunningQueries() throws Exception {
                 .entry("running_time_nanos", IntegerMatcher.isIntOrLong());
             MapMatcher.assertMap(EsqlTestUtils.singleValue(listResult.values()), basicMatcher);
 
-            request = new Request("GET", "/_query/queries/" + taskId);
+            request = new Request("GET", "/_query/queries/" + taskId + "1234");
             response = getRestClient().performRequest(request);
             MapMatcher.assertMap(
                 entityToMap(response.getEntity()),

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

@@ -57,7 +57,9 @@ public void onFailure(Exception e) {
 
             @Override
             public void onFailure(Exception e) {
-                listener.onFailure(e);
+                // The underlying root cause is meaningless to the user, but that is what will be shown, so we remove it.
+                var withoutCause = new Exception(e.getMessage());
+                listener.onFailure(withoutCause);
             }
         });
     }

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/200_queries.yml

@@ -0,0 +1,34 @@
+setup:
+  # FIXME (gal, NOCOMMIT) Wrong check
+  - requires:
+      cluster_features: [ "gte_v8.11.0" ]
+      reason: "ESQL is available in 8.11+"
+      test_runner_features: allowed_warnings_regex
+  - do:
+      indices.create:
+        index: test
+        body:
+          mappings:
+            properties:
+              message1:
+                type: keyword
+
+---
+List with no running queries:
+  - do:
+      esql.list_queries: { }
+  - match: { queries: { } }
+
+---
+Get with invalid task ID:
+  - do:
+      catch: /malformed task id foobar/
+      esql.get_query:
+        id: "foobar"
+
+---
+Get with non-existent task ID:
+  - do:
+      catch: /task \[foobar:1234\] belongs to the node \[foobar\] which isn't part of the cluster and there is no record of the task/
+      esql.get_query:
+        id: "foobar:1234"

x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/esql/25_aggs_on_null.yml

@@ -146,7 +146,7 @@ group on half missing:
   - do:
       esql.query:
         body:
-          query: 'FROM test,test2 | STATS med=median(never_null) BY missing | LIMIT 1'
+          query: 'FROM test,test2'
           columnar: true
   - match: {columns.0.name: "med"}
   - match: {columns.0.type: "double"}