more test fixes

Author: smalyshev

x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/RequestIndexFilteringIT.java

@@ -31,9 +31,11 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.elasticsearch.test.ListMatcher.matchesList;
 import static org.elasticsearch.test.MapMatcher.assertMap;
 import static org.elasticsearch.test.MapMatcher.matchesMap;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.instanceOf;
 
 @ThreadLeakFilters(filters = TestClustersThreadFilter.class)
@@ -138,4 +140,25 @@ protected void assertQueryResult(Map<String, Object> result, Matcher<?> columnMa
         assertMap(result, matcher);
     }
 
+    // We need a separate test since remote missing indices and local missing indices now work differently
+    public void testIndicesDontExistRemote() throws IOException {
+        int docsTest1 = randomIntBetween(1, 5);
+        indexTimestampData(docsTest1, "test1", "2024-11-26", "id1");
+
+        Map<String, Object> result = runEsql(
+            timestampFilter("gte", "2020-01-01").query("FROM *:foo,*:test1 METADATA _index | SORT id1 | KEEP _index, id*")
+        );
+        @SuppressWarnings("unchecked")
+        var columns = (List<List<Object>>) result.get("columns");
+        assertThat(
+            columns,
+            matchesList().item(matchesMap().entry("name", "_index").entry("type", "keyword"))
+                .item(matchesMap().entry("name", "id1").entry("type", "integer"))
+        );
+        @SuppressWarnings("unchecked")
+        var values = (List<List<Object>>) result.get("values");
+        // TODO: for now, we return empty result, but eventually it should return records from test1
+        assertThat(values, hasSize(0));
+
+    }
 }

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

@@ -208,21 +208,10 @@ public void testIndicesDontExist() throws IOException {
         assertThat(e.getMessage(), containsString("verification_exception"));
         assertThat(e.getMessage(), anyOf(containsString("Unknown index [foo*]"), containsString("Unknown index [remote_cluster:foo*]")));
 
-        // FIXME: this test now behaves differently on local & remote cluster, because local is not skippable, we need to fix it
-        // Map<String, Object> result = runEsql(
-        // timestampFilter("gte", "2020-01-01").query(from("foo", "test1") + " METADATA _index | SORT id1 | KEEP _index, id*")
-        // );
-        // @SuppressWarnings("unchecked")
-        // var columns = (List<List<Object>>) result.get("columns");
-        // assertThat(
-        // columns,
-        // matchesList().item(matchesMap().entry("name", "_index").entry("type", "keyword"))
-        // .item(matchesMap().entry("name", "id1").entry("type", "integer"))
-        // );
-        // @SuppressWarnings("unchecked")
-        // var values = (List<List<Object>>) result.get("values");
-        // // TODO: for now, we return empty result, but eventually it should return records from test1
-        // assertThat(values, hasSize(0));
+        e = expectThrows(ResponseException.class, () -> runEsql(timestampFilter("gte", "2020-01-01").query("FROM foo, test1")));
+        assertEquals(404, e.getResponse().getStatusLine().getStatusCode());
+        assertThat(e.getMessage(), containsString("index_not_found_exception"));
+        assertThat(e.getMessage(), anyOf(containsString("no such index [foo]"), containsString("no such index [remote_cluster:foo]")));
 
         if (EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled()) {
             var pattern = from("test1");
@@ -242,7 +231,7 @@ public void testIndicesDontExist() throws IOException {
         }
     }
 
-    private static RestEsqlTestCase.RequestObjectBuilder timestampFilter(String op, String date) throws IOException {
+    protected static RestEsqlTestCase.RequestObjectBuilder timestampFilter(String op, String date) throws IOException {
         return requestObjectBuilder().filter(b -> {
             b.startObject("range");
             {