fix tests

Author: smalyshev

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

@@ -74,7 +74,7 @@ public void wipeTestData() throws IOException {
     }
 
     private String getInexistentIndexErrorMessage() {
-        return "\"reason\" : \"Found 1 problem\\nline 1:1: Unknown index ";
+        return "Unknown index ";
     }
 
     public void testInexistentIndexNameWithWildcard() throws IOException {

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

@@ -59,7 +59,12 @@ protected void assertClusterMetadataNoShards(EsqlExecutionInfo.Cluster clusterMe
         assertThat(clusterMetatata.getFailedShards(), equalTo(0));
     }
 
-    protected void assertClusterMetadataSkipped(EsqlExecutionInfo.Cluster clusterMetatata, int shards, long took, String indexExpression) {
+    protected void assertClusterMetadataSkippedShards(
+        EsqlExecutionInfo.Cluster clusterMetatata,
+        int shards,
+        long took,
+        String indexExpression
+    ) {
         assertThat(clusterMetatata.getIndexExpression(), equalTo(indexExpression));
         assertThat(clusterMetatata.getStatus(), equalTo(EsqlExecutionInfo.Cluster.Status.SUCCESSFUL));
         assertThat(clusterMetatata.getTook().millis(), greaterThanOrEqualTo(0L));
@@ -153,7 +158,7 @@ public void testTimestampFilterFromQuery() {
             assertThat(executionInfo.clusterAliases(), equalTo(Set.of(REMOTE_CLUSTER_1, LOCAL_CLUSTER)));
 
             EsqlExecutionInfo.Cluster localCluster = executionInfo.getCluster(LOCAL_CLUSTER);
-            assertClusterMetadataSkipped(localCluster, localShards, overallTookMillis, "logs-1");
+            assertClusterMetadataSkippedShards(localCluster, localShards, overallTookMillis, "logs-1");
 
             EsqlExecutionInfo.Cluster remoteCluster = executionInfo.getCluster(REMOTE_CLUSTER_1);
             assertClusterMetadataSuccess(remoteCluster, remoteShards, overallTookMillis, "logs-2");
@@ -202,7 +207,7 @@ public void testTimestampFilterFromQuery() {
 
             EsqlExecutionInfo.Cluster localCluster = executionInfo.getCluster(LOCAL_CLUSTER);
             // Local cluster can not be filtered out for now
-            assertClusterMetadataSkipped(localCluster, localShards, overallTookMillis, "logs-1");
+            assertClusterMetadataSkippedShards(localCluster, localShards, overallTookMillis, "logs-1");
         }
 
         // Both indices are filtered out - wildcards
@@ -226,7 +231,7 @@ public void testTimestampFilterFromQuery() {
 
             EsqlExecutionInfo.Cluster localCluster = executionInfo.getCluster(LOCAL_CLUSTER);
             // Local cluster can not be filtered out for now
-            assertClusterMetadataSkipped(localCluster, localShards, overallTookMillis, "logs-*");
+            assertClusterMetadataSkippedShards(localCluster, localShards, overallTookMillis, "logs-*");
         }
 
     }
@@ -274,6 +279,18 @@ public void testFilterWithMissingIndex() {
         }
     }
 
+    public void testFilterWithMissingRemoteIndex() {
+        // TODO
+    }
+
+    public void testFilterWithUnavailableRemote() {
+        // TODO
+    }
+
+    public void testFilterWithUnavailableRemoteAndSkipUnavailable() {
+        // TODO
+    }
+
     protected void populateDateIndex(String clusterAlias, String indexName, int numShards, int numDocs, String date) {
         Client client = client(clusterAlias);
         String tag = Strings.isEmpty(clusterAlias) ? "local" : clusterAlias;

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

@@ -384,7 +384,7 @@ public static class Cluster implements ToXContentFragment, Writeable {
         public enum Status {
             RUNNING,     // still running
             SUCCESSFUL,  // all shards completed search
-            FILTERED,    // all shards were filtered out
+            FILTERED,    // all shards were filtered out, temporary status for planning
             PARTIAL,     // only some shards completed the search, partial results from cluster
             SKIPPED,     // entire cluster was skipped
             FAILED;      // search was failed due to errors on this cluster

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

@@ -381,7 +381,7 @@ public void analyzedPlan(
             // TODO in follow-PR (for skip_unavailable handling of missing concrete indexes) add some tests for
             // invalid index resolution to updateExecutionInfo
             // If we run out of clusters to search due to unavailability we can stop the analysis right here
-            if (allCCSClustersSkipped(executionInfo, result, logicalPlanListener)) return;
+            if (result.indices.isValid() && allCCSClustersSkipped(executionInfo, result, logicalPlanListener)) return;
             // whatever tuple we have here (from CCS-special handling or from the original pre-analysis), pass it on to the next step
             l.onResponse(result);
         }).<PreAnalysisResult>andThen((l, result) -> {
@@ -397,8 +397,10 @@ public void analyzedPlan(
             LOGGER.debug("Analyzing the plan (second attempt, without filter)");
             LogicalPlan plan;
             try {
-                EsqlCCSUtils.updateExecutionInfoWithClustersWithNoMatchingIndices(executionInfo, result.indices, null);
+                // the order here is tricky - if the cluster has been filtered and later became unavailable,
+                // do we want to declare it successful or skipped? For now, unavailability takes precedence.
                 EsqlCCSUtils.updateExecutionInfoWithUnavailableClusters(executionInfo, result.indices.unavailableClusters());
+                EsqlCCSUtils.updateExecutionInfoWithClustersWithNoMatchingIndices(executionInfo, result.indices, null);
                 plan = analyzeAction.apply(result);
             } catch (Exception e) {
                 l.onFailure(e);
@@ -535,7 +537,10 @@ private static void analyzeAndMaybeRetry(
         LOGGER.debug("Analyzing the plan ({} attempt, {} filter)", attemptMessage, filterPresentMessage);
 
         try {
-            EsqlCCSUtils.updateExecutionInfoWithClustersWithNoMatchingIndices(executionInfo, result.indices, requestFilter);
+            if (result.indices.isValid() || requestFilter != null) {
+                // Capture filtered out indices
+                EsqlCCSUtils.updateExecutionInfoWithClustersWithNoMatchingIndices(executionInfo, result.indices, requestFilter);
+            }
             plan = analyzeAction.apply(result);
         } catch (Exception e) {
             if (e instanceof VerificationException ve) {