Update and add some test cases

Author: jbaiera

x-pack/plugin/eql/src/test/java/org/elasticsearch/xpack/eql/optimizer/OptimizerTests.java

@@ -753,7 +753,7 @@ private static Attribute tiebreaker() {
     }
 
     private static LogicalPlan rel() {
-        return new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, "catalog", "index"), "", false);
+        return new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, "catalog", "index", "data"), "", false);
     }
 
     private static KeyedFilter keyedFilter(LogicalPlan child) {

x-pack/plugin/ql/src/test/java/org/elasticsearch/xpack/ql/analyzer/PreAnalyzerTests.java

@@ -25,28 +25,40 @@ public class PreAnalyzerTests extends ESTestCase {
     private PreAnalyzer preAnalyzer = new PreAnalyzer();
 
     public void testBasicIndex() {
-        LogicalPlan plan = new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "index"), null, false);
+        LogicalPlan plan = new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "index", null), null, false);
         PreAnalysis result = preAnalyzer.preAnalyze(plan);
         assertThat(plan.preAnalyzed(), is(true));
         assertThat(result.indices, hasSize(1));
         assertThat(result.indices.get(0).id().cluster(), nullValue());
         assertThat(result.indices.get(0).id().index(), is("index"));
+        assertThat(result.indices.get(0).id().selector(), nullValue());
     }
 
     public void testBasicIndexWithCatalog() {
-        LogicalPlan plan = new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, "elastic", "index"), null, false);
+        LogicalPlan plan = new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, "elastic", "index", null), null, false);
         PreAnalysis result = preAnalyzer.preAnalyze(plan);
         assertThat(plan.preAnalyzed(), is(true));
         assertThat(result.indices, hasSize(1));
         assertThat(result.indices.get(0).id().cluster(), is("elastic"));
         assertThat(result.indices.get(0).id().index(), is("index"));
+        assertThat(result.indices.get(0).id().selector(), nullValue());
+    }
+
+    public void testBasicIndexWithSelector() {
+        LogicalPlan plan = new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "index", "failures"), null, false);
+        PreAnalysis result = preAnalyzer.preAnalyze(plan);
+        assertThat(plan.preAnalyzed(), is(true));
+        assertThat(result.indices, hasSize(1));
+        assertThat(result.indices.get(0).id().cluster(), nullValue());
+        assertThat(result.indices.get(0).id().index(), is("index"));
+        assertThat(result.indices.get(0).id().selector(), is("failures"));
     }
 
     public void testComplicatedQuery() {
         LogicalPlan plan = new Limit(
             EMPTY,
             new Literal(EMPTY, 10, INTEGER),
-            new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "aaa"), null, false)
+            new UnresolvedRelation(EMPTY, new TableIdentifier(EMPTY, null, "aaa", null), null, false)
         );
         PreAnalysis result = preAnalyzer.preAnalyze(plan);
         assertThat(plan.preAnalyzed(), is(true));

x-pack/plugin/sql/src/test/java/org/elasticsearch/xpack/sql/plan/logical/UnresolvedRelationTests.java

@@ -21,15 +21,15 @@
 public class UnresolvedRelationTests extends ESTestCase {
     public void testEqualsAndHashCode() {
         Source source = new Source(between(1, 1000), between(1, 1000), randomAlphaOfLength(16));
-        TableIdentifier table = new TableIdentifier(source, randomAlphaOfLength(5), randomAlphaOfLength(5));
+        TableIdentifier table = new TableIdentifier(source, randomAlphaOfLength(5), randomAlphaOfLength(5), randomAlphaOfLength(5));
         String alias = randomBoolean() ? null : randomAlphaOfLength(5);
         String unresolvedMessage = randomAlphaOfLength(5);
         UnresolvedRelation relation = new UnresolvedRelation(source, table, alias, randomBoolean(), unresolvedMessage);
         List<Function<UnresolvedRelation, UnresolvedRelation>> mutators = new ArrayList<>();
         mutators.add(
             r -> new UnresolvedRelation(
                 r.source(),
-                new TableIdentifier(r.source(), r.table().cluster(), r.table().index() + "m"),
+                new TableIdentifier(r.source(), r.table().cluster(), r.table().index() + "m", r.table().selector()),
                 r.alias(),
                 r.frozen(),
                 r.unresolvedMessage()