diff --git a/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java b/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java index d191cfcafa80f..03348c1d49344 100644 --- a/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java +++ b/x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestEsqlTestCase.java @@ -1105,7 +1105,6 @@ public void testComplexFieldNames() throws IOException { * query. It's part of the "configuration" of the query. *

*/ - @AwaitsFix(bugUrl = "Disabled temporarily until JOIN implementation is completed") public void testInlineStatsNow() throws IOException { assumeTrue("INLINESTATS only available on snapshots", Build.current().isSnapshot()); indexTimestampData(1); @@ -1121,8 +1120,8 @@ public void testInlineStatsNow() throws IOException { .item("value" + i) .item("value" + i) .item(i) - .item(any(String.class)) .item(499.5) + .item(any(String.class)) ); } assertResultMap( @@ -1131,8 +1130,8 @@ public void testInlineStatsNow() throws IOException { .item(matchesMap().entry("name", "test").entry("type", "text")) .item(matchesMap().entry("name", "test.keyword").entry("type", "keyword")) .item(matchesMap().entry("name", "value").entry("type", "long")) - .item(matchesMap().entry("name", "now").entry("type", "date")) - .item(matchesMap().entry("name", "AVG(value)").entry("type", "double")), + .item(matchesMap().entry("name", "AVG(value)").entry("type", "double")) + .item(matchesMap().entry("name", "now").entry("type", "date")), values ); } diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/logical/JoinTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/logical/JoinTests.java index 13887fbd1740c..62c4812d157e5 100644 --- a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/logical/JoinTests.java +++ b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/plan/logical/JoinTests.java @@ -24,7 +24,6 @@ import java.util.Set; public class JoinTests extends ESTestCase { - @AwaitsFix(bugUrl = "Test needs updating to the new JOIN planning") public void testExpressionsAndReferences() { int numMatchFields = between(1, 10);