We can not eliminate some filtered runtime calls since there could be missing indices

So we have to drop FILTERED status for now

Author: smalyshev

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

@@ -157,7 +157,7 @@ public void testTimestampFilterFromQuery() {
             assertClusterMetadataSuccess(localCluster, localShards, overallTookMillis, "logs-1");
 
             EsqlExecutionInfo.Cluster remoteCluster = executionInfo.getCluster(REMOTE_CLUSTER_1);
-            assertClusterMetadataNoShards(remoteCluster, remoteShards, overallTookMillis, "logs-2");
+            assertClusterMetadataSkippedShards(remoteCluster, remoteShards, overallTookMillis, "logs-2");
         }
 
         // Only remote is included
@@ -221,7 +221,7 @@ public void testTimestampFilterFromQuery() {
 
             EsqlExecutionInfo.Cluster remoteCluster = executionInfo.getCluster(REMOTE_CLUSTER_1);
             // Remote has no shards due to filter
-            assertClusterMetadataNoShards(remoteCluster, remoteShards, overallTookMillis, "logs-2");
+            assertClusterMetadataSkippedShards(remoteCluster, remoteShards, overallTookMillis, "logs-2");
 
             EsqlExecutionInfo.Cluster localCluster = executionInfo.getCluster(LOCAL_CLUSTER);
             // Local cluster can not be filtered out for now
@@ -245,7 +245,7 @@ public void testTimestampFilterFromQuery() {
 
             EsqlExecutionInfo.Cluster remoteCluster = executionInfo.getCluster(REMOTE_CLUSTER_1);
             // Remote has no shards due to filter
-            assertClusterMetadataNoShards(remoteCluster, remoteShards, overallTookMillis, "logs-*");
+            assertClusterMetadataSkippedShards(remoteCluster, remoteShards, overallTookMillis, "logs-*");
 
             EsqlExecutionInfo.Cluster localCluster = executionInfo.getCluster(LOCAL_CLUSTER);
             // Local cluster can not be filtered out for now

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

@@ -394,7 +394,6 @@ public static class Cluster implements ToXContentFragment, Writeable {
         public enum Status {
             RUNNING,     // still running
             SUCCESSFUL,  // all shards completed search
-            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/EsqlCCSUtils.java

@@ -208,8 +208,7 @@ static void updateExecutionInfoWithClustersWithNoMatchingIndices(
          * Mark it as SKIPPED with 0 shards searched and took=0.
          */
         for (String c : clustersWithNoMatchingIndices) {
-            if (executionInfo.getCluster(c).getStatus() != Cluster.Status.RUNNING
-                && executionInfo.getCluster(c).getStatus() != Cluster.Status.FILTERED) {
+            if (executionInfo.getCluster(c).getStatus() != Cluster.Status.RUNNING) {
                 // if cluster was already in the terminal state and not filtered, do not overwrite
                 continue;
             }
@@ -224,21 +223,14 @@ static void updateExecutionInfoWithClustersWithNoMatchingIndices(
                 } else {
                     fatalErrorMessage += "; " + error;
                 }
-                if (filter != null) {
-                    // Use filtered status here because we still need to check it on the second lookup without the filter
-                    // to ensure this index is real.
-                    markClusterWithFinalStateAndNoShards(executionInfo, c, Cluster.Status.FILTERED, null);
-                } else {
+                if (filter == null) {
                     markClusterWithFinalStateAndNoShards(executionInfo, c, Cluster.Status.FAILED, new VerificationException(error));
                 }
             } else {
                 // no matching indices and no concrete index requested - just mark it as done, no error
-                markClusterWithFinalStateAndNoShards(
-                    executionInfo,
-                    c,
-                    filter != null ? Cluster.Status.FILTERED : Cluster.Status.SUCCESSFUL,
-                    null
-                );
+                if (indexResolution.isValid()) {
+                    markClusterWithFinalStateAndNoShards(executionInfo, c, Cluster.Status.SUCCESSFUL, null);
+                }
             }
         }
         if (fatalErrorMessage != null) {
@@ -286,9 +278,6 @@ static void updateExecutionInfoAtEndOfPlanning(EsqlExecutionInfo execInfo) {
                             .build()
                     );
                 }
-                if (cluster.getStatus() == Cluster.Status.FILTERED) {
-                    markClusterWithFinalStateAndNoShards(execInfo, clusterAlias, Cluster.Status.SUCCESSFUL, null);
-                }
             }
         }
     }