Skip to content

Commit d3a07f7

Browse files
authored
ESQL: Allow pruning columns added by InlineJoin (elastic#131204)
This updates `PruneColumns` rule to allow optimising away the columns added by `InlineJoin`, dropping unnecessary agg'ing.
1 parent 1f174d1 commit d3a07f7

File tree

10 files changed

+629
-202
lines changed

10 files changed

+629
-202
lines changed

docs/changelog/131204.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 131204
2+
summary: Allow pruning columns added by `InlineJoin`
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@
5353
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.ENABLE_LOOKUP_JOIN_ON_REMOTE;
5454
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.FORK_V9;
5555
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS;
56-
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS_V2;
57-
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS_V8;
56+
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.INLINESTATS_V9;
5857
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.JOIN_LOOKUP_V12;
5958
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.JOIN_PLANNING_V1;
6059
import static org.elasticsearch.xpack.esql.action.EsqlCapabilities.Cap.METADATA_FIELDS_REMOTE_TEST;
@@ -150,9 +149,8 @@ protected void shouldSkipTest(String testName) throws IOException {
150149
Version oldVersion = Version.min(Clusters.localClusterVersion(), Clusters.remoteClusterVersion());
151150
assumeTrue("Test " + testName + " is skipped on " + oldVersion, isEnabled(testName, instructions, oldVersion));
152151
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains(INLINESTATS.capabilityName()));
153-
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains(INLINESTATS_V2.capabilityName()));
154152
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains(JOIN_PLANNING_V1.capabilityName()));
155-
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains(INLINESTATS_V8.capabilityName()));
153+
assumeFalse("INLINESTATS not yet supported in CCS", testCase.requiredCapabilities.contains(INLINESTATS_V9.capabilityName()));
156154
if (testCase.requiredCapabilities.contains(JOIN_LOOKUP_V12.capabilityName())) {
157155
assumeTrue("LOOKUP JOIN not yet supported in CCS", hasCapabilities(List.of(ENABLE_LOOKUP_JOIN_ON_REMOTE.capabilityName())));
158156
}

0 commit comments

Comments
 (0)